debian/gbp.conf: explicitly disable pristine-tar

[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..e544df4 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 <errno.h>
 #include <libusb.h>
 

+#include "endian.h"
+

 static libusb_device_handle *dev;
 static libusb_device_handle *dev;

-unsigned int seq;
+static unsigned int seq;

 
 typedef struct {
        uint32_t magic;
 
 typedef struct {
        uint32_t magic;


@@ -55,8 +57,15 @@ typedef struct {
 } status_code;
 
 #define LOG(...) printf(__VA_ARGS__)
 } 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)
 #define fn_le32(x) (x)

-// TODO: support architectures that aren't little-endian
+#endif

 
 static void dump_bl_cmd(bootloader_command cmd) {
        int i;
 
 static void dump_bl_cmd(bootloader_command cmd) {
        int i;


@@ -96,7 +105,7 @@ static int get_reply(void) {
 
        res = libusb_bulk_transfer(dev, 0x81, reply.dump, 512, &transferred, 0);
        if (res != 0 || transferred != sizeof(status_code)) {
 
        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) {
                return res;
        }
        if (fn_le32(reply.buffer.magic) != 0x0a6fe000) {


@@ -124,24 +133,26 @@ static int get_reply(void) {
 int main(int argc, char** argv) {
        char default_filename[] = "firmware.bin";
        char* filename = default_filename;
 int main(int argc, char** argv) {
        char default_filename[] = "firmware.bin";
        char* filename = default_filename;

+       int res = 0;

 
        if (argc == 2) {
                filename = argv[1];
        }
 
 
        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);
        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");
 
        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);
        }
 
        libusb_set_configuration(dev, 1);


@@ -160,19 +171,22 @@ int main(int argc, char** argv) {
        LOG("About to send: ");
        dump_bl_cmd(cmd);
 
        LOG("About to send: ");
        dump_bl_cmd(cmd);
 

-       int res;

        int transferred;
 
        res = libusb_bulk_transfer(dev, 1, (unsigned char*)&cmd, sizeof(cmd), &transferred, 0);
        if (res != 0 || transferred != sizeof(cmd)) {
        int transferred;
 
        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++;
 
                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 {
        unsigned char page[0x4000];
        int read;
        do {


@@ -190,7 +204,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)) {
                // 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 %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;
                        goto cleanup;
                }
                int bytes_sent = 0;


@@ -216,7 +230,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)) {
        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 %lu)\n", res, transferred, sizeof(cmd));
+               LOG("Error: res: %d\ttransferred: %d (expected %zu)\n", res, transferred, sizeof(cmd));

                goto cleanup;
        }
        res = get_reply();
                goto cleanup;
        }
        res = get_reply();


@@ -225,6 +239,8 @@ int main(int argc, char** argv) {
 
 cleanup:
        libusb_close(dev);
 
 cleanup:
        libusb_close(dev);

+fail_libusb_open:

        libusb_exit(NULL);
        libusb_exit(NULL);

-       return 0;
+       fclose(fw);
+       return res;

 }
 }