X-Git-Url: https://git.ao2.it/kinect-audio-setup.git/blobdiff_plain/f9427c75a57d01f791770aa6bfc2a094c1eaf371..6e31aa17271f90a443591719089688bbf2040765:/kinect_upload_fw/kinect_upload_fw.c

diff --git a/kinect_upload_fw/kinect_upload_fw.c b/kinect_upload_fw/kinect_upload_fw.c
index eb65113..e3b72db 100644
--- a/kinect_upload_fw/kinect_upload_fw.c
+++ b/kinect_upload_fw/kinect_upload_fw.c
@@ -39,7 +39,7 @@
 #include "endian.h"
 
 static libusb_device_handle *dev;
-unsigned int seq;
+static unsigned int seq;
 
 typedef struct {
 	uint32_t magic;
@@ -77,7 +77,7 @@ static void dump_bl_cmd(bootloader_command cmd) {
 static int get_first_reply(void) {
 	unsigned char buffer[512];
 	int res;
-	int transferred;
+	int transferred = 0;
 	res = libusb_bulk_transfer(dev, 0x81, buffer, 512, &transferred, 0);
 	if (res != 0 ) {
 		LOG("Error reading first reply: %d\ttransferred: %d (expected %d)\n", res, transferred, 0x60);
@@ -101,7 +101,7 @@ static int get_reply(void) {
 		unsigned char dump[512];
 	} reply;
 	int res;
-	int transferred;
+	int transferred = 0;
 
 	res = libusb_bulk_transfer(dev, 0x81, reply.dump, 512, &transferred, 0);
 	if (res != 0 || transferred != sizeof(status_code)) {
@@ -139,14 +139,14 @@ int main(int argc, char** argv) {
 		filename = argv[1];
 	}
 
-	FILE* fw = fopen(filename, "r");
+	FILE* fw = fopen(filename, "rb");
 	if (fw == NULL) {
 		fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));
 		return errno;
 	}
 
 	libusb_init(NULL);
-	libusb_set_debug(0, 3);
+	libusb_set_debug(NULL, 3);
 
 	dev = libusb_open_device_with_vid_pid(NULL, 0x045e, 0x02ad);
 	if (dev == NULL) {
@@ -155,9 +155,19 @@ int main(int argc, char** argv) {
 		goto fail_libusb_open;
 	}
 
-	libusb_set_configuration(dev, 1);
+	int current_configuration = 0;
+	libusb_get_configuration(dev, &current_configuration);
+	if (current_configuration != 1)
+		libusb_set_configuration(dev, 1);
+
 	libusb_claim_interface(dev, 0);
 
+	libusb_get_configuration(dev, &current_configuration);
+	if (current_configuration != 1) {
+		res = -ENODEV;
+		goto cleanup;
+	}
+
 	seq = 1;
 
 	bootloader_command cmd;
@@ -171,7 +181,7 @@ int main(int argc, char** argv) {
 	LOG("About to send: ");
 	dump_bl_cmd(cmd);
 
-	int transferred;
+	int transferred = 0;
 
 	res = libusb_bulk_transfer(dev, 1, (unsigned char*)&cmd, sizeof(cmd), &transferred, 0);
 	if (res != 0 || transferred != sizeof(cmd)) {
@@ -182,7 +192,11 @@ int main(int argc, char** argv) {
 	res = get_reply(); // I'm not sure why we do this twice here, but maybe it'll make sense later.
 	seq++;
 
-	uint32_t addr = 0x00080000;
+	// Split addr declaration and assignment in order to compile as C++,
+	// otherwise this would give "jump to label '...' crosses initialization"
+	// errors.
+	uint32_t addr;
+	addr = 0x00080000;
 	unsigned char page[0x4000];
 	int read;
 	do {
@@ -198,6 +212,7 @@ int main(int argc, char** argv) {
 		LOG("About to send: ");
 		dump_bl_cmd(cmd);
 		// Send it off!
+		transferred = 0;
 		res = libusb_bulk_transfer(dev, 1, (unsigned char*)&cmd, sizeof(cmd), &transferred, 0);
 		if (res != 0 || transferred != sizeof(cmd)) {
 			LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));
@@ -206,6 +221,7 @@ int main(int argc, char** argv) {
 		int bytes_sent = 0;
 		while (bytes_sent < read) {
 			int to_send = (read - bytes_sent > 512 ? 512 : read - bytes_sent);
+			transferred = 0;
 			res = libusb_bulk_transfer(dev, 1, &page[bytes_sent], to_send, &transferred, 0);
 			if (res != 0 || transferred != to_send) {
 				LOG("Error: res: %d\ttransferred: %d (expected %d)\n", res, transferred, to_send);
@@ -224,6 +240,7 @@ int main(int argc, char** argv) {
 	cmd.cmd = fn_le32(0x04);
 	cmd.write_addr = fn_le32(0x00080030);
 	dump_bl_cmd(cmd);
+	transferred = 0;
 	res = libusb_bulk_transfer(dev, 1, (unsigned char*)&cmd, sizeof(cmd), &transferred, 0);
 	if (res != 0 || transferred != sizeof(cmd)) {
 		LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));