From beb0b2bda0c45e958e88933a055d409e42fa0a0b Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Fri, 19 Jun 2009 04:34:35 +0000 Subject: Move LUFA compile time options to a new section in the application makefiles for clarity. --- Demos/Device/LowLevel/AudioInput/makefile | 14 ++++++++++---- Demos/Device/LowLevel/AudioOutput/makefile | 15 +++++++++++---- Demos/Device/LowLevel/CDC/makefile | 14 ++++++++++---- Demos/Device/LowLevel/DualCDC/makefile | 14 ++++++++++---- Demos/Device/LowLevel/GenericHID/makefile | 15 +++++++++++---- Demos/Device/LowLevel/Joystick/makefile | 14 ++++++++++---- Demos/Device/LowLevel/Keyboard/makefile | 15 +++++++++++---- Demos/Device/LowLevel/KeyboardMouse/makefile | 14 ++++++++++---- Demos/Device/LowLevel/MIDI/makefile | 14 ++++++++++---- Demos/Device/LowLevel/MassStorage/makefile | 15 ++++++++++----- Demos/Device/LowLevel/Mouse/makefile | 15 +++++++++++---- Demos/Device/LowLevel/RNDISEthernet/makefile | 16 +++++++++++----- Demos/Device/LowLevel/USBtoSerial/makefile | 14 ++++++++++---- 13 files changed, 135 insertions(+), 54 deletions(-) (limited to 'Demos/Device/LowLevel') diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile index 38a954d0f..8ebf0494f 100644 --- a/Demos/Device/LowLevel/AudioInput/makefile +++ b/Demos/Device/LowLevel/AudioInput/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 2ef97b567..1401e90c3 100644 --- a/Demos/Device/LowLevel/AudioOutput/makefile +++ b/Demos/Device/LowLevel/AudioOutput/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,12 +189,10 @@ 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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) CDEFS += -DAUDIO_OUT_STEREO + # Place -D or -U options here for ASM sources ADEFS = -DF_CPU=$(F_CPU) diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile index c8e8798d6..ea135975c 100644 --- a/Demos/Device/LowLevel/CDC/makefile +++ b/Demos/Device/LowLevel/CDC/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 143c0be97..3191b60f3 100644 --- a/Demos/Device/LowLevel/DualCDC/makefile +++ b/Demos/Device/LowLevel/DualCDC/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 e9e903700..e53346b93 100644 --- a/Demos/Device/LowLevel/GenericHID/makefile +++ b/Demos/Device/LowLevel/GenericHID/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +189,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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) + # Place -D or -U options here for ASM sources ADEFS = -DF_CPU=$(F_CPU) diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile index cee822c58..a9a51d17b 100644 --- a/Demos/Device/LowLevel/Joystick/makefile +++ b/Demos/Device/LowLevel/Joystick/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 3ab9de95a..a3399110d 100644 --- a/Demos/Device/LowLevel/Keyboard/makefile +++ b/Demos/Device/LowLevel/Keyboard/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +189,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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) + # Place -D or -U options here for ASM sources ADEFS = -DF_CPU=$(F_CPU) diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile index b93943451..7282d9fc8 100644 --- a/Demos/Device/LowLevel/KeyboardMouse/makefile +++ b/Demos/Device/LowLevel/KeyboardMouse/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 51c67c86a..f9ff1ed83 100644 --- a/Demos/Device/LowLevel/MIDI/makefile +++ b/Demos/Device/LowLevel/MIDI/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -180,10 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 77993d04a..e23014680 100644 --- a/Demos/Device/LowLevel/MassStorage/makefile +++ b/Demos/Device/LowLevel/MassStorage/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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 + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -182,11 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -CDEFS += -DINTERRUPT_CONTROL_ENDPOINT +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(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 314148a14..49126802d 100644 --- a/Demos/Device/LowLevel/Mouse/makefile +++ b/Demos/Device/LowLevel/Mouse/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -179,10 +188,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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) + # Place -D or -U options here for ASM sources ADEFS = -DF_CPU=$(F_CPU) diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile index 584cba90c..e17c73445 100644 --- a/Demos/Device/LowLevel/RNDISEthernet/makefile +++ b/Demos/Device/LowLevel/RNDISEthernet/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -192,11 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" -CDEFS += -DNO_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) $(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 # Place -D or -U options here for ASM sources diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile index f1491a52a..ff46809e4 100644 --- a/Demos/Device/LowLevel/USBtoSerial/makefile +++ b/Demos/Device/LowLevel/USBtoSerial/makefile @@ -122,6 +122,15 @@ OBJDIR = . 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)" + + # List C source files here. (C dependencies are automatically generated.) SRC = $(TARGET).c \ Descriptors.c \ @@ -181,10 +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) -CDEFS += -DUSE_NONSTANDARD_DESCRIPTOR_NAMES -DNO_STREAM_CALLBACKS -DUSB_DEVICE_ONLY -CDEFS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 -DUSE_SINGLE_DEVICE_CONFIGURATION -CDEFS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)" +CDEFS = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(patsubst %,-D%,$(LUFA_OPTS)) # Place -D or -U options here for ASM sources -- cgit v1.2.3