The LIBUSB_FILTERDRV_COMPAT compile time option in the XPLAINBridge and AVRISP-MKII...

Fix Benito makefile which was accidentally changed during testing.

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index d93b2f0..16925c0 100644 (file)
--- 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 88403b2..e26d16c 100644 (file)
--- 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 6483cbd..38248a2 100644 (file)
--- 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 7415d81..f946899 100644 (file)
--- 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 a016933..9cba873 100644 (file)
--- 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 f714935..4fadc10 100644 (file)
--- 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 7f19019..7731aca 100644 (file)
--- 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 5d76052..ef311d0 100644 (file)
--- 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 0c5635a..3f9ab8e 100644 (file)
--- 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 4931d2f..36f5c49 100644 (file)
--- 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