From ee74b4948f5911de678886890d991db2b3267b06 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Tue, 6 Apr 2010 02:48:47 +0000 Subject: Add information request/response signal handler to the Bluetooth Host demo. Ensure that the AVRISP-MKII project's Windows avrdude compatibility define is named properly in all parts of the code. --- Projects/AVRISP-MKII/AVRISP.c | 2 +- Projects/AVRISP-MKII/AVRISP.txt | 2 +- Projects/AVRISP-MKII/makefile | 2 +- Projects/XPLAINBridge/XPLAINBridge.c | 2 +- Projects/XPLAINBridge/XPLAINBridge.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Projects') diff --git a/Projects/AVRISP-MKII/AVRISP.c b/Projects/AVRISP-MKII/AVRISP.c index ed101b889..2ba800199 100644 --- a/Projects/AVRISP-MKII/AVRISP.c +++ b/Projects/AVRISP-MKII/AVRISP.c @@ -97,7 +97,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) LEDs_SetAllLEDs(LEDMASK_USB_ERROR); } - #if defined(WIN_LIBUSB_COMPAT) + #if defined(LIBUSB_FILTERDRV_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 b54125795..fddae6d2b 100644 --- a/Projects/AVRISP-MKII/AVRISP.txt +++ b/Projects/AVRISP-MKII/AVRISP.txt @@ -274,7 +274,7 @@ * to report a fixed 5V target voltage to the host regardless of the real target voltage. * * - * WIN_LIBUSB_COMPAT + * LIBUSB_FILTERDRV_COMPAT * Makefile CDEFS * 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 diff --git a/Projects/AVRISP-MKII/makefile b/Projects/AVRISP-MKII/makefile index 1ea3b8d5b..db71f12e5 100644 --- a/Projects/AVRISP-MKII/makefile +++ b/Projects/AVRISP-MKII/makefile @@ -199,7 +199,7 @@ CDEFS += -DENABLE_ISP_PROTOCOL CDEFS += -DENABLE_XPROG_PROTOCOL #CDEFS += -DXPROG_VIA_HARDWARE_USART #CDEFS += -DNO_VTARGET_DETECT -#CDEFS += -DWIN_LIBUSB_COMPAT +#CDEFS += -DLIBUSB_FILTERDRV_COMPAT # Place -D or -U options here for ASM sources diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 7ca94b273..090b76791 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -191,7 +191,7 @@ void EVENT_USB_Device_ConfigurationChanged(void) ENDPOINT_DIR_OUT, AVRISP_DATA_EPSIZE, ENDPOINT_BANK_SINGLE); - #if defined(WIN_LIBUSB_COMPAT) + #if defined(LIBUSB_FILTERDRV_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 cd8efbc10..40ea08e6a 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.txt +++ b/Projects/XPLAINBridge/XPLAINBridge.txt @@ -79,7 +79,7 @@ * Defines the maximum number of bytes which can be buffered in each Ring Buffer. * * - * WIN_LIBUSB_COMPAT + * LIBUSB_FILTERDRV_COMPAT * Makefile CDEFS * 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 -- cgit v1.2.3