diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2010-05-13 07:31:27 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-05-13 07:31:27 +0000 |
commit | d3c623e1e184bb36873c1ba9664f0c8266139589 (patch) | |
tree | b76c6aaac154031b7b4f2d248d0b19c45ef78860 /Projects/XPLAINBridge | |
parent | e277ff0cf45e68fc16287b2fd2a054ae4e6a6ea8 (diff) | |
download | lufa-d3c623e1e184bb36873c1ba9664f0c8266139589.tar.gz lufa-d3c623e1e184bb36873c1ba9664f0c8266139589.tar.bz2 lufa-d3c623e1e184bb36873c1ba9664f0c8266139589.zip |
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.
Diffstat (limited to 'Projects/XPLAINBridge')
-rw-r--r-- | Projects/XPLAINBridge/AVRISPDescriptors.h | 2 | ||||
-rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.c | 2 | ||||
-rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.txt | 5 | ||||
-rw-r--r-- | Projects/XPLAINBridge/makefile | 2 |
4 files changed, 5 insertions, 6 deletions
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 |