avr
/
avrdude
mirror of https://github.com/mariusgreuel/avrdude.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Submitted by Stephen Roe: 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2013-09-13 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
Submitted by Stephen Roe:
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.
2013-09-13 Joerg Wunsch <j.gnu@uriah.heep.sax.de> 2013-09-13 Joerg Wunsch <j.gnu@uriah.heep.sax.de>
patch #8176: butterfly.c (AVR109 protocol implementation) clean-up and bug-fixing patch #8176: butterfly.c (AVR109 protocol implementation) clean-up and bug-fixing

9
NEWS
View File

@ -107,10 +107,11 @@ Current:
- bug #28344: chip_erase_delay too short for ATmega324P, 644, 644P, and 1284P - bug #28344: chip_erase_delay too short for ATmega324P, 644, 644P, and 1284P
- bug #34277: avrdude reads wrong byte order if using avr911 (aka butterfly) - bug #34277: avrdude reads wrong byte order if using avr911 (aka butterfly)
- bug #35456: The progress bar for STK500V2 programmer is "wrong". - bug #35456: The progress bar for STK500V2 programmer is "wrong".
- patch #5708 avrdude should make 10 synchronization attempts instead of just one - patch #5708: avrdude should make 10 synchronization attempts instead of just one
- patch #7606 ATtiny43u support - patch #7606: ATtiny43u support
- patch #7657 Add ATmega406 support for avrdude using DRAGON + JTAG - patch #7657: Add ATmega406 support for avrdude using DRAGON + JTAG
- bug #35474 Feature request: print fuse values in safemode output. - bug #35474: Feature request: print fuse values in safemode output.
- patch #7710: usb_libusb: Check VID/PID before opening device
* Keep track of input file contents * Keep track of input file contents

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) for (dev = bus->devices; dev; dev = dev->next)
{ {
udev = usb_open(dev); if (dev->descriptor.idVendor == USB_VENDOR_ATMEL &&
if (udev) dev->descriptor.idProduct == (unsigned short)baud)
{ {
if (dev->descriptor.idVendor == USB_VENDOR_ATMEL && udev = usb_open(dev);
dev->descriptor.idProduct == (unsigned short)baud) if (udev)
{ {
/* yeah, we found something */ /* yeah, we found something */
if (usb_get_string_simple(udev, 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; fd->usb.max_xfer = dev->config[0].interface[0].altsetting[0].endpoint[i].wMaxPacketSize;
} }
} }
return 0; return 0;
trynext:
usb_close(udev);
} }
trynext: else
usb_close(udev); fprintf(stderr,
"%s: usbdev_open(): cannot open device: %s\n",
progname, usb_strerror());
} }
} }
} }