From f81e2d8f5058e3503e1fbda87f091634f69d9422 Mon Sep 17 00:00:00 2001 From: Larry Snizek Date: Fri, 6 Oct 2017 09:25:32 +0100 Subject: [PATCH] Fix Pi build of xmosdfu --- module_dfu/host/xmosdfu/Makefile.OSX | 2 +- module_dfu/host/xmosdfu/Makefile.Pi | 2 +- module_dfu/host/xmosdfu/xmosdfu.cpp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module_dfu/host/xmosdfu/Makefile.OSX b/module_dfu/host/xmosdfu/Makefile.OSX index f0c9daae..b5a29be6 100644 --- a/module_dfu/host/xmosdfu/Makefile.OSX +++ b/module_dfu/host/xmosdfu/Makefile.OSX @@ -1,2 +1,2 @@ all: - g++ -g -o xmosdfu xmosdfu.cpp -Ilibusb/OSX libusb/OSX/libusb-1.0.0.dylib -m32 + g++ -g -o xmosdfu xmosdfu.cpp -Ilibusb/OSX libusb/OSX/libusb-1.0.0.dylib -m32 -Wall diff --git a/module_dfu/host/xmosdfu/Makefile.Pi b/module_dfu/host/xmosdfu/Makefile.Pi index d45ece12..6141746e 100644 --- a/module_dfu/host/xmosdfu/Makefile.Pi +++ b/module_dfu/host/xmosdfu/Makefile.Pi @@ -5,4 +5,4 @@ # vendor and product IDs xmosdfu: xmosdfu.cpp - g++ -D_GNU_SOURCE -Wall -g -o xmosdfu -Ilibusb/Rasp -lusb-1.0 xmosdfu.cpp + g++ -D_GNU_SOURCE -Wall -g -o xmosdfu -Ilibusb/Rasp -lusb-1.0 -x c xmosdfu.cpp -std=c99 diff --git a/module_dfu/host/xmosdfu/xmosdfu.cpp b/module_dfu/host/xmosdfu/xmosdfu.cpp index 89280302..884badda 100644 --- a/module_dfu/host/xmosdfu/xmosdfu.cpp +++ b/module_dfu/host/xmosdfu/xmosdfu.cpp @@ -86,7 +86,7 @@ static int find_xmos_device(unsigned int id, unsigned int pid, unsigned int list } else { - libusb_config_descriptor *config_desc = NULL; + struct libusb_config_descriptor *config_desc = NULL; libusb_get_active_config_descriptor(dev, &config_desc); if (config_desc != NULL) { @@ -94,7 +94,7 @@ static int find_xmos_device(unsigned int id, unsigned int pid, unsigned int list for (int j = 0; j < config_desc->bNumInterfaces; j++) { //printf("%d\n", j); - const libusb_interface_descriptor *inter_desc = ((libusb_interface *)&config_desc->interface[j])->altsetting; + const struct libusb_interface_descriptor *inter_desc = ((struct libusb_interface *)&config_desc->interface[j])->altsetting; if (inter_desc->bInterfaceClass == 0xFE && inter_desc->bInterfaceSubClass == 0x1) { XMOS_DFU_IF = j; @@ -563,5 +563,5 @@ int main(int argc, char **argv) libusb_close(devh); libusb_exit(NULL); - return true; + return 1; }