jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Corrected upgrade tool to use our new usb ids.

Browse Source
This commit is contained in:
Gareth McMullin 2012-07-27 21:59:03 +12:00
parent 234d54c5a5
commit 7be4866239
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
upgrade/main.c
View File

@ -53,7 +53,9 @@ struct usb_device * find_dev(void)
for(bus = usb_get_busses(); bus; bus = bus->next) { for(bus = usb_get_busses(); bus; bus = bus->next) {
for(dev = bus->devices; dev; dev = dev->next) { for(dev = bus->devices; dev; dev = dev->next) {
/* Check for ST Microelectronics vendor ID */ /* Check for ST Microelectronics vendor ID */
if(dev->descriptor.idVendor != 0x483) continue; if ((dev->descriptor.idVendor != 0x483) &&
(dev->descriptor.idVendor != 0x1d50))
continue;
handle = usb_open(dev); handle = usb_open(dev);
usb_get_string_simple(handle, dev->descriptor.iManufacturer, man, usb_get_string_simple(handle, dev->descriptor.iManufacturer, man,
@ -66,12 +68,14 @@ struct usb_device * find_dev(void)
#endif #endif
usb_close(handle); usb_close(handle);
if((dev->descriptor.idProduct == 0x5740) && if (((dev->descriptor.idProduct == 0x5740) ||
(dev->descriptor.idProduct == 0x6018)) &&
!strcmp(man, "Black Sphere Technologies") && !strcmp(man, "Black Sphere Technologies") &&
!strcmp(prod, "Black Magic Firmware Upgrade")) !strcmp(prod, "Black Magic Firmware Upgrade"))
return dev; return dev;
if((dev->descriptor.idProduct == 0xDF11) && if (((dev->descriptor.idProduct == 0xDF11) ||
(dev->descriptor.idProduct == 0x6017)) &&
!strcmp(man, "Black Sphere Technologies") && !strcmp(man, "Black Sphere Technologies") &&
!strcmp(prod, "Black Magic Probe (Upgrade)")) !strcmp(prod, "Black Magic Probe (Upgrade)"))
return dev; return dev;
@ -105,7 +109,6 @@ usb_dev_handle * get_dfu_interface(struct usb_device *dev, uint16_t *interface)
return handle; return handle;
} }
} }
} }
} }
return NULL; return NULL;