Remove USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token, split out standard descriptors into seperate USB_Descriptor_* and USB_StdDescriptor_* structures so that both can be used within the one project.

Add guard to the HID Host Class driver SetProtocol command, to ensure that the device supports boot protocol mode before issuing the request.

13 files changed, 13 insertions, 26 deletions

diff --git a/Demos/Device/LowLevel/AudioInput/makefile b/Demos/Device/LowLevel/AudioInput/makefile
index 06703c0e1..fa2f7bc51 100644
--- a/Demos/Device/LowLevel/AudioInput/makefile
+++ b/Demos/Device/LowLevel/AudioInput/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/AudioOutput/makefile b/Demos/Device/LowLevel/AudioOutput/makefile
index 611472058..606c5b77f 100644
--- a/Demos/Device/LowLevel/AudioOutput/makefile
+++ b/Demos/Device/LowLevel/AudioOutput/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/CDC/makefile b/Demos/Device/LowLevel/CDC/makefile
index 813258249..f69c1caae 100644
--- a/Demos/Device/LowLevel/CDC/makefile
+++ b/Demos/Device/LowLevel/CDC/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/DualCDC/makefile b/Demos/Device/LowLevel/DualCDC/makefile
index 87c4ca8a7..629d7d57b 100644
--- a/Demos/Device/LowLevel/DualCDC/makefile
+++ b/Demos/Device/LowLevel/DualCDC/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/GenericHID/makefile b/Demos/Device/LowLevel/GenericHID/makefile
index 6f5a6e416..e1f407c0c 100644
--- a/Demos/Device/LowLevel/GenericHID/makefile
+++ b/Demos/Device/LowLevel/GenericHID/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/Joystick/makefile b/Demos/Device/LowLevel/Joystick/makefile
index b23c15b13..88057eb20 100644
--- a/Demos/Device/LowLevel/Joystick/makefile
+++ b/Demos/Device/LowLevel/Joystick/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/Keyboard/makefile b/Demos/Device/LowLevel/Keyboard/makefile
index 0561df251..09d0d57f3 100644
--- a/Demos/Device/LowLevel/Keyboard/makefile
+++ b/Demos/Device/LowLevel/Keyboard/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/KeyboardMouse/makefile b/Demos/Device/LowLevel/KeyboardMouse/makefile
index e7aae35ce..bb391e278 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/makefile
+++ b/Demos/Device/LowLevel/KeyboardMouse/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/MIDI/makefile b/Demos/Device/LowLevel/MIDI/makefile
index 66843cd3b..e8c675c1f 100644
--- a/Demos/Device/LowLevel/MIDI/makefile
+++ b/Demos/Device/LowLevel/MIDI/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/MassStorage/makefile b/Demos/Device/LowLevel/MassStorage/makefile
index 954324f17..5a23ad048 100644
--- a/Demos/Device/LowLevel/MassStorage/makefile
+++ b/Demos/Device/LowLevel/MassStorage/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_DEVICE_ONLY 

+LUFA_OPTS  = -D USB_DEVICE_ONLY 

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

 LUFA_OPTS += -D USE_FLASH_DESCRIPTORS

diff --git a/Demos/Device/LowLevel/Mouse/makefile b/Demos/Device/LowLevel/Mouse/makefile
index 3eec080fd..865bdcaed 100644
--- a/Demos/Device/LowLevel/Mouse/makefile
+++ b/Demos/Device/LowLevel/Mouse/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/RNDISEthernet/makefile b/Demos/Device/LowLevel/RNDISEthernet/makefile
index c6d8306c9..caa48651b 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/makefile
+++ b/Demos/Device/LowLevel/RNDISEthernet/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1

diff --git a/Demos/Device/LowLevel/USBtoSerial/makefile b/Demos/Device/LowLevel/USBtoSerial/makefile
index 324367ae1..c607d5e97 100644
--- a/Demos/Device/LowLevel/USBtoSerial/makefile
+++ b/Demos/Device/LowLevel/USBtoSerial/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D NO_STREAM_CALLBACKS

 LUFA_OPTS += -D USB_DEVICE_ONLY

 LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1