From feabfd12ce3d14b43d2decb2b2f1c5b27e9d6181 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 19 Jun 2009 05:08:04 +0000 Subject: [PATCH] Fix makefiles -- the auto-addition of -D switches to each LUFA compile time option was faulty, due to GNUMake becomming confused by the spaces in the USE_STATIC_OPTIONS lines. Make user add in the switches explicitly instead. --- Bootloaders/CDC/makefile | 14 +++++++------- Bootloaders/DFU/makefile | 16 ++++++++-------- Bootloaders/TeensyHID/makefile | 16 ++++++++-------- Demos/Device/ClassDriver/AudioInput/makefile | 14 +++++++------- Demos/Device/ClassDriver/AudioOutput/makefile | 14 +++++++------- Demos/Device/ClassDriver/CDC/makefile | 12 ++++++------ Demos/Device/ClassDriver/DualCDC/makefile | 12 ++++++------ Demos/Device/ClassDriver/GenericHID/makefile | 12 ++++++------ Demos/Device/ClassDriver/Joystick/makefile | 12 ++++++------ Demos/Device/ClassDriver/Keyboard/makefile | 12 ++++++------ Demos/Device/ClassDriver/KeyboardMouse/makefile | 12 ++++++------ Demos/Device/ClassDriver/MIDI/makefile | 12 ++++++------ Demos/Device/ClassDriver/MassStorage/makefile | 12 ++++++------ Demos/Device/ClassDriver/Mouse/makefile | 12 ++++++------ Demos/Device/ClassDriver/RNDISEthernet/makefile | 14 +++++++------- Demos/Device/ClassDriver/USBtoSerial/makefile | 12 ++++++------ Demos/Device/Incomplete/Sideshow/makefile | 14 +++++++------- Demos/Device/LowLevel/AudioInput/makefile | 14 +++++++------- Demos/Device/LowLevel/AudioOutput/makefile | 14 +++++++------- Demos/Device/LowLevel/CDC/makefile | 14 +++++++------- Demos/Device/LowLevel/DualCDC/makefile | 14 +++++++------- Demos/Device/LowLevel/GenericHID/makefile | 14 +++++++------- Demos/Device/LowLevel/Joystick/makefile | 14 +++++++------- Demos/Device/LowLevel/Keyboard/makefile | 14 +++++++------- Demos/Device/LowLevel/KeyboardMouse/makefile | 14 +++++++------- Demos/Device/LowLevel/MIDI/makefile | 14 +++++++------- Demos/Device/LowLevel/MassStorage/makefile | 14 +++++++------- Demos/Device/LowLevel/Mouse/makefile | 14 +++++++------- Demos/Device/LowLevel/RNDISEthernet/makefile | 16 ++++++++-------- Demos/Device/LowLevel/USBtoSerial/makefile | 14 +++++++------- Demos/Host/ClassDriver/CDCHost/makefile | 10 +++++----- Demos/Host/ClassDriver/GenericHIDHost/makefile | 10 +++++----- Demos/Host/ClassDriver/KeyboardHost/makefile | 10 +++++----- .../ClassDriver/KeyboardHostWithParser/makefile | 10 +++++----- Demos/Host/ClassDriver/MassStorageHost/makefile | 12 ++++++------ Demos/Host/ClassDriver/MouseHost/makefile | 10 +++++----- .../ClassDriver/MouseHostWithParser/makefile | 10 +++++----- Demos/Host/ClassDriver/StillImageHost/makefile | 10 +++++----- Demos/Host/Incomplete/BluetoothHost/makefile | 10 +++++----- Demos/Host/LowLevel/CDCHost/makefile | 10 +++++----- Demos/Host/LowLevel/GenericHIDHost/makefile | 10 +++++----- Demos/Host/LowLevel/KeyboardHost/makefile | 10 +++++----- .../LowLevel/KeyboardHostWithParser/makefile | 10 +++++----- Demos/Host/LowLevel/MassStorageHost/makefile | 12 ++++++------ Demos/Host/LowLevel/MouseHost/makefile | 10 +++++----- Demos/Host/LowLevel/MouseHostWithParser/makefile | 10 +++++----- Demos/Host/LowLevel/StillImageHost/makefile | 10 +++++----- Demos/Host/makefile | 2 +- Demos/OTG/TestApp/makefile | 4 ++-- LUFA/Drivers/USB/LowLevel/Host.c | 2 +- LUFA/Drivers/USB/LowLevel/Host.h | 2 +- LUFA/ManPages/FutureChanges.txt | 1 + Projects/Magstripe/makefile | 12 ++++++------ Projects/MissileLauncher/makefile | 10 +++++----- 54 files changed, 307 insertions(+), 306 deletions(-) diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile index 71e2da7f6a..fce2e5b887 100644 --- a/Bootloaders/CDC/makefile +++ b/Bootloaders/CDC/makefile @@ -111,12 +111,12 @@ LUFA_PATH = ../.. # LUFA library compile-time options -LUFA_OPTS = USB_DEVICE_ONLY -LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += USE_RAM_DESCRIPTORS +LUFA_OPTS = -D USB_DEVICE_ONLY +LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D USE_RAM_DESCRIPTORS # List C source files here. (C dependencies are automatically generated.) @@ -181,7 +181,7 @@ BOOT_START = 0x1E000 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile index 410301431e..f3d5cfad85 100644 --- a/Bootloaders/DFU/makefile +++ b/Bootloaders/DFU/makefile @@ -111,13 +111,13 @@ LUFA_PATH = ../.. # LUFA library compile-time options -LUFA_OPTS = USB_DEVICE_ONLY -LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += CONTROL_ONLY_DEVICE -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=32 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += USE_RAM_DESCRIPTORS +LUFA_OPTS = -D USB_DEVICE_ONLY +LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D CONTROL_ONLY_DEVICE +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D USE_RAM_DESCRIPTORS # List C source files here. (C dependencies are automatically generated.) @@ -182,7 +182,7 @@ BOOT_START = 0x1E000 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile index f4b8843086..ea528fb00a 100644 --- a/Bootloaders/TeensyHID/makefile +++ b/Bootloaders/TeensyHID/makefile @@ -111,13 +111,13 @@ LUFA_PATH = ../.. # LUFA library compile-time options -LUFA_OPTS = USB_DEVICE_ONLY -LUFA_OPTS += USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += CONTROL_ONLY_DEVICE -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += USE_RAM_DESCRIPTORS +LUFA_OPTS = -D USB_DEVICE_ONLY +LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D CONTROL_ONLY_DEVICE +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D USE_RAM_DESCRIPTORS # List C source files here. (C dependencies are automatically generated.) @@ -182,7 +182,7 @@ BOOT_START = 0xC000 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS += -DBOOT_START_ADDR=$(BOOT_START)UL diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile index 2e3e72f0a4..c4b0b4b1c6 100644 --- a/Demos/Device/ClassDriver/AudioInput/makefile +++ b/Demos/Device/ClassDriver/AudioInput/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile index 4f76df9b9a..2bdb37a45b 100644 --- a/Demos/Device/ClassDriver/AudioOutput/makefile +++ b/Demos/Device/ClassDriver/AudioOutput/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS += -DAUDIO_OUT_MONO diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile index cb3e0fe0fc..85e51e5ef4 100644 --- a/Demos/Device/ClassDriver/CDC/makefile +++ b/Demos/Device/ClassDriver/CDC/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile index cde2ed46aa..fcaeab77f8 100644 --- a/Demos/Device/ClassDriver/DualCDC/makefile +++ b/Demos/Device/ClassDriver/DualCDC/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile index d202bafdf4..79416c5362 100644 --- a/Demos/Device/ClassDriver/GenericHID/makefile +++ b/Demos/Device/ClassDriver/GenericHID/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile index 67f4d0b473..cc5a070547 100644 --- a/Demos/Device/ClassDriver/Joystick/makefile +++ b/Demos/Device/ClassDriver/Joystick/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile index 4bdc241d30..30add8a9a1 100644 --- a/Demos/Device/ClassDriver/Keyboard/makefile +++ b/Demos/Device/ClassDriver/Keyboard/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile index 3607f579f2..aec7852933 100644 --- a/Demos/Device/ClassDriver/KeyboardMouse/makefile +++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile index 7221faf390..a9e1497018 100644 --- a/Demos/Device/ClassDriver/MIDI/makefile +++ b/Demos/Device/ClassDriver/MIDI/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile index e918e0a989..962cc008e5 100644 --- a/Demos/Device/ClassDriver/MassStorage/makefile +++ b/Demos/Device/ClassDriver/MassStorage/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile index daa145615b..271f174c53 100644 --- a/Demos/Device/ClassDriver/Mouse/makefile +++ b/Demos/Device/ClassDriver/Mouse/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile index ada0a13605..b2328b9bd0 100644 --- a/Demos/Device/ClassDriver/RNDISEthernet/makefile +++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -200,8 +200,8 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) -CDEFS += NO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) +CDEFS += -DNO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP # Place -D or -U options here for ASM sources diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile index 7c3aa10cce..3c202104a9 100644 --- a/Demos/Device/ClassDriver/USBtoSerial/makefile +++ b/Demos/Device/ClassDriver/USBtoSerial/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/Incomplete/Sideshow/makefile b/Demos/Device/Incomplete/Sideshow/makefile index 5157d4f49b..7c44d8be38 100644 --- a/Demos/Device/Incomplete/Sideshow/makefile +++ b/Demos/Device/Incomplete/Sideshow/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -195,7 +195,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile index 8ebf0494f4..58e953e96a 100644 --- a/Demos/Device/LowLevel/AudioInput/makefile +++ b/Demos/Device/LowLevel/AudioInput/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile index 1401e90c3b..63ad2df31a 100644 --- a/Demos/Device/LowLevel/AudioOutput/makefile +++ b/Demos/Device/LowLevel/AudioOutput/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS += -DAUDIO_OUT_STEREO diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile index ea135975c9..886a66f963 100644 --- a/Demos/Device/LowLevel/CDC/makefile +++ b/Demos/Device/LowLevel/CDC/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualCDC/makefile index 3191b60f38..b31a8da3f1 100644 --- a/Demos/Device/LowLevel/DualCDC/makefile +++ b/Demos/Device/LowLevel/DualCDC/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile index e53346b932..3d7cf94c34 100644 --- a/Demos/Device/LowLevel/GenericHID/makefile +++ b/Demos/Device/LowLevel/GenericHID/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile index a9a51d17b8..ac6a31f01e 100644 --- a/Demos/Device/LowLevel/Joystick/makefile +++ b/Demos/Device/LowLevel/Joystick/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile index a3399110dd..a73167a56a 100644 --- a/Demos/Device/LowLevel/Keyboard/makefile +++ b/Demos/Device/LowLevel/Keyboard/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile index 7282d9fc84..acb2438b85 100644 --- a/Demos/Device/LowLevel/KeyboardMouse/makefile +++ b/Demos/Device/LowLevel/KeyboardMouse/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile index f9ff1ed834..cd5795bb74 100644 --- a/Demos/Device/LowLevel/MIDI/makefile +++ b/Demos/Device/LowLevel/MIDI/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile index e23014680b..062007f149 100644 --- a/Demos/Device/LowLevel/MassStorage/makefile +++ b/Demos/Device/LowLevel/MassStorage/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += INTERRUPT_CONTROL_ENDPOINT +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile index 49126802d6..fc7d438b6e 100644 --- a/Demos/Device/LowLevel/Mouse/makefile +++ b/Demos/Device/LowLevel/Mouse/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -188,7 +188,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile index e17c734456..423aaab0f8 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/makefile +++ b/Demos/Device/LowLevel/RNDISEthernet/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -201,8 +201,8 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) -CDEFS += NO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) +CDEFS += -DNO_DECODE_ETHERNET -DNO_DECODE_ARP -DNO_DECODE_ICMP -DNO_DECODE_IP -DNO_DECODE_TCP -DNO_DECODE_UDP -DNO_DECODE_DHCP # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile index ff46809e4a..00e4c55651 100644 --- a/Demos/Device/LowLevel/USBtoSerial/makefile +++ b/Demos/Device/LowLevel/USBtoSerial/makefile @@ -123,12 +123,12 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/CDCHost/makefile b/Demos/Host/ClassDriver/CDCHost/makefile index 59e7953948..2d18a17818 100644 --- a/Demos/Host/ClassDriver/CDCHost/makefile +++ b/Demos/Host/ClassDriver/CDCHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/GenericHIDHost/makefile b/Demos/Host/ClassDriver/GenericHIDHost/makefile index fa993051da..e21381524d 100644 --- a/Demos/Host/ClassDriver/GenericHIDHost/makefile +++ b/Demos/Host/ClassDriver/GenericHIDHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/KeyboardHost/makefile b/Demos/Host/ClassDriver/KeyboardHost/makefile index be9a8cadcd..348735980b 100644 --- a/Demos/Host/ClassDriver/KeyboardHost/makefile +++ b/Demos/Host/ClassDriver/KeyboardHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile index 4b9aa454a2..fb71c57c25 100644 --- a/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile +++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile index f9234f4162..be32c6285c 100644 --- a/Demos/Host/ClassDriver/MassStorageHost/makefile +++ b/Demos/Host/ClassDriver/MassStorageHost/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += USB_STREAM_TIMEOUT_MS=2000 +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=2000 # List C source files here. (C dependencies are automatically generated.) @@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/MouseHost/makefile b/Demos/Host/ClassDriver/MouseHost/makefile index be9e9d7cac..d835f279cc 100644 --- a/Demos/Host/ClassDriver/MouseHost/makefile +++ b/Demos/Host/ClassDriver/MouseHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/makefile b/Demos/Host/ClassDriver/MouseHostWithParser/makefile index c5f81e208e..4c05b9ff46 100644 --- a/Demos/Host/ClassDriver/MouseHostWithParser/makefile +++ b/Demos/Host/ClassDriver/MouseHostWithParser/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -192,7 +192,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/ClassDriver/StillImageHost/makefile b/Demos/Host/ClassDriver/StillImageHost/makefile index c1cedd8701..9ae6a02c1b 100644 --- a/Demos/Host/ClassDriver/StillImageHost/makefile +++ b/Demos/Host/ClassDriver/StillImageHost/makefile @@ -122,10 +122,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -188,7 +188,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile index 86bdd04057..2bbcc3be40 100644 --- a/Demos/Host/Incomplete/BluetoothHost/makefile +++ b/Demos/Host/Incomplete/BluetoothHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -193,7 +193,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/CDCHost/makefile index de217dff83..ac15810625 100644 --- a/Demos/Host/LowLevel/CDCHost/makefile +++ b/Demos/Host/LowLevel/CDCHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/GenericHIDHost/makefile b/Demos/Host/LowLevel/GenericHIDHost/makefile index a117578a3f..e75ef1490f 100644 --- a/Demos/Host/LowLevel/GenericHIDHost/makefile +++ b/Demos/Host/LowLevel/GenericHIDHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/KeyboardHost/makefile b/Demos/Host/LowLevel/KeyboardHost/makefile index ef77810ff5..b86760a59d 100644 --- a/Demos/Host/LowLevel/KeyboardHost/makefile +++ b/Demos/Host/LowLevel/KeyboardHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile index faf8910f6b..25144880ee 100644 --- a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile +++ b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile index f236eed2b6..96d1b9ffaa 100644 --- a/Demos/Host/LowLevel/MassStorageHost/makefile +++ b/Demos/Host/LowLevel/MassStorageHost/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -LUFA_OPTS += USB_STREAM_TIMEOUT_MS=2000 +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=2000 # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/MouseHost/makefile b/Demos/Host/LowLevel/MouseHost/makefile index f62697dad9..e6eafda90a 100644 --- a/Demos/Host/LowLevel/MouseHost/makefile +++ b/Demos/Host/LowLevel/MouseHost/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/MouseHostWithParser/makefile b/Demos/Host/LowLevel/MouseHostWithParser/makefile index caf20df613..de17efc0b5 100644 --- a/Demos/Host/LowLevel/MouseHostWithParser/makefile +++ b/Demos/Host/LowLevel/MouseHostWithParser/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/LowLevel/StillImageHost/makefile b/Demos/Host/LowLevel/StillImageHost/makefile index 96eca4258d..258ea81600 100644 --- a/Demos/Host/LowLevel/StillImageHost/makefile +++ b/Demos/Host/LowLevel/StillImageHost/makefile @@ -122,10 +122,10 @@ LUFA_PATH = ../../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -189,7 +189,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/Demos/Host/makefile b/Demos/Host/makefile index 937c8fac85..2531413306 100644 --- a/Demos/Host/makefile +++ b/Demos/Host/makefile @@ -14,5 +14,5 @@ # code. %: - make -C ClassDriver/ $@ +# make -C ClassDriver/ $@ make -C LowLevel/ $@ diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile index b5c50bb617..b0021af4a1 100644 --- a/Demos/OTG/TestApp/makefile +++ b/Demos/OTG/TestApp/makefile @@ -123,7 +123,7 @@ LUFA_PATH = ../../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES # List C source files here. (C dependencies are automatically generated.) @@ -188,7 +188,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources diff --git a/LUFA/Drivers/USB/LowLevel/Host.c b/LUFA/Drivers/USB/LowLevel/Host.c index 421719bf84..1932b645c0 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.c +++ b/LUFA/Drivers/USB/LowLevel/Host.c @@ -302,7 +302,7 @@ uint8_t USB_Host_SetDeviceConfiguration(uint8_t ConfigNumber) return USB_Host_SendControlRequest(NULL); } -uint8_t USB_Host_GetDeviceDescriptor(USB_Descriptor_Device_t* DeviceDescriptorPtr) +uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr) { USB_ControlRequest = (USB_Request_Header_t) { diff --git a/LUFA/Drivers/USB/LowLevel/Host.h b/LUFA/Drivers/USB/LowLevel/Host.h index 2a40a1dbc6..26e2d7675c 100644 --- a/LUFA/Drivers/USB/LowLevel/Host.h +++ b/LUFA/Drivers/USB/LowLevel/Host.h @@ -199,7 +199,7 @@ * * \return A value from the \ref USB_Host_SendControlErrorCodes_t enum to indicate the result. */ - uint8_t USB_Host_GetDeviceDescriptor(USB_Descriptor_Device_t* DeviceDescriptorPtr); + uint8_t USB_Host_GetDeviceDescriptor(void* DeviceDescriptorPtr); /** Clears a stall condition on the given pipe, via a ClearFeature request to the attached device. * diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt index 53f9b3ae0c..8231ca9585 100644 --- a/LUFA/ManPages/FutureChanges.txt +++ b/LUFA/ManPages/FutureChanges.txt @@ -14,6 +14,7 @@ * - Make new host class drivers * - Document new host class drivers * - Convert Host mode demos to class drivers + * - Re-enable Host mode Class driver builds after completion * - Add standardized descriptor names to class driver structures, controlled by USE_NONSTANDARD_DESCRIPTOR_NAMES * - Add multiple-report HID demo to the library * - Add dual role Mouse Host/Keyboard Device demo to the library diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile index edea3ceff6..e9cea8d390 100644 --- a/Projects/Magstripe/makefile +++ b/Projects/Magstripe/makefile @@ -123,11 +123,11 @@ LUFA_PATH = ../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += USB_DEVICE_ONLY -LUFA_OPTS += FIXED_CONTROL_ENDPOINT_SIZE=8 -LUFA_OPTS += USE_SINGLE_DEVICE_CONFIGURATION -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D USB_DEVICE_ONLY +LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8 +LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -191,7 +191,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) CDEFS += -DMAG_T1_CLOCK="(1 << 0)" CDEFS += -DMAG_T1_DATA="(1 << 1)" CDEFS += -DMAG_T2_CLOCK="(1 << 2)" diff --git a/Projects/MissileLauncher/makefile b/Projects/MissileLauncher/makefile index 91482c6b2a..e7ec35a00a 100644 --- a/Projects/MissileLauncher/makefile +++ b/Projects/MissileLauncher/makefile @@ -123,10 +123,10 @@ LUFA_PATH = ../.. # LUFA library compile-time options -LUFA_OPTS = USE_NONSTANDARD_DESCRIPTOR_NAMES -LUFA_OPTS += NO_STREAM_CALLBACKS -LUFA_OPTS += USB_HOST_ONLY -LUFA_OPTS += USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +LUFA_OPTS = -D USE_NONSTANDARD_DESCRIPTOR_NAMES +LUFA_OPTS += -D NO_STREAM_CALLBACKS +LUFA_OPTS += -D USB_HOST_ONLY +LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" # List C source files here. (C dependencies are automatically generated.) @@ -190,7 +190,7 @@ CSTANDARD = -std=gnu99 # Place -D or -U options here for C sources -CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS) # Place -D or -U options here for ASM sources