Fix incorrect definition of Endpoint_BytesInEndpoint() for the U4 parts.

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

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index fc7f51c..b85bd7a 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -81,7 +81,7 @@ USB_Descriptor_Device_t DeviceDescriptor =
        .ProductStrIndex        = 0x01,\r
        .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r
        .ProductStrIndex        = 0x01,\r
        .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r

-       .NumberOfConfigurations = 1\r
+       .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r

 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\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


@@ -138,7 +138,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | HID_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | HID_EPNUM),\r

-                       .Attributes             = EP_TYPE_INTERRUPT,\r
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = HID_EPSIZE,\r
                        .PollingIntervalMS      = 0x40\r
                },\r
                        .EndpointSize           = HID_EPSIZE,\r
                        .PollingIntervalMS      = 0x40\r
                },\r


@@ -172,7 +172,7 @@ USB_Descriptor_String_t ProductString =
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\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