Fixed incorrect CALLBACK_USB_GetDescriptor() wIndex parameter type (thanks to matlo).

author Dean Camera <dean@fourwalledcubicle.com>

Wed, 2 Dec 2015 07:56:52 +0000 (18:56 +1100)

committer Dean Camera <dean@fourwalledcubicle.com>

Wed, 2 Dec 2015 07:56:52 +0000 (18:56 +1100)
author Dean Camera <dean@fourwalledcubicle.com>
Wed, 2 Dec 2015 07:56:52 +0000 (18:56 +1100)
committer Dean Camera <dean@fourwalledcubicle.com>
Wed, 2 Dec 2015 07:56:52 +0000 (18:56 +1100)
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c

index bfb590e..9ced59a 100644 (file)
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -199,7 +199,7 @@ const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(L"LUFA CDC")
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Bootloaders/CDC/Descriptors.h b/Bootloaders/CDC/Descriptors.h

index 538449f..eb40dae 100644 (file)
--- a/Bootloaders/CDC/Descriptors.h
+++ b/Bootloaders/CDC/Descriptors.h
@@ -150,7 +150,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c

index 291ea55..ed8768c 100644 (file)
--- a/Bootloaders/DFU/Descriptors.c
+++ b/Bootloaders/DFU/Descriptors.c
@@ -140,7 +140,7 @@ const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(L"LUFA DFU")
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Bootloaders/DFU/Descriptors.h b/Bootloaders/DFU/Descriptors.h

index a19ce09..5862f89 100644 (file)
--- a/Bootloaders/DFU/Descriptors.h
+++ b/Bootloaders/DFU/Descriptors.h
@@ -186,7 +186,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Bootloaders/HID/Descriptors.c b/Bootloaders/HID/Descriptors.c

index c3920e3..43f893d 100644 (file)
--- a/Bootloaders/HID/Descriptors.c
+++ b/Bootloaders/HID/Descriptors.c
@@ -151,7 +151,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor =
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t DescriptorType   = (wValue >> 8);
diff --git a/Bootloaders/HID/Descriptors.h b/Bootloaders/HID/Descriptors.h

index 8035753..9d9b02f 100644 (file)
--- a/Bootloaders/HID/Descriptors.h
+++ b/Bootloaders/HID/Descriptors.h
@@ -72,7 +72,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Bootloaders/MassStorage/BootloaderMassStorage.c b/Bootloaders/MassStorage/BootloaderMassStorage.c

index 776e6b7..e5b2bea 100644 (file)
--- a/Bootloaders/MassStorage/BootloaderMassStorage.c
+++ b/Bootloaders/MassStorage/BootloaderMassStorage.c
@@ -149,7 +149,7 @@ void Application_Jump_Check(void)
                 MagicBootKey = 0;
  
                 // cppcheck-suppress constStatement
                 MagicBootKey = 0;
  
                 // cppcheck-suppress constStatement
-               ((void (*)(void))0x0000)();
+               ((void (*)(void))0x7000)();
         }
  }
  
         }
  }
  
diff --git a/Bootloaders/MassStorage/Descriptors.c b/Bootloaders/MassStorage/Descriptors.c

index 042cf2f..6907e3f 100644 (file)
--- a/Bootloaders/MassStorage/Descriptors.c
+++ b/Bootloaders/MassStorage/Descriptors.c
@@ -131,7 +131,7 @@ const USB_Descriptor_Configuration_t ConfigurationDescriptor =
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t DescriptorType = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t DescriptorType = (wValue >> 8);
diff --git a/Bootloaders/MassStorage/Descriptors.h b/Bootloaders/MassStorage/Descriptors.h

index 86ec8aa..d5e316d 100644 (file)
--- a/Bootloaders/MassStorage/Descriptors.h
+++ b/Bootloaders/MassStorage/Descriptors.h
@@ -80,7 +80,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) AUX_BOOT_SECTION;
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) AUX_BOOT_SECTION;
  
diff --git a/Bootloaders/Printer/Descriptors.c b/Bootloaders/Printer/Descriptors.c

index 58257ef..2f0e6ba 100644 (file)
--- a/Bootloaders/Printer/Descriptors.c
+++ b/Bootloaders/Printer/Descriptors.c
@@ -149,7 +149,7 @@ const USB_Descriptor_String_t ProductString = USB_STRING_DESCRIPTOR(L"LUFA Print
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Bootloaders/Printer/Descriptors.h b/Bootloaders/Printer/Descriptors.h

index 62ce1d0..729227a 100644 (file)
--- a/Bootloaders/Printer/Descriptors.h
+++ b/Bootloaders/Printer/Descriptors.h
@@ -88,7 +88,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.c b/Demos/Device/ClassDriver/AudioInput/Descriptors.c

index 4fcf179..227123a 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.c
@@ -267,7 +267,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/AudioInput/Descriptors.h b/Demos/Device/ClassDriver/AudioInput/Descriptors.h

index 980493f..e63e982 100644 (file)
--- a/Demos/Device/ClassDriver/AudioInput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioInput/Descriptors.h
@@ -98,7 +98,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c

index c7725c6..5582f4a 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.c
@@ -267,7 +267,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h

index c7f6235..d1355d4 100644 (file)
--- a/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
+++ b/Demos/Device/ClassDriver/AudioOutput/Descriptors.h
@@ -98,7 +98,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/DualMIDI/Descriptors.c b/Demos/Device/ClassDriver/DualMIDI/Descriptors.c

index 4e80b2a..abd305d 100644 (file)
--- a/Demos/Device/ClassDriver/DualMIDI/Descriptors.c
+++ b/Demos/Device/ClassDriver/DualMIDI/Descriptors.c
@@ -321,7 +321,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/DualMIDI/Descriptors.h b/Demos/Device/ClassDriver/DualMIDI/Descriptors.h

index 9be046d..b5e4db7 100644 (file)
--- a/Demos/Device/ClassDriver/DualMIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualMIDI/Descriptors.h
@@ -116,7 +116,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c

index ccf8059..970fd89 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c
@@ -315,7 +315,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h

index 697ff78..014c31c 100644 (file)
--- a/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h
@@ -127,7 +127,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.c b/Demos/Device/ClassDriver/GenericHID/Descriptors.c

index 39f0f2c..f4555a5 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.c
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.c
@@ -167,7 +167,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/GenericHID/Descriptors.h b/Demos/Device/ClassDriver/GenericHID/Descriptors.h

index fa7657c..38d206b 100644 (file)
--- a/Demos/Device/ClassDriver/GenericHID/Descriptors.h
+++ b/Demos/Device/ClassDriver/GenericHID/Descriptors.h
@@ -87,7 +87,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.c b/Demos/Device/ClassDriver/Joystick/Descriptors.c

index 8dccba2..343dfee 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.c
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.c
@@ -167,7 +167,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/Joystick/Descriptors.h b/Demos/Device/ClassDriver/Joystick/Descriptors.h

index d418e35..3c8f4a1 100644 (file)
--- a/Demos/Device/ClassDriver/Joystick/Descriptors.h
+++ b/Demos/Device/ClassDriver/Joystick/Descriptors.h
@@ -85,7 +85,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.c b/Demos/Device/ClassDriver/Keyboard/Descriptors.c

index d18ccc7..af3e800 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.c
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.c
@@ -163,7 +163,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.h b/Demos/Device/ClassDriver/Keyboard/Descriptors.h

index 1742dc6..e3fc3e7 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.h
@@ -85,7 +85,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c

index 0af2b8a..f001b38 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
@@ -216,7 +216,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h

index a8352fb..62b00dd 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h
@@ -94,7 +94,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c

index 0e9924e..7bd301f 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c
@@ -226,7 +226,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h

index 8747cd7..82e5282 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h
@@ -93,7 +93,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.c b/Demos/Device/ClassDriver/MIDI/Descriptors.c

index b11820c..731a9fe 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.c
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.c
@@ -269,7 +269,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/MIDI/Descriptors.h b/Demos/Device/ClassDriver/MIDI/Descriptors.h

index c39f334..8737686 100644 (file)
--- a/Demos/Device/ClassDriver/MIDI/Descriptors.h
+++ b/Demos/Device/ClassDriver/MIDI/Descriptors.h
@@ -100,7 +100,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.c b/Demos/Device/ClassDriver/MassStorage/Descriptors.c

index 6343887..88cc616 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Descriptors.c
+++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.c
@@ -149,7 +149,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/MassStorage/Descriptors.h b/Demos/Device/ClassDriver/MassStorage/Descriptors.h

index 4e850f8..3a7125f 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorage/Descriptors.h
+++ b/Demos/Device/ClassDriver/MassStorage/Descriptors.h
@@ -90,7 +90,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c

index d2436a0..ebcbd78 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c
@@ -201,7 +201,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h

index 73e17f1..563f479 100644 (file)
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h
@@ -103,7 +103,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.c b/Demos/Device/ClassDriver/Mouse/Descriptors.c

index 439efcc..ce58253 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.c
@@ -168,7 +168,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/Mouse/Descriptors.h b/Demos/Device/ClassDriver/Mouse/Descriptors.h

index 718b45b..d160798 100644 (file)
--- a/Demos/Device/ClassDriver/Mouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/Mouse/Descriptors.h
@@ -85,7 +85,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c

index 8f6ec49..c898b82 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c
@@ -199,7 +199,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h

index 7e519fc..a314a1f 100644 (file)
--- a/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h
@@ -104,7 +104,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c

index d07faa1..d9b0ff8 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.c
@@ -200,7 +200,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h

index 35bbda3..c77622b 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerial/Descriptors.h
@@ -102,7 +102,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.c

index 0da5f0b..229ec3d 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.c
@@ -250,7 +250,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h

index e571eb2..88f5ad6 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h
@@ -120,7 +120,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c

index 731cf99..cb29229 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c
@@ -270,7 +270,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h

index 5cbc2e7..c097efe 100644 (file)
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h
@@ -115,7 +115,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c

index 524aa2c..cb68cdd 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c
+++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c
@@ -160,7 +160,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h

index 36e0a2b..c962fbb 100644 (file)
--- a/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
+++ b/Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h
@@ -96,7 +96,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.c b/Demos/Device/LowLevel/AudioInput/Descriptors.c

index 22c76ed..e8b4e75 100644 (file)
--- a/Demos/Device/LowLevel/AudioInput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioInput/Descriptors.c
@@ -267,7 +267,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/AudioInput/Descriptors.h b/Demos/Device/LowLevel/AudioInput/Descriptors.h

index 4138a97..3883646 100644 (file)
--- a/Demos/Device/LowLevel/AudioInput/Descriptors.h
+++ b/Demos/Device/LowLevel/AudioInput/Descriptors.h
@@ -98,7 +98,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.c b/Demos/Device/LowLevel/AudioOutput/Descriptors.c

index 281839e..636f1bd 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/Descriptors.c
+++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.c
@@ -267,7 +267,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/AudioOutput/Descriptors.h b/Demos/Device/LowLevel/AudioOutput/Descriptors.h

index 83b2356..0e136ed 100644 (file)
--- a/Demos/Device/LowLevel/AudioOutput/Descriptors.h
+++ b/Demos/Device/LowLevel/AudioOutput/Descriptors.h
@@ -98,7 +98,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/BulkVendor/Descriptors.c b/Demos/Device/LowLevel/BulkVendor/Descriptors.c

index 418d5f5..ce29b02 100644 (file)
--- a/Demos/Device/LowLevel/BulkVendor/Descriptors.c
+++ b/Demos/Device/LowLevel/BulkVendor/Descriptors.c
@@ -149,7 +149,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/BulkVendor/Descriptors.h b/Demos/Device/LowLevel/BulkVendor/Descriptors.h

index 7fcd617..917799d 100644 (file)
--- a/Demos/Device/LowLevel/BulkVendor/Descriptors.h
+++ b/Demos/Device/LowLevel/BulkVendor/Descriptors.h
@@ -88,7 +88,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c

index ccf8059..970fd89 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
@@ -315,7 +315,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h

index c2649d0..bc96ef4 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h
@@ -127,7 +127,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/GenericHID/Descriptors.c b/Demos/Device/LowLevel/GenericHID/Descriptors.c

index 55ecff1..b9c658b 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/Descriptors.c
+++ b/Demos/Device/LowLevel/GenericHID/Descriptors.c
@@ -185,7 +185,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/GenericHID/Descriptors.h b/Demos/Device/LowLevel/GenericHID/Descriptors.h

index e0d0fdd..cba1181 100644 (file)
--- a/Demos/Device/LowLevel/GenericHID/Descriptors.h
+++ b/Demos/Device/LowLevel/GenericHID/Descriptors.h
@@ -91,7 +91,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.c b/Demos/Device/LowLevel/Joystick/Descriptors.c

index 367063e..c1eda62 100644 (file)
--- a/Demos/Device/LowLevel/Joystick/Descriptors.c
+++ b/Demos/Device/LowLevel/Joystick/Descriptors.c
@@ -187,7 +187,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/Joystick/Descriptors.h b/Demos/Device/LowLevel/Joystick/Descriptors.h

index 8f2cfab..4e8d46f 100644 (file)
--- a/Demos/Device/LowLevel/Joystick/Descriptors.h
+++ b/Demos/Device/LowLevel/Joystick/Descriptors.h
@@ -91,7 +91,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/Keyboard/Descriptors.c b/Demos/Device/LowLevel/Keyboard/Descriptors.c

index ead15d1..64cce54 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Descriptors.c
+++ b/Demos/Device/LowLevel/Keyboard/Descriptors.c
@@ -202,7 +202,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/Keyboard/Descriptors.h b/Demos/Device/LowLevel/Keyboard/Descriptors.h

index eaf6b98..b8ffe70 100644 (file)
--- a/Demos/Device/LowLevel/Keyboard/Descriptors.h
+++ b/Demos/Device/LowLevel/Keyboard/Descriptors.h
@@ -90,7 +90,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c

index 9ed3301..5e8ff10 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
@@ -274,7 +274,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h

index 3eb9b1f..3a57df2 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.h
@@ -99,7 +99,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.c b/Demos/Device/LowLevel/MIDI/Descriptors.c

index b11820c..731a9fe 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/Descriptors.c
+++ b/Demos/Device/LowLevel/MIDI/Descriptors.c
@@ -269,7 +269,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/MIDI/Descriptors.h b/Demos/Device/LowLevel/MIDI/Descriptors.h

index 0533d2a..64158fd 100644 (file)
--- a/Demos/Device/LowLevel/MIDI/Descriptors.h
+++ b/Demos/Device/LowLevel/MIDI/Descriptors.h
@@ -100,7 +100,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/MassStorage/Descriptors.c b/Demos/Device/LowLevel/MassStorage/Descriptors.c

index 6343887..88cc616 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/Descriptors.c
+++ b/Demos/Device/LowLevel/MassStorage/Descriptors.c
@@ -149,7 +149,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/MassStorage/Descriptors.h b/Demos/Device/LowLevel/MassStorage/Descriptors.h

index 50e8d5b..93d27ad 100644 (file)
--- a/Demos/Device/LowLevel/MassStorage/Descriptors.h
+++ b/Demos/Device/LowLevel/MassStorage/Descriptors.h
@@ -90,7 +90,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.c b/Demos/Device/LowLevel/Mouse/Descriptors.c

index 2beb0d2..ceb09b3 100644 (file)
--- a/Demos/Device/LowLevel/Mouse/Descriptors.c
+++ b/Demos/Device/LowLevel/Mouse/Descriptors.c
@@ -187,7 +187,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/Mouse/Descriptors.h b/Demos/Device/LowLevel/Mouse/Descriptors.h

index 718b45b..d160798 100644 (file)
--- a/Demos/Device/LowLevel/Mouse/Descriptors.h
+++ b/Demos/Device/LowLevel/Mouse/Descriptors.h
@@ -85,7 +85,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c

index 8f6ec49..c898b82 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c
+++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.c
@@ -199,7 +199,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h

index cd65be6..750f7db 100644 (file)
--- a/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
+++ b/Demos/Device/LowLevel/RNDISEthernet/Descriptors.h
@@ -104,7 +104,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.c b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c

index d07faa1..d9b0ff8 100644 (file)
--- a/Demos/Device/LowLevel/VirtualSerial/Descriptors.c
+++ b/Demos/Device/LowLevel/VirtualSerial/Descriptors.c
@@ -200,7 +200,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h

index 082cae8..529ac80 100644 (file)
--- a/Demos/Device/LowLevel/VirtualSerial/Descriptors.h
+++ b/Demos/Device/LowLevel/VirtualSerial/Descriptors.h
@@ -102,7 +102,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c

index d7b2563..dc64a34 100644 (file)
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c
@@ -168,7 +168,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h

index 0d9016a..efb60e0 100644 (file)
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h
@@ -85,7 +85,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c b/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c

index 2edbc5c..e9587ca 100644 (file)
--- a/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
+++ b/LUFA/CodeTemplates/DeviceTemplate/Descriptors.c
@@ -127,7 +127,7 @@ const USB_Descriptor_String_t ProductString =
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress
                                                                         #if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
                                                                         , uint8_t* const DescriptorMemorySpace
                                      const void** const DescriptorAddress
                                                                         #if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
                                                                         , uint8_t* const DescriptorMemorySpace
diff --git a/LUFA/CodeTemplates/HostTemplate/HostApplication.c b/LUFA/CodeTemplates/HostTemplate/HostApplication.c

index b92f8ed..1482b1d 100644 (file)
--- a/LUFA/CodeTemplates/HostTemplate/HostApplication.c
+++ b/LUFA/CodeTemplates/HostTemplate/HostApplication.c
@@ -122,7 +122,7 @@ void EVENT_USB_Host_DeviceEnumerationFailed(const uint8_t ErrorCode,
   * option is set, this is still required even in an application that uses host mode only.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   * option is set, this is still required even in an application that uses host mode only.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-               const uint8_t wIndex,
+               const uint16_t wIndex,
                 const void** const DescriptorAddress
  #if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
                 , uint8_t* const DescriptorMemorySpace
                 const void** const DescriptorAddress
  #if defined(HAS_MULTIPLE_DESCRIPTOR_ADDRESS_SPACES)
                 , uint8_t* const DescriptorMemorySpace
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt

index bcdaa68..2d86ec1 100644 (file)
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -7,7 +7,10 @@
   /** \page Page_ChangeLog Project Changelog
    *
    *  \section Sec_ChangeLogXXXXXX Version XXXXXX
   /** \page Page_ChangeLog Project Changelog
    *
    *  \section Sec_ChangeLogXXXXXX Version XXXXXX
-  *  None.
+  *  <b>Fixed:</b>
+  *  - Core:
+  *   - The CALLBACK_USB_GetDescriptor() callback function into the user application erroneously had a uint8_t type for the wIndex
+  *     parameter, instead of uint16_t (thanks to Matlo)
    *
    *  \section Sec_ChangeLog151115 Version 151115
    *  <b>New:</b>
    *
    *  \section Sec_ChangeLog151115 Version 151115
    *  <b>New:</b>
diff --git a/LUFA/DoxygenPages/MigrationInformation.txt b/LUFA/DoxygenPages/MigrationInformation.txt

index ad24e27..b98bfc1 100644 (file)
--- a/LUFA/DoxygenPages/MigrationInformation.txt
+++ b/LUFA/DoxygenPages/MigrationInformation.txt
@@ -11,7 +11,8 @@
   *  areas relevant to making older projects compatible with the API changes of each new release.
   *
   *  \section Sec_MigrationXXXXXX Version XXXXXX
   *  areas relevant to making older projects compatible with the API changes of each new release.
   *
   *  \section Sec_MigrationXXXXXX Version XXXXXX
- *  None.
+ *  <b>Device Mode</b>
+ *   - The \c CALLBACK_USB_GetDescriptor() callback function into the user application's \c wIndex parameter is now \c uint16_t, not \c uint8_t.
   *
   *  \section Sec_Migration151115 Migrating from 140928 to 151115
   *  <b>Non-USB Library Components</b>
   *
   *  \section Sec_Migration151115 Migrating from 140928 to 151115
   *  <b>Non-USB Library Components</b>
diff --git a/LUFA/Drivers/USB/Core/Device.h b/LUFA/Drivers/USB/Core/Device.h

index 1fb14d7..3b87641 100644 (file)
--- a/LUFA/Drivers/USB/Core/Device.h
+++ b/LUFA/Drivers/USB/Core/Device.h
@@ -131,7 +131,7 @@
                          *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise.
                          */
                         uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                          *  \return Size in bytes of the descriptor if it exists, zero or \ref NO_DESCRIPTOR otherwise.
                          */
                         uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                           const uint8_t wIndex,
+                                                           const uint16_t wIndex,
                                                             const void** const DescriptorAddress
                         #if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \
                             !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
                                                             const void** const DescriptorAddress
                         #if (defined(ARCH_HAS_MULTI_ADDRESS_SPACE) || defined(__DOXYGEN__)) && \
                             !(defined(USE_FLASH_DESCRIPTORS) || defined(USE_EEPROM_DESCRIPTORS) || defined(USE_RAM_DESCRIPTORS))
diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.c b/Projects/AVRISP-MKII/AVRISP-MKII.c

index 6d4bc89..9e03b38 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP-MKII.c
+++ b/Projects/AVRISP-MKII/AVRISP-MKII.c
@@ -157,7 +157,7 @@ void AVRISP_Task(void)
   *  \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress,
                                      uint8_t* DescriptorMemorySpace)
  {
                                      const void** const DescriptorAddress,
                                      uint8_t* DescriptorMemorySpace)
  {
diff --git a/Projects/AVRISP-MKII/AVRISP-MKII.h b/Projects/AVRISP-MKII/AVRISP-MKII.h

index ed79672..e1ec88e 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISP-MKII.h
+++ b/Projects/AVRISP-MKII/AVRISP-MKII.h
@@ -82,7 +82,7 @@
                 void EVENT_USB_Device_ConfigurationChanged(void);
  
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                 void EVENT_USB_Device_ConfigurationChanged(void);
  
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress,
                                                     uint8_t* const DescriptorMemorySpace)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
                                                     const void** const DescriptorAddress,
                                                     uint8_t* const DescriptorMemorySpace)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.c b/Projects/AVRISP-MKII/AVRISPDescriptors.c

index 4fbeef5..a377085 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISPDescriptors.c
+++ b/Projects/AVRISP-MKII/AVRISPDescriptors.c
@@ -170,7 +170,7 @@ USB_Descriptor_String_t AVRISP_SerialString = USB_STRING_DESCRIPTOR(L"0002000123
   *  USB host.
   */
  uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
-                              const uint8_t wIndex,
+                              const uint16_t wIndex,
                                const void** const DescriptorAddress,
                                uint8_t* DescriptorMemorySpace)
  {
                                const void** const DescriptorAddress,
                                uint8_t* DescriptorMemorySpace)
  {
diff --git a/Projects/AVRISP-MKII/AVRISPDescriptors.h b/Projects/AVRISP-MKII/AVRISPDescriptors.h

index b9ce100..c0dc6d7 100644 (file)
--- a/Projects/AVRISP-MKII/AVRISPDescriptors.h
+++ b/Projects/AVRISP-MKII/AVRISPDescriptors.h
@@ -114,7 +114,7 @@
  
         /* Function Prototypes: */
                 uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t AVRISP_GetDescriptor(const uint16_t wValue,
-                                             const uint8_t wIndex,
+                                             const uint16_t wIndex,
                                               const void** const DescriptorAddress,
                                               uint8_t* const DescriptorMemorySpace)
                                               ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
                                               const void** const DescriptorAddress,
                                               uint8_t* const DescriptorMemorySpace)
                                               ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
diff --git a/Projects/Benito/Descriptors.c b/Projects/Benito/Descriptors.c

index e9fed4b..e48bb68 100644 (file)
--- a/Projects/Benito/Descriptors.c
+++ b/Projects/Benito/Descriptors.c
@@ -199,7 +199,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"Be
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/Benito/Descriptors.h b/Projects/Benito/Descriptors.h

index ea90c48..fe500a3 100644 (file)
--- a/Projects/Benito/Descriptors.h
+++ b/Projects/Benito/Descriptors.h
@@ -104,7 +104,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/LEDNotifier/Descriptors.c b/Projects/LEDNotifier/Descriptors.c

index 159adef..233ad61 100644 (file)
--- a/Projects/LEDNotifier/Descriptors.c
+++ b/Projects/LEDNotifier/Descriptors.c
@@ -200,7 +200,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LE
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/LEDNotifier/Descriptors.h b/Projects/LEDNotifier/Descriptors.h

index 8e064d2..e6b02c8 100644 (file)
--- a/Projects/LEDNotifier/Descriptors.h
+++ b/Projects/LEDNotifier/Descriptors.h
@@ -102,7 +102,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/MIDIToneGenerator/Descriptors.c b/Projects/MIDIToneGenerator/Descriptors.c

index b11820c..731a9fe 100644 (file)
--- a/Projects/MIDIToneGenerator/Descriptors.c
+++ b/Projects/MIDIToneGenerator/Descriptors.c
@@ -269,7 +269,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/MIDIToneGenerator/Descriptors.h b/Projects/MIDIToneGenerator/Descriptors.h

index 5d39ae5..adf3a31 100644 (file)
--- a/Projects/MIDIToneGenerator/Descriptors.h
+++ b/Projects/MIDIToneGenerator/Descriptors.h
@@ -102,7 +102,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c

index 6659e06..dc2d034 100644 (file)
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -163,7 +163,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"Ma
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/Magstripe/Descriptors.h b/Projects/Magstripe/Descriptors.h

index e10e09f..78952ac 100644 (file)
--- a/Projects/Magstripe/Descriptors.h
+++ b/Projects/Magstripe/Descriptors.h
@@ -88,7 +88,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/MediaController/Descriptors.c b/Projects/MediaController/Descriptors.c

index d0c0752..651ff9e 100644 (file)
--- a/Projects/MediaController/Descriptors.c
+++ b/Projects/MediaController/Descriptors.c
@@ -181,7 +181,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/MediaController/Descriptors.h b/Projects/MediaController/Descriptors.h

index 63e5ef1..b4bc401 100644 (file)
--- a/Projects/MediaController/Descriptors.h
+++ b/Projects/MediaController/Descriptors.h
@@ -85,7 +85,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/RelayBoard/Descriptors.c b/Projects/RelayBoard/Descriptors.c

index 4ea58b5..4b24cd7 100644 (file)
--- a/Projects/RelayBoard/Descriptors.c
+++ b/Projects/RelayBoard/Descriptors.c
@@ -139,7 +139,7 @@ const USB_Descriptor_String_t PROGMEM RelayBoard_SerialString = USB_STRING_DESCR
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/RelayBoard/Descriptors.h b/Projects/RelayBoard/Descriptors.h

index 8fe6a35..1cd0a4c 100644 (file)
--- a/Projects/RelayBoard/Descriptors.h
+++ b/Projects/RelayBoard/Descriptors.h
@@ -77,7 +77,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  #endif
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  #endif
diff --git a/Projects/SerialToLCD/Descriptors.c b/Projects/SerialToLCD/Descriptors.c

index d381c1d..2caaab0 100644 (file)
--- a/Projects/SerialToLCD/Descriptors.c
+++ b/Projects/SerialToLCD/Descriptors.c
@@ -212,7 +212,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"US
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/SerialToLCD/Descriptors.h b/Projects/SerialToLCD/Descriptors.h

index 96b05fd..2e55165 100644 (file)
--- a/Projects/SerialToLCD/Descriptors.h
+++ b/Projects/SerialToLCD/Descriptors.h
@@ -103,7 +103,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/TempDataLogger/Descriptors.c b/Projects/TempDataLogger/Descriptors.c

index 0bc9fff..b8277a5 100644 (file)
--- a/Projects/TempDataLogger/Descriptors.c
+++ b/Projects/TempDataLogger/Descriptors.c
@@ -204,7 +204,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"Te
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/TempDataLogger/Descriptors.h b/Projects/TempDataLogger/Descriptors.h

index 513510c..2dbe81c 100644 (file)
--- a/Projects/TempDataLogger/Descriptors.h
+++ b/Projects/TempDataLogger/Descriptors.h
@@ -79,7 +79,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/USBtoSerial/Descriptors.c b/Projects/USBtoSerial/Descriptors.c

index 1a4ef3c..e062a9c 100644 (file)
--- a/Projects/USBtoSerial/Descriptors.c
+++ b/Projects/USBtoSerial/Descriptors.c
@@ -200,7 +200,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/USBtoSerial/Descriptors.h b/Projects/USBtoSerial/Descriptors.h

index 8e064d2..e6b02c8 100644 (file)
--- a/Projects/USBtoSerial/Descriptors.h
+++ b/Projects/USBtoSerial/Descriptors.h
@@ -102,7 +102,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/Webserver/Descriptors.c b/Projects/Webserver/Descriptors.c

index 76b94f0..9ae94e5 100644 (file)
--- a/Projects/Webserver/Descriptors.c
+++ b/Projects/Webserver/Descriptors.c
@@ -250,7 +250,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = USB_STRING_DESCRIPTOR(L"LU
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  USB host.
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
                                      const void** const DescriptorAddress)
  {
         const uint8_t  DescriptorType   = (wValue >> 8);
diff --git a/Projects/Webserver/Descriptors.h b/Projects/Webserver/Descriptors.h

index abef660..43d5a74 100644 (file)
--- a/Projects/Webserver/Descriptors.h
+++ b/Projects/Webserver/Descriptors.h
@@ -120,7 +120,7 @@
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
                                                     const void** const DescriptorAddress)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3);
  
diff --git a/Projects/XPLAINBridge/USARTDescriptors.c b/Projects/XPLAINBridge/USARTDescriptors.c

index f1354a2..1478e28 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.c
+++ b/Projects/XPLAINBridge/USARTDescriptors.c
@@ -197,7 +197,7 @@ const USB_Descriptor_String_t PROGMEM USART_ProductString = USB_STRING_DESCRIPTO
   *  callback function in the main source file, to retrieve the device's descriptors when in USART bridge mode.
   */
  uint16_t USART_GetDescriptor(const uint16_t wValue,
   *  callback function in the main source file, to retrieve the device's descriptors when in USART bridge mode.
   */
  uint16_t USART_GetDescriptor(const uint16_t wValue,
-                             const uint8_t wIndex,
+                             const uint16_t wIndex,
                               const void** const DescriptorAddress,
                               uint8_t* const DescriptorMemorySpace)
  {
                               const void** const DescriptorAddress,
                               uint8_t* const DescriptorMemorySpace)
  {
diff --git a/Projects/XPLAINBridge/USARTDescriptors.h b/Projects/XPLAINBridge/USARTDescriptors.h

index 3ea4357..81a55be 100644 (file)
--- a/Projects/XPLAINBridge/USARTDescriptors.h
+++ b/Projects/XPLAINBridge/USARTDescriptors.h
@@ -104,7 +104,7 @@
  
         /* Function Prototypes: */
                 uint16_t USART_GetDescriptor(const uint16_t wValue,
  
         /* Function Prototypes: */
                 uint16_t USART_GetDescriptor(const uint16_t wValue,
-                                            const uint8_t wIndex,
+                                            const uint16_t wIndex,
                                              const void** const DescriptorAddress,
                                              uint8_t* const DescriptorMemorySpace);
  
                                              const void** const DescriptorAddress,
                                              uint8_t* const DescriptorMemorySpace);
  
diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c

index 9475b1f..173c19c 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.c
+++ b/Projects/XPLAINBridge/XPLAINBridge.c
@@ -281,7 +281,7 @@ void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCI
   *  \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
   *  \return Length of the retrieved descriptor in bytes, or NO_DESCRIPTOR if the descriptor was not found
   */
  uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                    const uint8_t wIndex,
+                                    const uint16_t wIndex,
                                      const void** const DescriptorAddress,
                                             uint8_t* const DescriptorMemorySpace)
  {
                                      const void** const DescriptorAddress,
                                             uint8_t* const DescriptorMemorySpace)
  {
diff --git a/Projects/XPLAINBridge/XPLAINBridge.h b/Projects/XPLAINBridge/XPLAINBridge.h

index baed8b9..0ce234f 100644 (file)
--- a/Projects/XPLAINBridge/XPLAINBridge.h
+++ b/Projects/XPLAINBridge/XPLAINBridge.h
@@ -95,7 +95,7 @@
                 void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
  
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                 void EVENT_CDC_Device_LineEncodingChanged(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo);
  
                 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
-                                                   const uint8_t wIndex,
+                                                   const uint16_t wIndex,
                                                     const void** const DescriptorAddress,
                                                     uint8_t* const DescriptorMemorySpace)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
                                                     const void** const DescriptorAddress,
                                                     uint8_t* const DescriptorMemorySpace)
                                                     ATTR_WARN_UNUSED_RESULT ATTR_NON_NULL_PTR_ARG(3) ATTR_NON_NULL_PTR_ARG(4);
author	Dean Camera <dean@fourwalledcubicle.com>
	Wed, 2 Dec 2015 07:56:52 +0000 (18:56 +1100)
committer	Dean Camera <dean@fourwalledcubicle.com>
	Wed, 2 Dec 2015 07:56:52 +0000 (18:56 +1100)
Bootloaders/CDC/Descriptors.c		patch \| blob \| blame \| history
Bootloaders/CDC/Descriptors.h		patch \| blob \| blame \| history
Bootloaders/DFU/Descriptors.c		patch \| blob \| blame \| history
Bootloaders/DFU/Descriptors.h		patch \| blob \| blame \| history
Bootloaders/HID/Descriptors.c		patch \| blob \| blame \| history
Bootloaders/HID/Descriptors.h		patch \| blob \| blame \| history
Bootloaders/MassStorage/BootloaderMassStorage.c		patch \| blob \| blame \| history
Bootloaders/MassStorage/Descriptors.c		patch \| blob \| blame \| history
Bootloaders/MassStorage/Descriptors.h		patch \| blob \| blame \| history
Bootloaders/Printer/Descriptors.c		patch \| blob \| blame \| history
Bootloaders/Printer/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/AudioInput/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/AudioInput/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/AudioOutput/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/AudioOutput/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/DualMIDI/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/DualMIDI/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/DualVirtualSerial/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/GenericHID/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/GenericHID/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/Joystick/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/Joystick/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/Keyboard/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/Keyboard/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/KeyboardMouse/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/KeyboardMouseMultiReport/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/MIDI/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/MIDI/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/MassStorage/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/MassStorage/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/MassStorageKeyboard/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/Mouse/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/Mouse/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/RNDISEthernet/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/RNDISEthernet/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/VirtualSerial/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/VirtualSerial/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/VirtualSerialMassStorage/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/ClassDriver/VirtualSerialMouse/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/Incomplete/TestAndMeasurement/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/Incomplete/TestAndMeasurement/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/AudioInput/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/AudioInput/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/AudioOutput/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/AudioOutput/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/BulkVendor/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/BulkVendor/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/DualVirtualSerial/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/GenericHID/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/GenericHID/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/Joystick/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/Joystick/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/Keyboard/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/Keyboard/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/KeyboardMouse/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/KeyboardMouse/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/MIDI/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/MIDI/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/MassStorage/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/MassStorage/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/Mouse/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/Mouse/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/RNDISEthernet/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/RNDISEthernet/Descriptors.h		patch \| blob \| blame \| history
Demos/Device/LowLevel/VirtualSerial/Descriptors.c		patch \| blob \| blame \| history
Demos/Device/LowLevel/VirtualSerial/Descriptors.h		patch \| blob \| blame \| history
Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.c		patch \| blob \| blame \| history
Demos/DualRole/ClassDriver/MouseHostDevice/Descriptors.h		patch \| blob \| blame \| history
LUFA/CodeTemplates/DeviceTemplate/Descriptors.c		patch \| blob \| blame \| history
LUFA/CodeTemplates/HostTemplate/HostApplication.c		patch \| blob \| blame \| history
LUFA/DoxygenPages/ChangeLog.txt		patch \| blob \| blame \| history
LUFA/DoxygenPages/MigrationInformation.txt		patch \| blob \| blame \| history
LUFA/Drivers/USB/Core/Device.h		patch \| blob \| blame \| history
Projects/AVRISP-MKII/AVRISP-MKII.c		patch \| blob \| blame \| history
Projects/AVRISP-MKII/AVRISP-MKII.h		patch \| blob \| blame \| history
Projects/AVRISP-MKII/AVRISPDescriptors.c		patch \| blob \| blame \| history
Projects/AVRISP-MKII/AVRISPDescriptors.h		patch \| blob \| blame \| history
Projects/Benito/Descriptors.c		patch \| blob \| blame \| history
Projects/Benito/Descriptors.h		patch \| blob \| blame \| history
Projects/LEDNotifier/Descriptors.c		patch \| blob \| blame \| history
Projects/LEDNotifier/Descriptors.h		patch \| blob \| blame \| history
Projects/MIDIToneGenerator/Descriptors.c		patch \| blob \| blame \| history
Projects/MIDIToneGenerator/Descriptors.h		patch \| blob \| blame \| history
Projects/Magstripe/Descriptors.c		patch \| blob \| blame \| history
Projects/Magstripe/Descriptors.h		patch \| blob \| blame \| history
Projects/MediaController/Descriptors.c		patch \| blob \| blame \| history
Projects/MediaController/Descriptors.h		patch \| blob \| blame \| history
Projects/RelayBoard/Descriptors.c		patch \| blob \| blame \| history
Projects/RelayBoard/Descriptors.h		patch \| blob \| blame \| history
Projects/SerialToLCD/Descriptors.c		patch \| blob \| blame \| history
Projects/SerialToLCD/Descriptors.h		patch \| blob \| blame \| history
Projects/TempDataLogger/Descriptors.c		patch \| blob \| blame \| history
Projects/TempDataLogger/Descriptors.h		patch \| blob \| blame \| history
Projects/USBtoSerial/Descriptors.c		patch \| blob \| blame \| history
Projects/USBtoSerial/Descriptors.h		patch \| blob \| blame \| history
Projects/Webserver/Descriptors.c		patch \| blob \| blame \| history
Projects/Webserver/Descriptors.h		patch \| blob \| blame \| history
Projects/XPLAINBridge/USARTDescriptors.c		patch \| blob \| blame \| history
Projects/XPLAINBridge/USARTDescriptors.h		patch \| blob \| blame \| history
Projects/XPLAINBridge/XPLAINBridge.c		patch \| blob \| blame \| history
Projects/XPLAINBridge/XPLAINBridge.h		patch \| blob \| blame \| history