Standardized the naming scheme given to configuration descriptor sub-elements in...

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

diff --git a/Bootloaders/TeensyHID/Descriptors.c b/Bootloaders/TeensyHID/Descriptors.c
index 596ed6e..2832ec3 100644 (file)
--- a/Bootloaders/TeensyHID/Descriptors.c
+++ b/Bootloaders/TeensyHID/Descriptors.c
@@ -106,7 +106,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r

-       .Interface = \r
+       .HID_Interface = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r


@@ -122,7 +122,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r

-       .HIDDescriptor = \r
+       .HID_VendorHID = \r

                {  \r
                        .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
                        \r
                {  \r
                        .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},\r
                        \r


@@ -133,7 +133,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .HIDReportLength        = sizeof(HIDReport)\r
                },\r
                \r
                        .HIDReportLength        = sizeof(HIDReport)\r
                },\r
                \r

-       .HIDEndpoint = \r
+       .HID_ReportINEndpoint = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
 \r


@@ -168,7 +168,7 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_HID:\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_HID:\r

-                       Address = (void*)&ConfigurationDescriptor.HIDDescriptor;\r
+                       Address = (void*)&ConfigurationDescriptor.HID_VendorHID;\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