Fix TeensyHID bootloader - change vendor page in the descriptors to match the undocum...

Commit for the 091223 release.

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index 098de0d..791269c 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -46,7 +46,7 @@
 USB_Descriptor_HIDReport_Datatype_t HIDReport[] =\r
 {\r
        0x06, 0x9c, 0xff,     /* Usage Page (Vendor Defined)                     */\r
 USB_Descriptor_HIDReport_Datatype_t HIDReport[] =\r
 {\r
        0x06, 0x9c, 0xff,     /* Usage Page (Vendor Defined)                     */\r

-       0x09, 0x19,           /* Usage (Vendor Defined)                          */\r
+       0x09, 0x1B,           /* Usage (Vendor Defined)                          */\r

        0xa1, 0x01,           /* Collection (Vendor Defined)                     */\r
        0x0a, 0x19, 0x00,     /*   Usage (Vendor Defined)                        */\r
        0x75, 0x08,           /*   Report Size (8)                               */\r
        0xa1, 0x01,           /* Collection (Vendor Defined)                     */\r
        0x0a, 0x19, 0x00,     /*   Usage (Vendor Defined)                        */\r
        0x75, 0x08,           /*   Report Size (8)                               */\r


@@ -78,7 +78,7 @@ USB_Descriptor_Device_t DeviceDescriptor =
        .ReleaseNumber          = 0x0120,\r
                \r
        .ManufacturerStrIndex   = NO_DESCRIPTOR,\r
        .ReleaseNumber          = 0x0120,\r
                \r
        .ManufacturerStrIndex   = NO_DESCRIPTOR,\r

-       .ProductStrIndex        = 0x01,\r
+       .ProductStrIndex        = NO_DESCRIPTOR,\r

        .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r
        .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r
        .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r
        .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r


@@ -144,28 +144,6 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                },\r
 };\r
 \r
                },\r
 };\r
 \r

-/** Language descriptor structure. This descriptor, located in FLASH memory, is returned when the host requests\r
- *  the string descriptor with index 0 (the first index). It is actually an array of 16-bit integers, which indicate\r
- *  via the language ID table available at USB.org what languages the device supports for its string descriptors.\r
- */\r
-USB_Descriptor_String_t LanguageString =\r
-{\r
-       .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},\r
-               \r
-       .UnicodeString          = {LANGUAGE_ID_ENG}\r
-};\r
-\r
-/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,\r
- *  and is read out upon request by the host when the appropriate string ID is requested, listed in the Device\r
- *  Descriptor.\r
- */\r
-USB_Descriptor_String_t ProductString =\r
-{\r
-       .Header                 = {.Size = USB_STRING_LEN(21), .Type = DTYPE_String},\r
-               \r
-       .UnicodeString          = L"AVR Teensy Bootloader"\r
-};\r
-\r

 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"\r
  *  documentation) by the application code so that the address and size of a requested descriptor can be given\r
  *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function\r
 /** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"\r
  *  documentation) by the application code so that the address and size of a requested descriptor can be given\r
  *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function\r


@@ -175,7 +153,6 @@ USB_Descriptor_String_t ProductString =
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
 uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r

-       const uint8_t  DescriptorNumber = (wValue & 0xFF);\r

 \r
        void*    Address = NULL;\r
        uint16_t Size    = NO_DESCRIPTOR;\r
 \r
        void*    Address = NULL;\r
        uint16_t Size    = NO_DESCRIPTOR;\r


@@ -190,19 +167,6 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                        Address = (void*)&ConfigurationDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                        Address = (void*)&ConfigurationDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r

-               case DTYPE_String:\r
-                       if (!(DescriptorNumber))\r
-                       {\r
-                               Address = (void*)&LanguageString;\r
-                               Size    = LanguageString.Header.Size;\r
-                       }\r
-                       else\r
-                       {\r
-                               Address = (void*)&ProductString;\r
-                               Size    = ProductString.Header.Size;\r
-                       }\r
-                       \r
-                       break;\r

                case DTYPE_HID:\r
                        Address = (void*)&ConfigurationDescriptor.HIDDescriptor;\r
                        Size    = sizeof(USB_Descriptor_HID_t);\r
                case DTYPE_HID:\r
                        Address = (void*)&ConfigurationDescriptor.HIDDescriptor;\r
                        Size    = sizeof(USB_Descriptor_HID_t);\r

diff --git a/Bootloaders/TeensyHID/TeensyHID.txt b/Bootloaders/TeensyHID/TeensyHID.txt
index bc4e15f..6ee62f5 100644 (file)
--- a/Bootloaders/TeensyHID/TeensyHID.txt
+++ b/Bootloaders/TeensyHID/TeensyHID.txt
@@ -10,10 +10,7 @@
  *\r
  *  The following list indicates what microcontrollers are compatible with this demo.\r
  *\r
  *\r
  *  The following list indicates what microcontrollers are compatible with this demo.\r
  *\r

- *  - AT90USB162\r
- *  - ATMEGA32U4\r
- *  - AT90USB646\r
- *  - AT90USB1286\r
+ *  - ATMEGA32U4 (Teensy 2.0)\r

  *\r
  *  \section SSec_Info USB Information:\r
  *\r
  *\r
  *  \section SSec_Info USB Information:\r
  *\r

diff --git a/Bootloaders/TeensyHID/makefile b/Bootloaders/TeensyHID/makefile
index 8de8f8f..c7210f0 100644 (file)
--- a/Bootloaders/TeensyHID/makefile
+++ b/Bootloaders/TeensyHID/makefile
@@ -122,7 +122,7 @@ LUFA_PATH = ../..
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r
 # LUFA library compile-time options\r
 LUFA_OPTS  = -D USB_DEVICE_ONLY\r
 LUFA_OPTS += -D DEVICE_STATE_AS_GPIOR=0\r

-LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=8\r
+LUFA_OPTS += -D FIXED_CONTROL_ENDPOINT_SIZE=64\r

 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r
 LUFA_OPTS += -D FIXED_NUM_CONFIGURATIONS=1\r
 LUFA_OPTS += -D USE_RAM_DESCRIPTORS\r
 LUFA_OPTS += -D USE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABLED | USB_OPT_AUTO_PLL)"\r