debian/copyright: update to Copyright-Format 1.0

[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 eb65113..e544df4 100644 (file)
--- a/kinect_upload_fw/kinect_upload_fw.c
+++ b/kinect_upload_fw/kinect_upload_fw.c
@@ -39,7 +39,7 @@
 #include "endian.h"
 
 static libusb_device_handle *dev;
 #include "endian.h"
 
 static libusb_device_handle *dev;

-unsigned int seq;
+static unsigned int seq;

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


@@ -139,14 +139,14 @@ int main(int argc, char** argv) {
                filename = argv[1];
        }
 
                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) {
 
        dev = libusb_open_device_with_vid_pid(NULL, 0x045e, 0x02ad);
        if (dev == NULL) {


@@ -182,7 +182,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++;
 
        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 {