Commit d3c623e1 authored by Dean Camera's avatar Dean Camera
Browse files

The LIBUSB_FILTERDRV_COMPAT compile time option in the XPLAINBridge and...

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.
parent e277ff0c
......@@ -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>
*
......
......@@ -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)))
......
......@@ -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>
*/
......@@ -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
......
......@@ -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
......
......@@ -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.
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment