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/ClassDriver/AudioInput/makefile b/Demos/Device/ClassDriver/AudioInput/makefile
index d68fb10df..17514384e 100644
--- a/Demos/Device/ClassDriver/AudioInput/makefile
+++ b/Demos/Device/ClassDriver/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/ClassDriver/AudioOutput/makefile b/Demos/Device/ClassDriver/AudioOutput/makefile
index 9940103e3..ec60801be 100644
--- a/Demos/Device/ClassDriver/AudioOutput/makefile
+++ b/Demos/Device/ClassDriver/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/ClassDriver/CDC/makefile b/Demos/Device/ClassDriver/CDC/makefile
index 996ec418d..4aec962b9 100644
--- a/Demos/Device/ClassDriver/CDC/makefile
+++ b/Demos/Device/ClassDriver/CDC/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/ClassDriver/DualCDC/makefile b/Demos/Device/ClassDriver/DualCDC/makefile
index 0f2f41507..f3750170a 100644
--- a/Demos/Device/ClassDriver/DualCDC/makefile
+++ b/Demos/Device/ClassDriver/DualCDC/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/ClassDriver/GenericHID/makefile b/Demos/Device/ClassDriver/GenericHID/makefile
index bf5e41193..17037623a 100644
--- a/Demos/Device/ClassDriver/GenericHID/makefile
+++ b/Demos/Device/ClassDriver/GenericHID/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/ClassDriver/Joystick/makefile b/Demos/Device/ClassDriver/Joystick/makefile
index 10051d70c..2915b97b4 100644
--- a/Demos/Device/ClassDriver/Joystick/makefile
+++ b/Demos/Device/ClassDriver/Joystick/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/ClassDriver/Keyboard/makefile b/Demos/Device/ClassDriver/Keyboard/makefile
index d9e805aa0..5f06d1812 100644
--- a/Demos/Device/ClassDriver/Keyboard/makefile
+++ b/Demos/Device/ClassDriver/Keyboard/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/ClassDriver/KeyboardMouse/makefile b/Demos/Device/ClassDriver/KeyboardMouse/makefile
index a02e34dd5..aaaa6e72e 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/makefile
+++ b/Demos/Device/ClassDriver/KeyboardMouse/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/ClassDriver/MIDI/makefile b/Demos/Device/ClassDriver/MIDI/makefile
index dd150d6ce..d9a0d23a1 100644
--- a/Demos/Device/ClassDriver/MIDI/makefile
+++ b/Demos/Device/ClassDriver/MIDI/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/ClassDriver/MassStorage/makefile b/Demos/Device/ClassDriver/MassStorage/makefile
index 34d76a977..cac929c23 100644
--- a/Demos/Device/ClassDriver/MassStorage/makefile
+++ b/Demos/Device/ClassDriver/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/ClassDriver/Mouse/makefile b/Demos/Device/ClassDriver/Mouse/makefile
index 3664e8c4d..62f3a6913 100644
--- a/Demos/Device/ClassDriver/Mouse/makefile
+++ b/Demos/Device/ClassDriver/Mouse/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/ClassDriver/RNDISEthernet/makefile b/Demos/Device/ClassDriver/RNDISEthernet/makefile
index 84a39327a..a2ee1d86b 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/makefile
+++ b/Demos/Device/ClassDriver/RNDISEthernet/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/ClassDriver/USBtoSerial/makefile b/Demos/Device/ClassDriver/USBtoSerial/makefile
index ea45d066f..da62fa620 100644
--- a/Demos/Device/ClassDriver/USBtoSerial/makefile
+++ b/Demos/Device/ClassDriver/USBtoSerial/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