X-Git-Url: https://git.ao2.it/kinect-audio-setup.git/blobdiff_plain/833744083efbcdfdf3bad938f76e5ca9388d9cac..ecdb091d49fe719310f759bc9d167b45a724a99e:/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 f9a1952..e544df4 100644
--- 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;
@@ -130,14 +139,14 @@ 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;
 	}
 
 	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) {
@@ -173,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++;
 
-	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 {