Merge tag 'v0.5' into debian

[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 d6522ff..1bd4102 100644 (file)
--- a/kinect_upload_fw/kinect_upload_fw.c
+++ b/kinect_upload_fw/kinect_upload_fw.c
@@ -1,5 +1,6 @@
 /*
  * Copyright 2011 Drew Fisher <drew.m.fisher@gmail.com>. All rights reserved.
 /*
  * Copyright 2011 Drew Fisher <drew.m.fisher@gmail.com>. All rights reserved.

+ * Copyright (C) 2016  Antonio Ospite <ao2@ao2.it>

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -84,6 +85,7 @@ static void dump_bl_cmd(bootloader_command cmd) {
 static int get_first_reply(void) {
        unsigned char buffer[512];
        int res;
 static int get_first_reply(void) {
        unsigned char buffer[512];
        int res;

+

        int transferred = 0;
        res = libusb_bulk_transfer(dev, KINECT_AUDIO_IN_EP, buffer, 512, &transferred, 0);
        if (res != 0 ) {
        int transferred = 0;
        res = libusb_bulk_transfer(dev, KINECT_AUDIO_IN_EP, buffer, 512, &transferred, 0);
        if (res != 0 ) {


@@ -155,18 +157,23 @@ static int upload_firmware(FILE *fw) {
 
        int transferred = 0;
 
 
        int transferred = 0;
 

-       res = libusb_bulk_transfer(dev, KINECT_AUDIO_OUT_EP, (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 out;
        }
        if (res != 0 || transferred != sizeof(cmd)) {
                LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));
                goto out;
        }

-       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.
+
+       // 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_first_reply();

        if (res < 0) {
                LOG("get_first_reply() failed");
                goto out;
        }
 
        if (res < 0) {
                LOG("get_first_reply() failed");
                goto out;
        }
 

-       res = get_reply(); // I'm not sure why we do this twice here, but maybe it'll make sense later.
+       // I'm not sure why we do this twice here, but maybe it'll make sense
+       // later.
+       res = get_reply();

        if (res < 0) {
                LOG("First get_reply() failed");
                goto out;
        if (res < 0) {
                LOG("First get_reply() failed");
                goto out;


@@ -194,7 +201,7 @@ static int upload_firmware(FILE *fw) {
                dump_bl_cmd(cmd);
                // Send it off!
                transferred = 0;
                dump_bl_cmd(cmd);
                // Send it off!
                transferred = 0;

-               res = libusb_bulk_transfer(dev, KINECT_AUDIO_OUT_EP, (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 out;
                if (res != 0 || transferred != sizeof(cmd)) {
                        LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));
                        goto out;


@@ -226,7 +233,7 @@ static int upload_firmware(FILE *fw) {
        cmd.write_addr = fn_le32(0x00080030);
        dump_bl_cmd(cmd);
        transferred = 0;
        cmd.write_addr = fn_le32(0x00080030);
        dump_bl_cmd(cmd);
        transferred = 0;

-       res = libusb_bulk_transfer(dev, KINECT_AUDIO_OUT_EP, (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 out;
        if (res != 0 || transferred != sizeof(cmd)) {
                LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));
                goto out;


@@ -238,53 +245,96 @@ out:
        return res;
 }
 
        return res;
 }
 

-int main(int argc, char** argv) {
+int main(int argc, char *argv[]) {

        char default_filename[] = "firmware.bin";
        char default_filename[] = "firmware.bin";

-       char* filename = default_filename;
-       int res = 0;
+       char *filename = default_filename;
+       int ret = 0;

 
        if (argc == 2) {
                filename = argv[1];
        }
 
 
        if (argc == 2) {
                filename = argv[1];
        }
 

-       FILE* fw = fopen(filename, "rb");
+       FILE *fw = fopen(filename, "rb");

        if (fw == NULL) {
                fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));
        if (fw == NULL) {
                fprintf(stderr, "Failed to open %s: %s\n", filename, strerror(errno));

-               return errno;
+               return -errno;
+       }
+
+       ret = libusb_init(NULL);
+       if (ret < 0) {
+               fprintf(stderr, "libusb_init failed: %s\n",
+                       libusb_error_name(ret));
+               goto out;

        }
 
        }
 

-       libusb_init(NULL);

        libusb_set_debug(NULL, 3);
 
        dev = libusb_open_device_with_vid_pid(NULL, KINECT_AUDIO_VID, KINECT_AUDIO_PID);
        if (dev == NULL) {
        libusb_set_debug(NULL, 3);
 
        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;
+               fprintf(stderr, "libusb_open failed: %s\n", strerror(errno));
+               ret = -errno;
+               goto out_libusb_exit;

        }
 
        int current_configuration = -1;
        }
 
        int current_configuration = -1;

-       libusb_get_configuration(dev, &current_configuration);
-       if (current_configuration != KINECT_AUDIO_CONFIGURATION)
-               libusb_set_configuration(dev, KINECT_AUDIO_CONFIGURATION);
+       ret = libusb_get_configuration(dev, &current_configuration);
+       if (ret < 0) {
+               fprintf(stderr, "libusb_get_configuration failed: %s\n",
+                       libusb_error_name(ret));
+               goto out_libusb_close;
+       }

 
 

-       libusb_claim_interface(dev, KINECT_AUDIO_INTERFACE);
+       if (current_configuration != KINECT_AUDIO_CONFIGURATION) {
+               ret = libusb_set_configuration(dev, KINECT_AUDIO_CONFIGURATION);
+               if (ret < 0) {
+                       fprintf(stderr, "libusb_set_configuration failed: %s\n",
+                               libusb_error_name(ret));
+                       fprintf(stderr, "Cannot set configuration %d\n",
+                               KINECT_AUDIO_CONFIGURATION);
+                       goto out_libusb_close;
+               }
+       }
+
+       libusb_set_auto_detach_kernel_driver(dev, 1);
+
+       ret = libusb_claim_interface(dev, KINECT_AUDIO_INTERFACE);
+       if (ret < 0) {
+               fprintf(stderr, "libusb_claim_interface failed: %s\n",
+                       libusb_error_name(ret));
+               fprintf(stderr, "Cannot claim interface %d\n",
+                       KINECT_AUDIO_INTERFACE);
+               goto out_libusb_close;
+       }

 
 

+       /*
+        * Checking that the configuration has not changed, as suggested in
+        * http://libusb.sourceforge.net/api-1.0/caveats.html
+        */

        current_configuration = -1;
        current_configuration = -1;

-       libusb_get_configuration(dev, &current_configuration);
+       ret = libusb_get_configuration(dev, &current_configuration);
+       if (ret < 0) {
+               fprintf(stderr, "libusb_get_configuration after claim failed: %s\n",
+                       libusb_error_name(ret));
+               goto out_libusb_release_interface;
+       }
+

        if (current_configuration != KINECT_AUDIO_CONFIGURATION) {
        if (current_configuration != KINECT_AUDIO_CONFIGURATION) {

-               res = -ENODEV;
-               goto cleanup;
+               fprintf(stderr, "libusb configuration changed (expected: %d, current: %d)\n",
+                       KINECT_AUDIO_CONFIGURATION, current_configuration);
+               ret = -EINVAL;
+               goto out_libusb_release_interface;

        }
 
        }
 

-       res = upload_firmware(fw);
+       ret = upload_firmware(fw);

        // Now the device reenumerates.
 
        // Now the device reenumerates.
 

-cleanup:
+out_libusb_release_interface:

        libusb_release_interface(dev, KINECT_AUDIO_INTERFACE);
        libusb_release_interface(dev, KINECT_AUDIO_INTERFACE);

+out_libusb_close:

        libusb_close(dev);
        libusb_close(dev);

-fail_libusb_open:
+out_libusb_exit:

        libusb_exit(NULL);
        libusb_exit(NULL);

+out:

        fclose(fw);
        fclose(fw);

-       return res;
+       return ret;

 }
 }