kinect_upload_fw: fix setting configuration for some devices

[kinect-audio-setup.git] / 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 80d435f..e3b72db 100644 (file)
--- a/kinect_upload_fw/kinect_upload_fw.c
+++ b/kinect_upload_fw/kinect_upload_fw.c
@@ -36,8 +36,10 @@
 #include <errno.h>
 #include <libusb.h>
 
+#include "endian.h"
+
 static libusb_device_handle *dev;
-unsigned int seq;
+static unsigned int seq;
 
 typedef struct {
        uint32_t magic;
@@ -55,8 +57,15 @@ typedef struct {
 } status_code;
 
 #define LOG(...) printf(__VA_ARGS__)
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+static inline uint32_t fn_le32(uint32_t d)
+{
+       return (d<<24) | ((d<<8)&0xFF0000) | ((d>>8)&0xFF00) | (d>>24);
+}
+#else
 #define fn_le32(x) (x)
-// TODO: support architectures that aren't little-endian
+#endif
 
 static void dump_bl_cmd(bootloader_command cmd) {
        int i;
@@ -68,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);
@@ -92,11 +101,11 @@ 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)) {
-               LOG("Error reading reply: %d\ttransferred: %d (expected %lu)\n", res, transferred, sizeof(status_code));
+               LOG("Error reading reply: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(status_code));
                return res;
        }
        if (fn_le32(reply.buffer.magic) != 0x0a6fe000) {
@@ -124,29 +133,41 @@ static int get_reply(void) {
 int main(int argc, char** argv) {
        char default_filename[] = "firmware.bin";
        char* filename = default_filename;
+       int res = 0;
 
        if (argc == 2) {
                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) {
                fprintf(stderr, "Couldn't open device.\n");
-               return 1;
+               res = -ENODEV;
+               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;
@@ -160,19 +181,22 @@ int main(int argc, char** argv) {
        LOG("About to send: ");
        dump_bl_cmd(cmd);
 
-       int res;
-       int transferred;
+       int 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 %lu)\n", res, transferred, sizeof(cmd));
+               LOG("Error: res: %d\ttransferred: %d (expected %zu)\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.
        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 {
@@ -188,14 +212,16 @@ 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 %lu)\n", res, transferred, sizeof(cmd));
+                       LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));
                        goto cleanup;
                }
                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);
@@ -214,9 +240,10 @@ 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 %lu)\n", res, transferred, sizeof(cmd));
+               LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));
                goto cleanup;
        }
        res = get_reply();
@@ -225,6 +252,8 @@ int main(int argc, char** argv) {
 
 cleanup:
        libusb_close(dev);
+fail_libusb_open:
        libusb_exit(NULL);
-       return 0;
+       fclose(fw);
+       return res;
 }