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.

14 files changed, 12 insertions, 28 deletions

diff --git a/Demos/Host/ClassDriver/CDCHost/makefile b/Demos/Host/ClassDriver/CDCHost/makefile
index db62b2ec0..9163fd087 100644
--- a/Demos/Host/ClassDriver/CDCHost/makefile
+++ b/Demos/Host/ClassDriver/CDCHost/makefile
@@ -116,7 +116,6 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

 LUFA_OPTS += -D USB_HOST_ONLY

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

 

diff --git a/Demos/Host/ClassDriver/MassStorageHost/makefile b/Demos/Host/ClassDriver/MassStorageHost/makefile
index 42bbff874..a046778fe 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/makefile
+++ b/Demos/Host/ClassDriver/MassStorageHost/makefile
@@ -116,9 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_HOST_ONLY

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

+LUFA_OPTS  = -D USB_HOST_ONLY

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

 

 

diff --git a/Demos/Host/ClassDriver/MouseHost/makefile b/Demos/Host/ClassDriver/MouseHost/makefile
index 03bcf30f5..5d1d95319 100644
--- a/Demos/Host/ClassDriver/MouseHost/makefile
+++ b/Demos/Host/ClassDriver/MouseHost/makefile
@@ -116,9 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

 LUFA_OPTS += -D USB_HOST_ONLY

-LUFA_OPTS += -D NO_STREAM_CALLBACKS

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

 

 

diff --git a/Demos/Host/ClassDriver/StillImageHost/makefile b/Demos/Host/ClassDriver/StillImageHost/makefile
index 626d6e685..def72a998 100644
--- a/Demos/Host/ClassDriver/StillImageHost/makefile
+++ b/Demos/Host/ClassDriver/StillImageHost/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS  = -D USB_HOST_ONLY

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

 

 

diff --git a/Demos/Host/Incomplete/BluetoothHost/makefile b/Demos/Host/Incomplete/BluetoothHost/makefile
index 019554293..3ae74d4d9 100644
--- a/Demos/Host/Incomplete/BluetoothHost/makefile
+++ b/Demos/Host/Incomplete/BluetoothHost/makefile
@@ -123,8 +123,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS  = -D USB_HOST_ONLY

 LUFA_OPTS += -D NO_STREAM_CALLBACKS

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

 

diff --git a/Demos/Host/LowLevel/CDCHost/makefile b/Demos/Host/LowLevel/CDCHost/makefile
index 282915fa9..7cc95745b 100644
--- a/Demos/Host/LowLevel/CDCHost/makefile
+++ b/Demos/Host/LowLevel/CDCHost/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS  = -D USB_HOST_ONLY

 LUFA_OPTS += -D NO_STREAM_CALLBACKS

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

 

diff --git a/Demos/Host/LowLevel/GenericHIDHost/makefile b/Demos/Host/LowLevel/GenericHIDHost/makefile
index bc474604d..6e0641156 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/makefile
+++ b/Demos/Host/LowLevel/GenericHIDHost/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_HOST_ONLY

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

 

diff --git a/Demos/Host/LowLevel/KeyboardHost/makefile b/Demos/Host/LowLevel/KeyboardHost/makefile
index 072ca2506..d6d635840 100644
--- a/Demos/Host/LowLevel/KeyboardHost/makefile
+++ b/Demos/Host/LowLevel/KeyboardHost/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS  = -D USB_HOST_ONLY

 LUFA_OPTS += -D NO_STREAM_CALLBACKS

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

 

diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
index 1ec8d4754..5561ac7d3 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS  = -D USB_HOST_ONLY

 LUFA_OPTS += -D NO_STREAM_CALLBACKS

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

 

diff --git a/Demos/Host/LowLevel/MassStorageHost/makefile b/Demos/Host/LowLevel/MassStorageHost/makefile
index 96242749e..63b1db3b4 100644
--- a/Demos/Host/LowLevel/MassStorageHost/makefile
+++ b/Demos/Host/LowLevel/MassStorageHost/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_HOST_ONLY

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

 LUFA_OPTS += -D USB_STREAM_TIMEOUT_MS=2000

diff --git a/Demos/Host/LowLevel/MouseHost/makefile b/Demos/Host/LowLevel/MouseHost/makefile
index 1f9551630..19be8d110 100644
--- a/Demos/Host/LowLevel/MouseHost/makefile
+++ b/Demos/Host/LowLevel/MouseHost/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_HOST_ONLY

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

 

diff --git a/Demos/Host/LowLevel/MouseHostWithParser/makefile b/Demos/Host/LowLevel/MouseHostWithParser/makefile
index 241563f67..8cf9d43f9 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/makefile
+++ b/Demos/Host/LowLevel/MouseHostWithParser/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_HOST_ONLY

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

 

diff --git a/Demos/Host/LowLevel/PrinterHost/makefile b/Demos/Host/LowLevel/PrinterHost/makefile
index 8e28bdaf1..b9f0eb575 100644
--- a/Demos/Host/LowLevel/PrinterHost/makefile
+++ b/Demos/Host/LowLevel/PrinterHost/makefile
@@ -116,8 +116,7 @@ LUFA_PATH = ../../../..
 

 

 # LUFA library compile-time options

-LUFA_OPTS  = -D USE_NONSTANDARD_DESCRIPTOR_NAMES

-LUFA_OPTS += -D USB_HOST_ONLY

+LUFA_OPTS  = -D USB_HOST_ONLY

 LUFA_OPTS += -D NO_STREAM_CALLBACKS

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

 

diff --git a/Demos/Host/LowLevel/StillImageHost/makefile b/Demos/Host/LowLevel/StillImageHost/makefile
index 583f7cfc8..64bf730d2 100644
--- a/Demos/Host/LowLevel/StillImageHost/makefile
+++ b/Demos/Host/LowLevel/StillImageHost/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_HOST_ONLY

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