eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Dean Camera 2010-05-13 07:31:27 +00:00
parent e277ff0cf4
commit d3c623e1e1
10 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LUFA/ManPages/ChangeLog.txt
View File

@ -11,6 +11,8 @@
* *
* <b>Changed:</b> * <b>Changed:</b>
* - The TeensyHID bootloader has been removed, per request from Paul at PJRC * - 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> * <b>Fixed:</b>
* *

2
Projects/AVRISP-MKII/AVRISP.c
View File

@ -98,7 +98,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
LEDs_SetAllLEDs(LEDMASK_USB_ERROR); 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, if (!(Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE, ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,
ENDPOINT_BANK_SINGLE))) ENDPOINT_BANK_SINGLE)))

5
Projects/AVRISP-MKII/AVRISP.txt
View File

@ -259,11 +259,10 @@
* to report a fixed 5V target voltage to the host regardless of the real target voltage.</td> * to report a fixed 5V target voltage to the host regardless of the real target voltage.</td>
* </tr> * </tr>
* <tr> * <tr>
* <td>LIBUSB_FILTERDRV_COMPAT</td> * <td>LIBUSB_DRIVER_COMPAT</td>
* <td>Makefile CDEFS</td> * <td>Makefile CDEFS</td>
* <td>Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making * <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 * the code compatible with software such as avrdude (all platforms) that use the libUSB driver.
* option.
* </tr> * </tr>
* </table> * </table>
*/ */

2
Projects/AVRISP-MKII/Descriptors.h
View File

@ -42,7 +42,7 @@
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
/* Macros: */ /* Macros: */
#if !defined(LIBUSB_FILTERDRV_COMPAT) #if !defined(LIBUSB_DRIVER_COMPAT)
/** Endpoint number of the AVRISP data OUT endpoint. */ /** Endpoint number of the AVRISP data OUT endpoint. */
#define AVRISP_DATA_OUT_EPNUM 2 #define AVRISP_DATA_OUT_EPNUM 2

3
Projects/AVRISP-MKII/makefile
View File

@ -197,9 +197,8 @@ CDEFS += -DAUX_LINE_MASK="(1 << 4)"
CDEFS += -DVTARGET_ADC_CHANNEL=2 CDEFS += -DVTARGET_ADC_CHANNEL=2
CDEFS += -DENABLE_ISP_PROTOCOL CDEFS += -DENABLE_ISP_PROTOCOL
CDEFS += -DENABLE_XPROG_PROTOCOL CDEFS += -DENABLE_XPROG_PROTOCOL
#CDEFS += -DXPROG_VIA_HARDWARE_USART
#CDEFS += -DNO_VTARGET_DETECT #CDEFS += -DNO_VTARGET_DETECT
#CDEFS += -DLIBUSB_FILTERDRV_COMPAT #CDEFS += -DLIBUSB_DRIVER_COMPAT
# Place -D or -U options here for ASM sources # Place -D or -U options here for ASM sources

4
Projects/Benito/makefile
View File

@ -60,13 +60,13 @@
# MCU name # MCU name
MCU = at90usb647 MCU = atmega32u4
# Target board (see library "Board Types" documentation, NONE for projects not requiring # 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 # LUFA board drivers). If USER is selected, put custom board drivers in a directory called
# "Board" inside the application directory. # "Board" inside the application directory.
BOARD = USBKEY BOARD = BENITO
# Processor frequency. # Processor frequency.

2
Projects/XPLAINBridge/AVRISPDescriptors.h
View File

@ -42,7 +42,7 @@
#include <LUFA/Drivers/USB/USB.h> #include <LUFA/Drivers/USB/USB.h>
/* Macros: */ /* Macros: */
#if !defined(LIBUSB_FILTERDRV_COMPAT) #if !defined(LIBUSB_DRIVER_COMPAT)
/** Endpoint number of the AVRISP data OUT endpoint. */ /** Endpoint number of the AVRISP data OUT endpoint. */
#define AVRISP_DATA_OUT_EPNUM 2 #define AVRISP_DATA_OUT_EPNUM 2

2
Projects/XPLAINBridge/XPLAINBridge.c
View File

@ -192,7 +192,7 @@ void EVENT_USB_Device_ConfigurationChanged(void)
ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE, ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE,
ENDPOINT_BANK_SINGLE); ENDPOINT_BANK_SINGLE);
#if defined(LIBUSB_FILTERDRV_COMPAT) #if defined(LIBUSB_DRIVER_COMPAT)
EndpointConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK, EndpointConfigSuccess &= Endpoint_ConfigureEndpoint(AVRISP_DATA_IN_EPNUM, EP_TYPE_BULK,
ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE, ENDPOINT_DIR_IN, AVRISP_DATA_EPSIZE,
ENDPOINT_BANK_SINGLE); ENDPOINT_BANK_SINGLE);

5
Projects/XPLAINBridge/XPLAINBridge.txt
View File

@ -79,11 +79,10 @@
* <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td> * <td>Defines the maximum number of bytes which can be buffered in each Ring Buffer.</td>
* </tr> * </tr>
* <tr> * <tr>
* <td>LIBUSB_FILTERDRV_COMPAT</td> * <td>LIBUSB_DRIVER_COMPAT</td>
* <td>Makefile CDEFS</td> * <td>Makefile CDEFS</td>
* <td>Define to switch to a non-standard endpoint scheme, breaking compatibility with AVRStudio under Windows but making * <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 * the code compatible with software such as avrdude (all platforms) that use the libUSB driver.
* option.
* </tr> * </tr>
* </table> * </table>
*/ */

2
Projects/XPLAINBridge/makefile
View File

@ -202,7 +202,7 @@ CDEFS += -DAUX_LINE_PIN=PINB
CDEFS += -DAUX_LINE_DDR=DDRB CDEFS += -DAUX_LINE_DDR=DDRB
CDEFS += -DAUX_LINE_MASK="(1 << 4)" CDEFS += -DAUX_LINE_MASK="(1 << 4)"
CDEFS += -DVTARGET_ADC_CHANNEL=2 CDEFS += -DVTARGET_ADC_CHANNEL=2
#CDEFS += -DLIBUSB_FILTERDRV_COMPAT #CDEFS += -DLIBUSB_DRIVER_COMPAT
# Place -D or -U options here for ASM sources # Place -D or -U options here for ASM sources