Set all CDC and MassStorage device mode demos (LowLevel and ClassDriver) to use the...

[pub/USBasp.git] / Bootloaders / TeensyHID / Descriptors.c

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index 68b9c43..99db8ca 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -71,7 +71,7 @@ USB_Descriptor_Device_t DeviceDescriptor =
        .SubClass               = 0x00,\r
        .Protocol               = 0x00,\r
                                \r
        .SubClass               = 0x00,\r
        .Protocol               = 0x00,\r
                                \r

-       .Endpoint0Size          = 8,\r
+       .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,\r

                \r
        .VendorID               = 0x16C0,\r
        .ProductID              = 0x0478,\r
                \r
        .VendorID               = 0x16C0,\r
        .ProductID              = 0x0478,\r


@@ -128,7 +128,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r

-                       .TotalHIDReports        = 0x01,\r
+                       .TotalHIDDescriptors    = 1,\r

                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(HIDReport)\r
                },\r
                        .HIDReportType          = DTYPE_Report,\r
                        .HIDReportLength        = sizeof(HIDReport)\r
                },\r


@@ -166,13 +166,13 @@ USB_Descriptor_String_t ProductString =
        .UnicodeString          = L"AVR Teensy Bootloader"\r
 };\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 StdDescriptors.h\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
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\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
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\r

-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\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
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r


@@ -183,32 +183,32 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r

-                       Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+                       Address = (void*)&DeviceDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r

-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor;\r

                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        if (!(DescriptorNumber))\r
                        {\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        if (!(DescriptorNumber))\r
                        {\r

-                               Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                               Address = (void*)&LanguageString;\r

                                Size    = LanguageString.Header.Size;\r
                        }\r
                        else\r
                        {\r
                                Size    = LanguageString.Header.Size;\r
                        }\r
                        else\r
                        {\r

-                               Address = DESCRIPTOR_ADDRESS(ProductString);\r
+                               Address = (void*)&ProductString;\r

                                Size    = ProductString.Header.Size;\r
                        }\r
                        \r
                        break;\r
                case DTYPE_HID:\r
                                Size    = ProductString.Header.Size;\r
                        }\r
                        \r
                        break;\r
                case DTYPE_HID:\r

-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.HIDDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor.HIDDescriptor;\r

                        Size    = sizeof(USB_Descriptor_HID_t);\r
                        break;\r
                case DTYPE_Report:\r
                        Size    = sizeof(USB_Descriptor_HID_t);\r
                        break;\r
                case DTYPE_Report:\r

-                       Address = DESCRIPTOR_ADDRESS(HIDReport);\r
+                       Address = (void*)&HIDReport;\r

                        Size    = sizeof(HIDReport);\r
                        break;\r
        }\r
                        Size    = sizeof(HIDReport);\r
                        break;\r
        }\r