diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt index d93b2f08950248d6e4bbc536f125c014d2ec5eab..16925c00b6b70bcbb2541c253588e6f38a39cfa4 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 88403b26938f40e47a82d653393656c995322f74..e26d16c4c875c66be51bd729d37bcb0934282b4a 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 6483cbd035f337e36c4b27bd15ba27234f45d409..38248a2796f4622fea007c57be9fb1c2496bbd98 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 7415d8138ced081d381c6c7d9b1fc436b53a44fb..f946899760c8418f5ad8e5a25d55443e2cc9f162 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 a0169332ffd29fcd9829a3580aa7a0fcaa222980..9cba8730a84b27a1501fe4e141628f02c48faa29 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 f714935d4b66262014b83db128573b73063a0763..4fadc10c19d6778627e36a93163a5710b37417da 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 7f190195eb2753aff5c1fbcc993dd16ff307fd1a..7731aca0d71c4167008676bdb6a97f197017bf85 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 5d7605206a533d8691f7078e056b4f969cb81e3b..ef311d0605eb02c1181c7a8508790c6fbc8bf699 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 0c5635ac7c3000d27409f1070bf7aa87b67c8daf..3f9ab8ed37cbddbcb4271c5ce6c3b593cd91d95f 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 4931d2f382c5bb7ba913f6fc85fb73661604f45f..36f5c494d1c864f259b4e1cf79c773f4db36c41b 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