laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Fix Pi build of xmosdfu

Browse Source
This commit is contained in:
Larry Snizek
2017-10-06 09:25:32 +01:00
parent a25d8a64b4
commit f81e2d8f50
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module_dfu/host/xmosdfu/Makefile.OSX
View File

@@ -1,2 +1,2 @@
all: 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

2
module_dfu/host/xmosdfu/Makefile.Pi
View File

@@ -5,4 +5,4 @@
# vendor and product IDs # vendor and product IDs
xmosdfu: xmosdfu.cpp 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

6
module_dfu/host/xmosdfu/xmosdfu.cpp
View File

@@ -86,7 +86,7 @@ static int find_xmos_device(unsigned int id, unsigned int pid, unsigned int list
} }
else else
{ {
libusb_config_descriptor *config_desc = NULL; struct libusb_config_descriptor *config_desc = NULL;
libusb_get_active_config_descriptor(dev, &config_desc); libusb_get_active_config_descriptor(dev, &config_desc);
if (config_desc != NULL) 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++) for (int j = 0; j < config_desc->bNumInterfaces; j++)
{ {
//printf("%d\n", 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) if (inter_desc->bInterfaceClass == 0xFE && inter_desc->bInterfaceSubClass == 0x1)
{ {
XMOS_DFU_IF = j; XMOS_DFU_IF = j;
@@ -563,5 +563,5 @@ int main(int argc, char **argv)
libusb_close(devh); libusb_close(devh);
libusb_exit(NULL); libusb_exit(NULL);
return true; return 1;
} }