From e984f829797d5bfecee7eedd44638566de210491 Mon Sep 17 00:00:00 2001 From: dhoerl Date: Thu, 22 Oct 2009 19:48:01 +0000 Subject: [PATCH] bug #22271 (project avrdude) - disable usb_reset() for Macs (was just FreeBSD) git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@873 81a1dc3b-b13d-400b-aceb-764788c761c2 --- ChangeLog | 4 ++++ usb_libusb.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index aa4a5518..695777a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-10-22 David Hoerl + + * usb_libusb.c: disabled usb_reset for Macs (same as FreeBSD) + 2009-10-12 Michal Ludvig * main.c: Re-added default to serial port for BusPirate. diff --git a/usb_libusb.c b/usb_libusb.c index b3aa20e8..a051e89c 100644 --- a/usb_libusb.c +++ b/usb_libusb.c @@ -239,7 +239,7 @@ static void usbdev_close(union filedescriptor *fd) (void)usb_release_interface(udev, usb_interface); -#if !defined(__FreeBSD__) +#if !( defined(__FreeBSD__) || ( defined(__APPLE__) && defined(__MACH__) ) ) /* * Without this reset, the AVRISP mkII seems to stall the second * time we try to connect to it. This is not necessary on