From d3c623e1e184bb36873c1ba9664f0c8266139589 Mon Sep 17 00:00:00 2001 From: Dean Camera <dean@fourwalledcubicle.com> Date: Thu, 13 May 2010 07:31:27 +0000 Subject: [PATCH] The LIBUSB_FILTERDRV_COMPAT compile time option in the XPLAINBridge and AVRISP-MKII projects has been renamed LIBUSB_DRIVER_COMPAT, as it applies to all software on all platforms using the libUSB driver. Fix Benito makefile which was accidentally changed during testing. --- LUFA/ManPages/ChangeLog.txt | 2 ++ Projects/AVRISP-MKII/AVRISP.c | 2 +- Projects/AVRISP-MKII/AVRISP.txt | 5 ++--- Projects/AVRISP-MKII/Descriptors.h | 2 +- Projects/AVRISP-MKII/makefile | 3 +-- Projects/Benito/makefile | 4 ++-- Projects/XPLAINBridge/AVRISPDescriptors.h | 2 +- Projects/XPLAINBridge/XPLAINBridge.c | 2 +- Projects/XPLAINBridge/XPLAINBridge.txt | 5 ++--- Projects/XPLAINBridge/makefile | 2 +- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index d93b2f089..16925c00b 100644 --- a/LUFA/ManPages/ChangeLog.txt +++ b/LUFA/ManPages/ChangeLog.txt @@ -11,6 +11,8 @@ * * <b>Changed:</b> * - The TeensyHID bootloader has been removed, per request from Paul at PJRC + * - The LIBUSB_FILTERDRV_COMPAT compile time option in the XPLAINBridge and AVRISP-MKII projects has been renamed + * LIBUSB_DRIVER_COMPAT, as it applies to all software on all platforms using the libUSB driver * * <b>Fixed:</b> * diff --git a/Projects/AVRISP-MKII/AVRISP.c b/Projects/AVRISP-MKII/AVRISP.c index 88403b269..e26d16c4c 100644 --- a/Projects/AVRISP-MKII/AVRISP.c +++ b/Projects/AVRISP-MKII/AVRISP.c @@ -98,7 +98,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } - #if defined(LIBUSB_FILTERDRV_COMPAT) + #if defined(LIBUSB_DRIVER_COMPAT) if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE, ENDPOINT_BANK_SINGLE))) diff --git a/Projects/AVRISP-MKII/AVRISP.txt b/Projects/AVRISP-MKII/AVRISP.txt index 6483cbd03..38248a279 100644 --- a/Projects/AVRISP-MKII/AVRISP.txt +++ b/Projects/AVRISP-MKII/AVRISP.txt @@ -259,11 +259,10 @@ * to report a fixed 5V target voltage to the host regardless of the real target voltage.</td> * </tr> * <tr> - * <td>LIBUSB_FILTERDRV_COMPAT</td> + * <td>LIBUSB_DRIVER_COMPAT</td> * <td>Makefile CDEFS</td> * <td>Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making - * the code compatible with Windows builds of avrdude using the libUSB driver. Linux platforms are not affected by this - * option. + * the code compatible with software such as avrdude (all platforms) that use the libUSB driver. * </tr> * </table> */ diff --git a/Projects/AVRISP-MKII/Descriptors.h b/Projects/AVRISP-MKII/Descriptors.h index 7415d8138..f94689976 100644 --- a/Projects/AVRISP-MKII/Descriptors.h +++ b/Projects/AVRISP-MKII/Descriptors.h @@ -42,7 +42,7 @@ #include <LUFA/Drivers/USB/USB.h> /* Macros: */ - #if !defined(LIBUSB_FILTERDRV_COMPAT) + #if !defined(LIBUSB_DRIVER_COMPAT) /** Endpoint number of the AVRISP data OUT endpoint. */ #define AVRISP_DATA_OUT_EPNUM 2 diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index a0169332f..9cba8730a 100644 --- a/Projects/AVRISP-MKII/makefile +++ b/Projects/AVRISP-MKII/makefile @@ -197,9 +197,8 @@ CDEFS += -DAUX_LINE_MASK="(1 << 4)" CDEFS += -DVTARGET_ADC_CHANNEL=2 CDEFS += -DENABLE_ISP_PROTOCOL CDEFS += -DENABLE_XPROG_PROTOCOL -#CDEFS += -DXPROG_VIA_HARDWARE_USART #CDEFS += -DNO_VTARGET_DETECT -#CDEFS += -DLIBUSB_FILTERDRV_COMPAT +#CDEFS += -DLIBUSB_DRIVER_COMPAT # Place -D or -U options here for ASM sources diff --git a/Projects/Benito/makefile b/Projects/Benito/makefile index f714935d4..4fadc10c1 100644 --- a/Projects/Benito/makefile +++ b/Projects/Benito/makefile @@ -60,13 +60,13 @@ # MCU name -MCU = at90usb647 +MCU = atmega32u4 # Target board (see library "Board Types" documentation, NONE for projects not requiring # LUFA board drivers). If USER is selected, put custom board drivers in a directory called # "Board" inside the application directory. -BOARD = USBKEY +BOARD = BENITO # Processor frequency. diff --git a/Projects/XPLAINBridge/AVRISPDescriptors.h b/Projects/XPLAINBridge/AVRISPDescriptors.h index 7f190195e..7731aca0d 100644 --- a/Projects/XPLAINBridge/AVRISPDescriptors.h +++ b/Projects/XPLAINBridge/AVRISPDescriptors.h @@ -42,7 +42,7 @@ #include <LUFA/Drivers/USB/USB.h> /* Macros: */ - #if !defined(LIBUSB_FILTERDRV_COMPAT) + #if !defined(LIBUSB_DRIVER_COMPAT) /** Endpoint number of the AVRISP data OUT endpoint. */ #define AVRISP_DATA_OUT_EPNUM 2 diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 5d7605206..ef311d060 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -192,7 +192,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE, ENDPOINT_BANK_SINGLE); - #if defined(LIBUSB_FILTERDRV_COMPAT) + #if defined(LIBUSB_DRIVER_COMPAT) EndpointConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK, ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE, ENDPOINT_BANK_SINGLE); diff --git a/Projects/XPLAINBridge/XPLAINBridge.txt b/Projects/XPLAINBridge/XPLAINBridge.txt index 0c5635ac7..3f9ab8ed3 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.txt +++ b/Projects/XPLAINBridge/XPLAINBridge.txt @@ -79,11 +79,10 @@ * <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td> * </tr> * <tr> - * <td>LIBUSB_FILTERDRV_COMPAT</td> + * <td>LIBUSB_DRIVER_COMPAT</td> * <td>Makefile CDEFS</td> * <td>Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making - * the code compatible with Windows builds of avrdude using the libUSB driver. Linux platforms are not affected by this - * option. + * the code compatible with software such as avrdude (all platforms) that use the libUSB driver. * </tr> * </table> */ \ No newline at end of file diff --git a/Projects/XPLAINBridge/makefile b/Projects/XPLAINBridge/makefile index 4931d2f38..36f5c494d 100644 --- a/Projects/XPLAINBridge/makefile +++ b/Projects/XPLAINBridge/makefile @@ -202,7 +202,7 @@ CDEFS += -DAUX_LINE_PIN=PINB CDEFS += -DAUX_LINE_DDR=DDRB CDEFS += -DAUX_LINE_MASK="(1 << 4)" CDEFS += -DVTARGET_ADC_CHANNEL=2 -#CDEFS += -DLIBUSB_FILTERDRV_COMPAT +#CDEFS += -DLIBUSB_DRIVER_COMPAT # Place -D or -U options here for ASM sources -- GitLab