Added new TOTAL_NUM_CONFIGURATIONS option, removed USE_SINGLE_DEVICE_CONFIGURATION compile time option (but silently convert it to USE_SINGLE_DEVICE_CONFIGURATION internally for compatibility).

Added new USE_FLASH_DESCRIPTORS compile time option. By default, descriptors can now lie in mixed memory spaces (specified by a new parameter to the CALLBACK_USB_GetDescriptor() function) unless one of the USE_*_DESCRIPTORS compile time option is specified.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@649 d5102386-fcda-11dd-9fdb-3debd5008f28

28 files changed, 55 insertions, 28 deletions

diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index a2be87c5..98318ead 100644
--- a/Demos/Device/ClassDriver/AudioInput/makefile
+++ b/Demos/Device/ClassDriver/AudioInput/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index bdc4dad0..9c4605e8 100644
--- a/Demos/Device/ClassDriver/AudioOutput/makefile
+++ b/Demos/Device/ClassDriver/AudioOutput/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile
index 8389b73b..03f1633a 100644
--- a/Demos/Device/ClassDriver/CDC/makefile
+++ b/Demos/Device/ClassDriver/CDC/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile
index f6d96037..7e1c1f91 100644
--- a/Demos/Device/ClassDriver/DualCDC/makefile
+++ b/Demos/Device/ClassDriver/DualCDC/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index 653884ce..ee6d9616 100644
--- a/Demos/Device/ClassDriver/GenericHID/makefile
+++ b/Demos/Device/ClassDriver/GenericHID/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index ab59ed7d..efc011f6 100644
--- a/Demos/Device/ClassDriver/Joystick/makefile
+++ b/Demos/Device/ClassDriver/Joystick/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index ab68f378..19208d97 100644
--- a/Demos/Device/ClassDriver/Keyboard/makefile
+++ b/Demos/Device/ClassDriver/Keyboard/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index dea49a34..7f606fe3 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouse/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index 575e99b2..ea4d3eea 100644
--- a/Demos/Device/ClassDriver/MIDI/makefile
+++ b/Demos/Device/ClassDriver/MIDI/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index a99903d9..e79258c3 100644
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/MassStorage/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index d8c86153..67864d61 100644
--- a/Demos/Device/ClassDriver/Mouse/makefile
+++ b/Demos/Device/ClassDriver/Mouse/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile
index 4070ff60..8a7b49b3 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/makefile
+++ b/Demos/Device/ClassDriver/RNDISEthernet/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile
index 05a4cddd..a830ec35 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/makefile
+++ b/Demos/Device/ClassDriver/USBtoSerial/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/Incomplete/Sideshow/makefile b/Demos/Device/Incomplete/Sideshow/makefile
index ff3795ca..e5d40879 100644
--- a/Demos/Device/Incomplete/Sideshow/makefile
+++ b/Demos/Device/Incomplete/Sideshow/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index d0e16204..36eafefc 100644
--- a/Demos/Device/LowLevel/AudioInput/makefile
+++ b/Demos/Device/LowLevel/AudioInput/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 9e2e9abb..9505fde0 100644
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index 52d6b1ff..4990559f 100644
--- a/Demos/Device/LowLevel/CDC/makefile
+++ b/Demos/Device/LowLevel/CDC/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualCDC/makefile
index 172b7d88..99da8cf4 100644
--- a/Demos/Device/LowLevel/DualCDC/makefile
+++ b/Demos/Device/LowLevel/DualCDC/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index 17e079fa..407536c7 100644
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index 17d80c89..b418ba22 100644
--- a/Demos/Device/LowLevel/Joystick/makefile
+++ b/Demos/Device/LowLevel/Joystick/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile
index 93b23a6f..af351c09 100644
--- a/Demos/Device/LowLevel/Keyboard/makefile
+++ b/Demos/Device/LowLevel/Keyboard/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index 09e2e15a..9474f89a 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/makefile
+++ b/Demos/Device/LowLevel/KeyboardMouse/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile
index ca1a6c59..1f0d8159 100644
--- a/Demos/Device/LowLevel/MIDI/makefile
+++ b/Demos/Device/LowLevel/MIDI/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index 144dc121..b9854109 100644
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -126,7 +126,8 @@ LUFA_PATH = ../../../..
 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 LUFA_OPTS += -D INTERRUPT_CONTROL_ENDPOINT

 

diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.c b/Demos/Device/LowLevel/Mouse/Descriptors.c
index 8ac45709..d1476573 100644
--- a/Demos/Device/LowLevel/Mouse/Descriptors.c
+++ b/Demos/Device/LowLevel/Mouse/Descriptors.c
@@ -82,7 +82,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
 {

 	.Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},

 		

-	.USBSpecification       = VERSION_BCD(01.10),

+	.USBSpecification       = VERSION_BCD(02.00),

 	.Class                  = 0x00,

 	.SubClass               = 0x00,

 	.Protocol               = 0x00,

diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile
index d4a1cfec..9ed44c3f 100644
--- a/Demos/Device/LowLevel/Mouse/makefile
+++ b/Demos/Device/LowLevel/Mouse/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index ec9ab0e1..f060c662 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/makefile
+++ b/Demos/Device/LowLevel/RNDISEthernet/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"

 

 

diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index c23211cb..8e989d52 100644
--- a/Demos/Device/LowLevel/USBtoSerial/makefile
+++ b/Demos/Device/LowLevel/USBtoSerial/makefile
@@ -127,7 +127,8 @@ 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 TOTAL_NUM_CONFIGURATIONS=1

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"