Added Mac OSX support for the bootloaderhost utility (not tested)

diff --git a/software/bootloaderhost/Makefile b/software/bootloaderhost/Makefile
index 8f5d66fb4b2e1f689193e97e0d52122604cd59d1..8c0906724012434193f84aadd68bf8487ad3a509 100644 (file)
--- a/software/bootloaderhost/Makefile
+++ b/software/bootloaderhost/Makefile
@@ -6,6 +6,7 @@ CYAPI = \
        cybootloaderutils/cybtldr_command.c \
        cybootloaderutils/cybtldr_parse.c \
 
+CFLAGS += -Wall -Wno-pointer-sign
 
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Linux)
@@ -15,11 +16,12 @@ endif
 ifeq ($(UNAME_S),Darwin)
        # Should match OSX
        HID_C = hidapi/mac/hid.c
+       LDFLAGS += -framework IOKit -framework CoreFoundation
 endif
 
 
 bootloaderhost: main.c $(HID_C) $(CYAPI)
-       $(CC) $(CFLAGS) -g -I cybootloaderutils -I hidapi/hidapi $^ $(LDFLAGS) -o $@
+       $(CC) $(CFLAGS) -I cybootloaderutils -I hidapi/hidapi $^ $(LDFLAGS) -o $@
 
 clean:
        rm bootloaderhost

diff --git a/software/bootloaderhost/main.c b/software/bootloaderhost/main.c
index fdeb4afaf980f3be40df6f482f09c9cac0dc212a..c42f41f29ef4b6acced50078eba41fa4bd01a4e2 100644 (file)
--- a/software/bootloaderhost/main.c
+++ b/software/bootloaderhost/main.c
@@ -110,10 +110,10 @@ int main(int argc, char* argv[])
                switch (c)
                {
                case 'v':
-                       sscanf(optarg, "%x", &vendorId);
+                       sscanf(optarg, "%hx", &vendorId);
                        break;
                case 'p':
-                       sscanf(optarg, "%x", &productId);
+                       sscanf(optarg, "%hx", &productId);
                        break;
                case '?':
                        usage();