X-Git-Url: https://git.ao2.it/kinect-audio-setup.git/blobdiff_plain/c7bd1ac5b92c4516d3186ad3218b45c60de8b01f..898ce1f42e887579a1558a254033689c0e33e4fd:/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 626b963..36532fa 100644
--- a/kinect_upload_fw/kinect_upload_fw.c
+++ b/kinect_upload_fw/kinect_upload_fw.c
@@ -32,11 +32,12 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <libusb.h>
 
 static libusb_device_handle *dev;
-int seq;
+unsigned int seq;
 
 typedef struct {
 	uint32_t magic;
@@ -57,14 +58,14 @@ typedef struct {
 #define fn_le32(x) (x)
 // TODO: support architectures that aren't little-endian
 
-void dump_bl_cmd(bootloader_command cmd) {
+static void dump_bl_cmd(bootloader_command cmd) {
 	int i;
 	for(i = 0; i < 24; i++)
 		LOG("%02X ", ((unsigned char*)(&cmd))[i]);
 	LOG("\n");
 }
 
-int get_first_reply(void) {
+static int get_first_reply(void) {
 	unsigned char buffer[512];
 	int res;
 	int transferred;
@@ -82,33 +83,38 @@ int get_first_reply(void) {
 	return res;
 }
 
-
-int get_reply(void) {
-	unsigned char dump[512];
-	status_code buffer = ((status_code*)dump)[0];
+static int get_reply(void) {
+	union {
+		status_code buffer;
+		/* The following is needed because libusb_bulk_transfer might
+		 * fail when working on a buffer smaller than 512 bytes.
+		 */
+		unsigned char dump[512];
+	} reply;
 	int res;
 	int transferred;
-	res = libusb_bulk_transfer(dev, 0x81, (unsigned char*)&buffer, 512, &transferred, 0);
+
+	res = libusb_bulk_transfer(dev, 0x81, reply.dump, 512, &transferred, 0);
 	if(res != 0 || transferred != sizeof(status_code)) {
-		LOG("Error reading reply: %d\ttransferred: %d (expected %d)\n", res, transferred, sizeof(status_code));
+		LOG("Error reading reply: %d\ttransferred: %d (expected %lu)\n", res, transferred, sizeof(status_code));
 		return res;
 	}
-	if(fn_le32(buffer.magic) != 0x0a6fe000) {
-		LOG("Error reading reply: invalid magic %08X\n",buffer.magic);
+	if(fn_le32(reply.buffer.magic) != 0x0a6fe000) {
+		LOG("Error reading reply: invalid magic %08X\n", reply.buffer.magic);
 		return -1;
 	}
-	if(fn_le32(buffer.seq) != seq) {
-		LOG("Error reading reply: non-matching sequence number %08X (expected %08X)\n", buffer.seq, seq);
+	if(fn_le32(reply.buffer.seq) != seq) {
+		LOG("Error reading reply: non-matching sequence number %08X (expected %08X)\n", reply.buffer.seq, seq);
 		return -1;
 	}
-	if(fn_le32(buffer.status) != 0) {
-		LOG("Notice reading reply: last uint32_t was nonzero: %d\n", buffer.status);
+	if(fn_le32(reply.buffer.status) != 0) {
+		LOG("Notice reading reply: last uint32_t was nonzero: %d\n", reply.buffer.status);
 	}
 
 	LOG("Reading reply: ");
 	int i;
 	for(i = 0; i < transferred; ++i) {
-		LOG("%02X ", ((unsigned char*)(&buffer))[i]);
+		LOG("%02X ", reply.dump[i]);
 	}
 	LOG("\n");
 
@@ -116,13 +122,14 @@ int get_reply(void) {
 }
 
 int main(int argc, char** argv) {
-	char* filename = "firmware.bin";
+	char default_filename[] = "firmware.bin";
+	char* filename = default_filename;
 	if (argc == 2) {
 		filename = argv[1];
 	}
 	FILE* fw = fopen(filename, "r");
 	if(fw == NULL) {
-		fprintf(stderr, "Failed to open %s: error %d", filename, errno);
+		fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));
 		return errno;
 	}
 
@@ -155,7 +162,7 @@ int main(int argc, char** argv) {
 
 	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 %d)\n",res, transferred, sizeof(cmd));
+		LOG("Error: res: %d\ttransferred: %d (expected %lu)\n",res, transferred, sizeof(cmd));
 		goto cleanup;
 	}
 	res = get_first_reply(); // This first one doesn't have the usual magic bytes at the beginning, and is 96 bytes long - much longer than the usual 12-byte replies.
@@ -163,7 +170,7 @@ int main(int argc, char** argv) {
 	seq++;
 
 	uint32_t addr = 0x00080000;
-	char page[0x4000];
+	unsigned char page[0x4000];
 	int read;
 	do {
 		read = fread(page, 1, 0x4000, fw);
@@ -180,7 +187,7 @@ int main(int argc, char** argv) {
 		// Send it off!
 		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 %d)\n",res, transferred, sizeof(cmd));
+			LOG("Error: res: %d\ttransferred: %d (expected %lu)\n",res, transferred, sizeof(cmd));
 			goto cleanup;
 		}
 		int bytes_sent = 0;
@@ -206,7 +213,7 @@ int main(int argc, char** argv) {
 	dump_bl_cmd(cmd);
 	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 %d)\n", res, transferred, sizeof(cmd));
+		LOG("Error: res: %d\ttransferred: %d (expected %lu)\n", res, transferred, sizeof(cmd));
 		goto cleanup;
 	}
 	res = get_reply();