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/AVRISP-MKII | |
| 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/AVRISP-MKII')
| -rw-r--r-- | Projects/AVRISP-MKII/AVRISP.c | 2 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/AVRISP.txt | 5 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/Descriptors.h | 2 | ||||
| -rw-r--r-- | Projects/AVRISP-MKII/makefile | 3 |
4 files changed, 5 insertions, 7 deletions
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 |