Added new TOTAL_NUM_CONFIGURATIONS option, removed USE_SINGLE_DEVICE_CONFIGURATION...

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.

diff --git a/Bootloaders/CDC/makefile b/Bootloaders/CDC/makefile
index 07bd9a7..30e099f 100644 (file)
--- a/Bootloaders/CDC/makefile
+++ b/Bootloaders/CDC/makefile
@@ -118,9 +118,9 @@ LUFA_PATH = ../..
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r

 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

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

 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 \r
 \r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 \r
 \r

diff --git a/Bootloaders/DFU/makefile b/Bootloaders/DFU/makefile
index d85a48b..def34aa 100644 (file)
--- a/Bootloaders/DFU/makefile
+++ b/Bootloaders/DFU/makefile
@@ -119,9 +119,9 @@ LUFA_OPTS  = -D USB_DEVICE_ONLY
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=32\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r

 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

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

 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 \r
 \r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 \r
 \r

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 48029a2..404f6f9 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -119,9 +119,9 @@ LUFA_OPTS  = -D USB_DEVICE_ONLY
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D CONTROL_ONLY_DEVICE\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
-LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r

 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r

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

 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 \r
 \r
 LUFA_OPTS += -D NO_INTERNAL_SERIAL\r
 \r
 \r

diff --git a/Demos/Device/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index a2be87c..98318ea 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index bdc4dad..9c4605e 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile
index 8389b73..03f1633 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile
index f6d9603..7e1c1f9 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index 653884c..ee6d961 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index ab59ed7..efc011f 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index ab68f37..19208d9 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index dea49a3..7f606fe 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index 575e99b..ea4d3ee 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index a99903d..e79258c 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index d8c8615..67864d6 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile
index 4070ff6..8a7b49b 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile
index 05a4cdd..a830ec3 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/Incomplete/Sideshow/makefile b/Demos/Device/Incomplete/Sideshow/makefile
index ff3795c..e5d4087 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index d0e1620..36eafef 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 9e2e9ab..9505fde 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index 52d6b1f..4990559 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualCDC/makefile
index 172b7d8..99da8cf 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index 17e079f..407536c 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index 17d80c8..b418ba2 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile
index 93b23a6..af351c0 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index 09e2e15..9474f89 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile
index ca1a6c5..1f0d815 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index 144dc12..b985410 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY \r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 LUFA_OPTS += -D USB_DEVICE_ONLY \r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.c b/Demos/Device/LowLevel/Mouse/Descriptors.c
index 8ac4570..d147657 100644 (file)
--- a/Demos/Device/LowLevel/Mouse/Descriptors.c
+++ b/Demos/Device/LowLevel/Mouse/Descriptors.c
@@ -82,7 +82,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
 {\r
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},\r
                \r
 {\r
        .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},\r
                \r

-       .USBSpecification       = VERSION_BCD(01.10),\r
+       .USBSpecification       = VERSION_BCD(02.00),\r

        .Class                  = 0x00,\r
        .SubClass               = 0x00,\r
        .Protocol               = 0x00,\r
        .Class                  = 0x00,\r
        .SubClass               = 0x00,\r
        .Protocol               = 0x00,\r

diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile
index d4a1cfe..9ed44c3 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index ec9ab0e..f060c66 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index c23211c..8e989d5 100644 (file)
--- 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\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
 LUFA_OPTS += -D NO_STREAM_CALLBACKS\r
 LUFA_OPTS += -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r

-LUFA_OPTS += -D USE_SINGLE_DEVICE_CONFIGURATION\r
+LUFA_OPTS += -D TOTAL_NUM_CONFIGURATIONS=1\r
+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

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

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h
index 338adc9..f27b383 100644 (file)
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/ConfigDescriptor.h
@@ -58,6 +58,7 @@
                #define DTYPE_Report                   0x22\r
        \r
        /* Enums: */\r
                #define DTYPE_Report                   0x22\r
        \r
        /* Enums: */\r

+               /** Enum for the possible return codes of the ProcessConfigurationDescriptor() function. */\r

                enum KeyboardHostWithParser_GetConfigDescriptorDataCodes_t\r
                {\r
                        SuccessfulConfigRead            = 0, /**< Configuration Descriptor was processed successfully */\r
                enum KeyboardHostWithParser_GetConfigDescriptorDataCodes_t\r
                {\r
                        SuccessfulConfigRead            = 0, /**< Configuration Descriptor was processed successfully */\r

diff --git a/Demos/OTG/TestApp/makefile b/Demos/OTG/TestApp/makefile
index 529e076..763838e 100644 (file)
--- a/Demos/OTG/TestApp/makefile
+++ b/Demos/OTG/TestApp/makefile
@@ -124,6 +124,7 @@ LUFA_PATH = ../../..
 \r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r
 \r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES\r

+LUFA_OPTS += -D USE_FLASH_DESCRIPTORS\r

 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r
 \r
 \r
 # List C source files here. (C dependencies are automatically generated.)\r

diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HID.c
index bad934a..2ac0dd3 100644 (file)
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HID.c
@@ -39,7 +39,7 @@ void HID_Device_ProcessControlPacket(USB_ClassInfo_HID_Device_t* const HIDInterf
          return;\r
          \r
        if ((USB_ControlRequest.wIndex   != HIDInterfaceInfo->Config.InterfaceNumber) &&\r
          return;\r
          \r
        if ((USB_ControlRequest.wIndex   != HIDInterfaceInfo->Config.InterfaceNumber) &&\r

-           (USB_ControlRequest.bRequest != SetIdle))\r
+           (USB_ControlRequest.bRequest != REQ_SetIdle))\r

        {\r
                return;\r
        }\r
        {\r
                return;\r
        }\r

diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDC.h
index 1b60991..90ea3ab 100644 (file)
--- a/LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/LUFA/Drivers/USB/Class/Host/CDC.h
@@ -107,7 +107,7 @@
                        } USB_ClassInfo_CDC_Host_t;\r
                        \r
                /* Enums: */\r
                        } USB_ClassInfo_CDC_Host_t;\r
                        \r
                /* Enums: */\r

-                       typedef enum\r
+                       enum\r

                        {\r
                                CDC_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully */\r
                                CDC_ENUMERROR_ControlError               = 1, /**< A control request to the device failed to complete successfully */\r
                        {\r
                                CDC_ENUMERROR_NoError                    = 0, /**< Configuration Descriptor was processed successfully */\r
                                CDC_ENUMERROR_ControlError               = 1, /**< A control request to the device failed to complete successfully */\r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.c b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
index 2318216..deaa9c0 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.c
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.c
@@ -132,23 +132,51 @@ static void USB_Device_SetConfiguration(void)
 {\r
        bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
 \r
 {\r
        bool AlreadyConfigured = (USB_ConfigurationNumber != 0);\r
 \r

-#if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
-       if ((uint8_t)USB_ControlRequest.wValue > 1)\r
+#if defined(TOTAL_NUM_CONFIGURATIONS)\r
+       if ((uint8_t)USB_ControlRequest.wValue > TOTAL_NUM_CONFIGURATIONS)\r
+         return;\r

 #else\r
 #else\r

+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+       uint8_t MemoryAddressSpace;\r
+       #endif\r
+       \r

        USB_Descriptor_Device_t* DevDescriptorPtr;\r
 \r
        USB_Descriptor_Device_t* DevDescriptorPtr;\r
 \r

-       if ((CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr) == NO_DESCRIPTOR) ||\r
+       if (CALLBACK_USB_GetDescriptor((DTYPE_Device << 8), 0, (void*)&DevDescriptorPtr\r
+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+                                      , &MemoryAddressSpace) == NO_DESCRIPTOR)\r
+       #endif\r
+       {\r
+               return;\r
+       }\r
+       \r

        #if defined(USE_RAM_DESCRIPTORS)\r
        #if defined(USE_RAM_DESCRIPTORS)\r

-           ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations))\r
+       if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)\r
+         return;\r

        #elif defined (USE_EEPROM_DESCRIPTORS)\r
        #elif defined (USE_EEPROM_DESCRIPTORS)\r

-           ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+       if ((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations))\r
+         return;\r
+       #elif defined (USE_FLASH_DESCRIPTORS)\r
+       if ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations))\r
+         return;\r

        #else\r
        #else\r

-           ((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
-       #endif\r
-#endif\r
+       if (MemoryAddressSpace == MEMSPACE_FLASH)\r

        {\r
        {\r

-               return;\r
+               if (((uint8_t)USB_ControlRequest.wValue > pgm_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+                 return;\r

        }\r
        }\r

+       else if (MemoryAddressSpace == MEMSPACE_EEPROM)\r
+       {\r
+               if (((uint8_t)USB_ControlRequest.wValue > eeprom_read_byte(&DevDescriptorPtr->NumberOfConfigurations)))\r
+                 return;\r
+       }\r
+       else\r
+       {\r
+               if ((uint8_t)USB_ControlRequest.wValue > DevDescriptorPtr->NumberOfConfigurations)\r
+                 return;\r
+       }\r
+       #endif\r
+#endif\r

        \r
        Endpoint_ClearSETUP();\r
 \r
        \r
        Endpoint_ClearSETUP();\r
 \r


@@ -229,6 +257,10 @@ static void USB_Device_GetDescriptor(void)
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r
        void*    DescriptorPointer;\r
        uint16_t DescriptorSize;\r
        \r

+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+       uint8_t  DescriptorAddressSpace;\r
+       #endif\r
+       \r

        #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\r
        {\r
        #if !defined(NO_INTERNAL_SERIAL) && (defined(USB_SERIES_6_AVR) || defined(USB_SERIES_7_AVR))\r
        if (USB_ControlRequest.wValue == ((DTYPE_String << 8) | USE_INTERNAL_SERIAL))\r
        {\r


@@ -238,7 +270,11 @@ static void USB_Device_GetDescriptor(void)
        #endif\r
        \r
        if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,\r
        #endif\r
        \r
        if ((DescriptorSize = CALLBACK_USB_GetDescriptor(USB_ControlRequest.wValue, USB_ControlRequest.wIndex,\r

-                                                        &DescriptorPointer)) == NO_DESCRIPTOR)\r
+                                                        &DescriptorPointer\r
+       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+                                                        , &DescriptorAddressSpace\r
+       #endif\r
+                                                                                                        )) == NO_DESCRIPTOR)\r

        {\r
                return;\r
        }\r
        {\r
                return;\r
        }\r


@@ -249,8 +285,15 @@ static void USB_Device_GetDescriptor(void)
        Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
        #elif defined(USE_EEPROM_DESCRIPTORS)\r
        Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
        Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);\r
        #elif defined(USE_EEPROM_DESCRIPTORS)\r
        Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r

-       #else\r
+       #elif defined(USE_FLASH_DESCRIPTORS)\r

        Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);   \r
        Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize);   \r

+       #else\r
+       if (DescriptorAddressSpace == MEMSPACE_FLASH)\r
+         Endpoint_Write_Control_PStream_LE(DescriptorPointer, DescriptorSize); \r
+       else if (DescriptorAddressSpace == MEMSPACE_EEPROM)\r
+         Endpoint_Write_Control_EStream_LE(DescriptorPointer, DescriptorSize);\r
+       else\r
+         Endpoint_Write_Control_Stream_LE(DescriptorPointer, DescriptorSize);  \r

        #endif\r
 \r
        Endpoint_ClearOUT();\r
        #endif\r
 \r
        Endpoint_ClearOUT();\r

diff --git a/LUFA/Drivers/USB/LowLevel/DevChapter9.h b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
index 2640cbb..55e3b82 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/DevChapter9.h
+++ b/LUFA/Drivers/USB/LowLevel/DevChapter9.h
@@ -48,16 +48,33 @@
                        extern "C" {\r
                #endif\r
 \r
                        extern "C" {\r
                #endif\r
 \r

-       /* Public Interface - May be used in end-application: */                        \r
+       /* Public Interface - May be used in end-application: */\r
+               /* Macros: */\r
+                       #if defined(USE_SINGLE_DEVICE_CONFIGURATION)\r
+                               #define TOTAL_NUM_CONFIGURATIONS           1\r
+                       #endif\r
+       \r
+               /* Enums: */\r
+                       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+                               /** Enum for the possible descriptor memory spaces, for the MemoryAddressSpace of the\r
+                                *  \ref CALLBACK_USB_GetDescriptor() function. This can be used when none of the USE_*_DESCRIPTORS\r
+                                *  compile time options are used, to indicate in which memory space the descriptor is stored.\r
+                                *\r
+                                *  \ingroup Group_Device\r
+                                */\r
+                               enum USB_DescriptorMemorySpaces_t\r
+                               {\r
+                                       MEMSPACE_FLASH    = 0, /**< Indicates the requested descriptor is located in FLASH memory */\r
+                                       MEMSPACE_EEPROM   = 1, /**< Indicates the requested descriptor is located in EEPROM memory */\r
+                                       MEMSPACE_RAM      = 2, /**< Indicates the requested descriptor is located in RAM memory */\r
+                               };\r
+                       #endif\r
+       \r

                /* Global Variables: */\r
                        /** Indicates the currently set configuration number of the device. USB devices may have several\r
                         *  different configurations which the host can select between; this indicates the currently selected\r
                         *  value, or 0 if no configuration has been selected.\r
                         *\r
                /* Global Variables: */\r
                        /** Indicates the currently set configuration number of the device. USB devices may have several\r
                         *  different configurations which the host can select between; this indicates the currently selected\r
                         *  value, or 0 if no configuration has been selected.\r
                         *\r

-                        *  If a device has only one single configuration, the token USE_SINGLE_DEVICE_CONFIGURATION may be\r
-                        *  defined in the project makefile and passed to the compiler using the -D switch. This optimize for\r
-                        *  a single configuration, saving a small amount of space in the resulting compiled binary.\r
-                        *\r

                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
                         *\r
                         *  \note This variable should be treated as read-only in the user application, and never manually\r
                         *        changed in value.\r
                         *\r


@@ -87,6 +104,12 @@
        #if !defined(__DOXYGEN__)\r
                #if defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS)\r
                        #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.\r
        #if !defined(__DOXYGEN__)\r
                #if defined(USE_RAM_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS)\r
                        #error USE_RAM_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.\r

+               #elif defined(USE_RAM_DESCRIPTORS) && defined(USE_FLASH_DESCRIPTORS)\r
+                       #error USE_RAM_DESCRIPTORS and USE_FLASH_DESCRIPTORS are mutually exclusive.\r
+               #elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS)\r
+                       #error USE_FLASH_DESCRIPTORS and USE_EEPROM_DESCRIPTORS are mutually exclusive.\r
+               #elif defined(USE_FLASH_DESCRIPTORS) && defined(USE_EEPROM_DESCRIPTORS) && defined(USE_RAM_DESCRIPTORS)\r
+                       #error Only one of the USE_*_DESCRIPTORS modes should be selected.\r

                #endif\r
        \r
                /* Function Prototypes: */\r
                #endif\r
        \r
                /* Function Prototypes: */\r

diff --git a/LUFA/Drivers/USB/LowLevel/Device.h b/LUFA/Drivers/USB/LowLevel/Device.h
index 470c317..975d09a 100644 (file)
--- a/LUFA/Drivers/USB/LowLevel/Device.h
+++ b/LUFA/Drivers/USB/LowLevel/Device.h
@@ -133,6 +133,9 @@
                         *                     standards.\r
                         *  \param[out] DescriptorAddress  Pointer to the descriptor in memory. This should be set by the routine to\r
                         *                                 the address of the descriptor.\r
                         *                     standards.\r
                         *  \param[out] DescriptorAddress  Pointer to the descriptor in memory. This should be set by the routine to\r
                         *                                 the address of the descriptor.\r

+                        *  \param[out] MemoryAddressSpace A value from the \ref USB_DescriptorMemorySpaces_t enum to indicate the memory\r
+                        *                                 space in which the descriptor is stored. This parameter does not exist when one\r
+                        *                                 of the USE_*_DESCRIPTORS compile time options is used.\r

                         *\r
                         *  \note By default, the library expects all descriptors to be located in flash memory via the PROGMEM attribute.\r
                         *        If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to\r
                         *\r
                         *  \note By default, the library expects all descriptors to be located in flash memory via the PROGMEM attribute.\r
                         *        If descriptors should be located in RAM or EEPROM instead (to speed up access in the case of RAM, or to\r


@@ -142,7 +145,11 @@
                         *\r
                         *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise\r
                         */\r
                         *\r
                         *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise\r
                         */\r

-                       uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+                       uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress\r
+                       #if !defined(USE_FLASH_DESCRIPTORS) && !defined(USE_EEPROM_DESCRIPTORS) && !defined(USE_RAM_DESCRIPTORS)\r
+                                                           , uint8_t* MemoryAddressSpace\r
+                       #endif                  \r
+                                                           )\r

                                                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
 \r
        /* Private Interface - For use in library only: */\r
                                                                                    ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);\r
 \r
        /* Private Interface - For use in library only: */\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 2281ca5..5282642 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -26,6 +26,7 @@
   *  - Added new FAST_STREAM_TRANSFERS compile time option for faster stream transfers via multiple bytes copied per stream loop\r
   *  - Added stdio stream demo code to the low-level CDC demo, to show how to create standard streams out of the virtual serial ports\r
   *  - Added new EEPROM and FLASH buffer versions of the Endpoint and Pipe stream functions\r
   *  - Added new FAST_STREAM_TRANSFERS compile time option for faster stream transfers via multiple bytes copied per stream loop\r
   *  - Added stdio stream demo code to the low-level CDC demo, to show how to create standard streams out of the virtual serial ports\r
   *  - Added new EEPROM and FLASH buffer versions of the Endpoint and Pipe stream functions\r

+  *  - Added new USE_FLASH_DESCRIPTORS and TOTAL_NUM_CONFIGURATIONS compile time options\r

   *  \r
   *  <b>Changed:</b>\r
   *  - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)\r
   *  \r
   *  <b>Changed:</b>\r
   *  - Deprecated psuedo-scheduler and removed dynamic memory allocator from the library (first no longer needed and second unused)\r


@@ -40,6 +41,8 @@
   *  - Dataflash_WaitWhileBusy() now always ensures that the dataflash is ready for the next command immediately after returning,\r
   *    no need to call Dataflash_ToggleSelectedChipCS() afterwards\r
   *  - Changed F_CLOCK entries in project makefiles to alias to F_CPU by default, as this is the most common case\r
   *  - Dataflash_WaitWhileBusy() now always ensures that the dataflash is ready for the next command immediately after returning,\r
   *    no need to call Dataflash_ToggleSelectedChipCS() afterwards\r
   *  - Changed F_CLOCK entries in project makefiles to alias to F_CPU by default, as this is the most common case\r

+  *  - The device-mode CALLBACK_USB_GetDescriptor() function now has an extra parameter so that the memory space in which the requested\r
+  *    descriptor is located can be specified. This means that descriptors can now be located in multiple memory spaces within a device.\r

   *\r
   *  <b>Fixed:</b>\r
   *  - Changed bootloaders to use FLASHEND rather than the existence of RAMPZ to determine if far FLASH pointers are needed to fix\r
   *\r
   *  <b>Fixed:</b>\r
   *  - Changed bootloaders to use FLASHEND rather than the existence of RAMPZ to determine if far FLASH pointers are needed to fix\r

diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index 3d15759..2d9ec7a 100644 (file)
--- a/LUFA/ManPages/CompileTimeTokens.txt
+++ b/LUFA/ManPages/CompileTimeTokens.txt
@@ -67,12 +67,14 @@
  *  This section describes compile tokens which affect USB driver stack as a whole in the LUFA library.\r
  *\r
  *  <b>USE_RAM_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n\r
  *  This section describes compile tokens which affect USB driver stack as a whole in the LUFA library.\r
  *\r
  *  <b>USE_RAM_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n\r

- *  Define this token to indicate to the USB driver that device descriptors are stored in RAM, rather than the default of\r
- *  the AVR's flash. RAM descriptors may be desirable in applications where speed or minimizing flash usage is more important\r
- *  than RAM usage, or applications where the descriptors need to be modified at runtime.\r
+ *  Define this token to indicate to the USB driver that all device descriptors are stored in RAM, rather than being located in any one\r
+ *  of the AVR's memory spaces. RAM descriptors may be desirable in applications where the descriptors need to be modified at runtime.\r
+ *\r
+ *  <b>USE_FLASH_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n\r
+ *  Similar to USE_RAM_DESCRIPTORS, but all descriptors are stored in the AVR's FLASH memory rather than RAM.\r

  *\r
  *  <b>USE_EEPROM_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n\r
  *\r
  *  <b>USE_EEPROM_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n\r

- *  Similar to USE_RAM_DESCRIPTORS, but descriptors are stored in the AVR's EEPROM memory rather than RAM.\r
+ *  Similar to USE_RAM_DESCRIPTORS, but all descriptors are stored in the AVR's EEPROM memory rather than RAM.\r

  *\r
  *  <b>USE_NONSTANDARD_DESCRIPTOR_NAMES</b> - ( \ref Group_Descriptors ) \n\r
  *  The USB 2.0 standard gives some rather obscure names for the elements in the standard descriptor types (device, configuration,\r
  *\r
  *  <b>USE_NONSTANDARD_DESCRIPTOR_NAMES</b> - ( \ref Group_Descriptors ) \n\r
  *  The USB 2.0 standard gives some rather obscure names for the elements in the standard descriptor types (device, configuration,\r


@@ -93,11 +95,11 @@
  *  defined to a non-zero value instead to give the size in bytes of the control endpoint, to reduce the size of the compiled\r
  *  binary.\r
  *\r
  *  defined to a non-zero value instead to give the size in bytes of the control endpoint, to reduce the size of the compiled\r
  *  binary.\r
  *\r

- *  <b>USE_SINGLE_DEVICE_CONFIGURATION</b> - ( \ref Group_Device ) \n\r
+ *  <b>TOTAL_NUM_CONFIGURATIONS</b> - ( \ref Group_Device ) \n\r

  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces\r
  *  the amount of configuration required to set up the library, and allows the value to change dynamically (if descriptors are stored in\r
  *  By default, the library determines the number of configurations a USB device supports by reading the device descriptor. This reduces\r
  *  the amount of configuration required to set up the library, and allows the value to change dynamically (if descriptors are stored in\r

- *  EEPROM or RAM rather than flash memory) and reduces code maintenance. However, many USB device projects use only a single configuration.\r
- *  Defining this token enables single-configuration mode, reducing the compiled size of the binary at the expense of flexibility.\r
+ *  EEPROM or RAM rather than flash memory) and reduces code maintenance. However, this value may be fixed via this token in the project\r
+ *  makefile to reduce the compiled size of the binary at the expense of flexibility.\r

  *\r
  *  <b>CONTROL_ONLY_DEVICE</b> \n\r
  *  In some limited USB device applications, there are no device endpoints other than the control endpoint; i.e. all device communication\r
  *\r
  *  <b>CONTROL_ONLY_DEVICE</b> \n\r
  *  In some limited USB device applications, there are no device endpoints other than the control endpoint; i.e. all device communication\r

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index f1b5f55..945406d 100644 (file)
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -26,6 +26,12 @@
  *      parameter, to add support for multi-configuration devices. Existing code should use a configuration index of 1 to indicate the\r
  *      first configuration descriptor within the device.\r
  *\r
  *      parameter, to add support for multi-configuration devices. Existing code should use a configuration index of 1 to indicate the\r
  *      first configuration descriptor within the device.\r
  *\r

+ *  <b>Device Mode</b>\r
+ *    - The \ref CALLBACK_USB_GetDescriptor() function now takes an extra parameter to specify the descriptor's memory space so that\r
+ *      descriptors in mixed memory spaces can be used. The previous functionality can be returned by defining the USE_FLASH_DESCRIPTORS\r
+ *      token in the project makefile to fix all descriptors into FLASH space and remove the extra function parameter.\r
+ *\r
+ *\r

  * \section Sec_Migration090605 Migrating from 090510 to 090605\r
  *\r
  *  <b>Device Mode</b>\r
  * \section Sec_Migration090605 Migrating from 090510 to 090605\r
  *\r
  *  <b>Device Mode</b>\r

diff --git a/Projects/Magstripe/makefile b/Projects/Magstripe/makefile
index 20550ae..dda15ac 100644 (file)
--- a/Projects/Magstripe/makefile
+++ b/Projects/Magstripe/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_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 USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"