avr/avrdude
2
0
Fork 0
mirror of https://github.com/mariusgreuel/avrdude.git synced 2025-09-27 14:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Submitted by Stephen Roe:

Browse Source 
patch #7710: usb_libusb: Check VID/PID before opening device
* usb_libusb.c (usbdev_open): Swap the sequence of verifying the
VID:PID, and opening the device.



git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1228 81a1dc3b-b13d-400b-aceb-764788c761c2
This commit is contained in:
joerg_wunsch
2013-09-13 19:56:07 +00:00
parent b22d8a5dcd
commit 97ca8c2e5d
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
usb_libusb.c
View File

@@ -115,11 +115,11 @@ static int usbdev_open(char * port, long baud, union filedescriptor *fd)
{
for (dev = bus->devices; dev; dev = dev->next)
{
udev = usb_open(dev);
if (udev)
if (dev->descriptor.idVendor == USB_VENDOR_ATMEL &&
dev->descriptor.idProduct == (unsigned short)baud)
{
if (dev->descriptor.idVendor == USB_VENDOR_ATMEL &&
dev->descriptor.idProduct == (unsigned short)baud)
udev = usb_open(dev);
if (udev)
{
/* yeah, we found something */
if (usb_get_string_simple(udev,
@@ -246,10 +246,14 @@ static int usbdev_open(char * port, long baud, union filedescriptor *fd)
fd->usb.max_xfer = dev->config[0].interface[0].altsetting[0].endpoint[i].wMaxPacketSize;
}
}
return 0;
return 0;
trynext:
usb_close(udev);
}
trynext:
usb_close(udev);
else
fprintf(stderr,
"%s: usbdev_open(): cannot open device: %s\n",
progname, usb_strerror());
}
}
}