kinect_upload_fw: use symbolic constants instead of magic values

[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 21bdef9..54f463a 100644 (file)
--- a/kinect_upload_fw/kinect_upload_fw.c
+++ b/kinect_upload_fw/kinect_upload_fw.c
@@ -38,6 +38,13 @@
 
 #include "endian.h"
 
+#define KINECT_AUDIO_VID           0x045e
+#define KINECT_AUDIO_PID           0x02ad
+#define KINECT_AUDIO_CONFIGURATION 1
+#define KINECT_AUDIO_INTERFACE     0
+#define KINECT_AUDIO_IN_EP         0x81
+#define KINECT_AUDIO_OUT_EP        0x01
+
 static libusb_device_handle *dev;
 static unsigned int seq;
 
@@ -77,8 +84,8 @@ static void dump_bl_cmd(bootloader_command cmd) {
 static int get_first_reply(void) {
        unsigned char buffer[512];
        int res;
-       int transferred;
-       res = libusb_bulk_transfer(dev, 0x81, buffer, 512, &transferred, 0);
+       int transferred = 0;
+       res = libusb_bulk_transfer(dev, KINECT_AUDIO_IN_EP, buffer, 512, &transferred, 0);
        if (res != 0 ) {
                LOG("Error reading first reply: %d\ttransferred: %d (expected %d)\n", res, transferred, 0x60);
                return res;
@@ -101,9 +108,9 @@ 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);
+       res = libusb_bulk_transfer(dev, KINECT_AUDIO_IN_EP, reply.dump, 512, &transferred, 0);
        if (res != 0 || transferred != sizeof(status_code)) {
                LOG("Error reading reply: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(status_code));
                return res;
@@ -139,7 +146,7 @@ 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;
@@ -148,15 +155,26 @@ int main(int argc, char** argv) {
        libusb_init(NULL);
        libusb_set_debug(NULL, 3);
 
-       dev = libusb_open_device_with_vid_pid(NULL, 0x045e, 0x02ad);
+       dev = libusb_open_device_with_vid_pid(NULL, KINECT_AUDIO_VID, KINECT_AUDIO_PID);
        if (dev == NULL) {
                fprintf(stderr, "Couldn't open device.\n");
                res = -ENODEV;
                goto fail_libusb_open;
        }
 
-       libusb_set_configuration(dev, 1);
-       libusb_claim_interface(dev, 0);
+       int current_configuration = -1;
+       libusb_get_configuration(dev, &current_configuration);
+       if (current_configuration != KINECT_AUDIO_CONFIGURATION)
+               libusb_set_configuration(dev, KINECT_AUDIO_CONFIGURATION);
+
+       libusb_claim_interface(dev, KINECT_AUDIO_INTERFACE);
+
+       current_configuration = -1;
+       libusb_get_configuration(dev, &current_configuration);
+       if (current_configuration != KINECT_AUDIO_CONFIGURATION) {
+               res = -ENODEV;
+               goto cleanup;
+       }
 
        seq = 1;
 
@@ -171,9 +189,9 @@ 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);
+       res = libusb_bulk_transfer(dev, KINECT_AUDIO_OUT_EP, (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));
                goto cleanup;
@@ -182,7 +200,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,7 +220,8 @@ int main(int argc, char** argv) {
                LOG("About to send: ");
                dump_bl_cmd(cmd);
                // Send it off!
-               res = libusb_bulk_transfer(dev, 1, (unsigned char*)&cmd, sizeof(cmd), &transferred, 0);
+               transferred = 0;
+               res = libusb_bulk_transfer(dev, KINECT_AUDIO_OUT_EP, (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));
                        goto cleanup;
@@ -206,7 +229,8 @@ 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);
-                       res = libusb_bulk_transfer(dev, 1, &page[bytes_sent], to_send, &transferred, 0);
+                       transferred = 0;
+                       res = libusb_bulk_transfer(dev, KINECT_AUDIO_OUT_EP, &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);
                                goto cleanup;
@@ -224,7 +248,8 @@ int main(int argc, char** argv) {
        cmd.cmd = fn_le32(0x04);
        cmd.write_addr = fn_le32(0x00080030);
        dump_bl_cmd(cmd);
-       res = libusb_bulk_transfer(dev, 1, (unsigned char*)&cmd, sizeof(cmd), &transferred, 0);
+       transferred = 0;
+       res = libusb_bulk_transfer(dev, KINECT_AUDIO_OUT_EP, (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));
                goto cleanup;