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.

3 files changed, 13 insertions, 9 deletions

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 9bbfba113..6b16e1e7f 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -40,6 +40,8 @@
   *  - Add in new invalid event hook check targets to project makefiles to produce compilation errors when invalid event names

   *    are used in a project

   *  - The HID Report Parser now gives information on the total length of each report within a HID interface

+  *  - The USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token has been removed - there are now seperate USB_Descriptor_* and

+  *    USB_StdDescriptor_* structures for both the LUFA and standardized element naming conventions so both may be used

   *

   *  <b>Fixed:</b>

   *  - Fixed possible lockup in the CDC device class driver, when the host sends data that is a multiple of the

diff --git a/LUFA/ManPages/CompileTimeTokens.txt b/LUFA/ManPages/CompileTimeTokens.txt
index fb051b8c8..8213c678b 100644
--- a/LUFA/ManPages/CompileTimeTokens.txt
+++ b/LUFA/ManPages/CompileTimeTokens.txt
@@ -72,12 +72,6 @@
  *  <b>USE_EEPROM_DESCRIPTORS</b> - ( \ref Group_Descriptors ) \n

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

  *

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

- *  The USB 2.0 standard gives some rather obscure names for the elements in the standard descriptor types (device, configuration,

- *  string, endpoint, etc.). By default the LUFA library uses these names in its predefined descriptor structure types for

- *  compatibility. If this token is defined, the structure element names are switched to the LUFA-specific but more descriptive

- *  names documented in the StdDescriptors.h source file.

- *

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

  *  Some AVR models contain a unique 20-digit serial number which can be used as the device serial number, while in device mode. This

  *  allows the host to uniquely identify the device regardless of if it is moved between USB ports on the same computer, allowing

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index c098e130d..0070a34ac 100644
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -14,10 +14,10 @@
  *

  *  <b>Non-USB Library Components</b>

  *    - The ADC_Off() function has been renamed to \ref ADC_ShutDown() to be consistent with the rest of the library.

- *    - The Dataflash_Init() routine no longer initializes the SPI bus - the SPI bus should be initialized manually via a

+ *    - The \ref SPI_Init() routine's parameters have changed, so that the clock polarity and data sampling modes can be set. See

+ *      the \ref SPI_Init() function documentation for more details

+ *    - The \ref Dataflash_Init() routine no longer initializes the SPI bus - the SPI bus should be initialized manually via a

  *      call to SPI_Init() before using the Dataflash driver

- *    - The SPI_Init() routine's parameters have changed, so that the clock polarity and data sampling modes can be set. See

- *      the SPI_Init() function documentation for more details

  *

  *  <b>Host Mode</b>

  *    - The \ref USB_GetDeviceConfigDescriptor() function's parameters and behaviour has changed; the user is required to

@@ -28,6 +28,14 @@
  *      is interested in into the processed HID report item structure to save RAM. See \ref CALLBACK_HIDParser_FilterHIDReportItem().

  *    - The HID report parser now always parses FEATURE and always ignores constant-data items - the HID_ENABLE_FEATURE_PROCESSING

  *      and HID_INCLUDE_CONSTANT_DATA_ITEMS compile time tokens now have no effect.

+ *    - The USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token has been removed - there are now seperate USB_Descriptor_*

+ *      and USB_StdDescriptor_* structures for both the LUFA and standardized element naming conventions so that both may be used in

+ *      the one project. For existing projects using the standardized names, change all code to use the USB_StdDescriptor_* variants.

+ *

+ *  <b>Device Mode</b>

+ *    - The USE_NONSTANDARD_DESCRIPTOR_NAMES compile time token has been removed - there are now seperate USB_Descriptor_*

+ *      and USB_StdDescriptor_* structures for both the LUFA and standardized element naming conventions so that both may be used in

+ *      the one project. For existing projects using the standardized names, change all code to use the USB_StdDescriptor_* variants.

  *

  * \section Sec_Migration090810 Migrating from 090605 to 090810

  *