Reduce struct name pollution - group typedef struct names by class driver name where...

[pub/USBasp.git] / Demos / Device / ClassDriver / KeyboardMouse / Descriptors.c

diff --git a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
index c9a778f..40917f0 100644 (file)
--- a/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/ClassDriver/KeyboardMouse/Descriptors.c
@@ -180,7 +180,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .KeyboardHID = \r
                {  \r
 \r
        .KeyboardHID = \r
                {  \r

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

                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r


@@ -217,7 +217,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 \r
        .MouseHID = \r
                {  \r
 \r
        .MouseHID = \r
                {  \r

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

                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r
                        \r
                        .HIDSpec                = VERSION_BCD(01.11),\r
                        .CountryCode            = 0x00,\r


@@ -316,12 +316,12 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex,
                        if (!(wIndex))\r
                        {\r
                                Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r
                        if (!(wIndex))\r
                        {\r
                                Address = (void*)&ConfigurationDescriptor.KeyboardHID;\r

-                               Size    = sizeof(USB_Descriptor_HID_t);\r
+                               Size    = sizeof(USB_HID_Descriptor_t);\r

                        }\r
                        else\r
                        {\r
                                Address = (void*)&ConfigurationDescriptor.MouseHID;\r
                        }\r
                        else\r
                        {\r
                                Address = (void*)&ConfigurationDescriptor.MouseHID;\r

-                               Size    = sizeof(USB_Descriptor_HID_t);                 \r
+                               Size    = sizeof(USB_HID_Descriptor_t);                 \r

                        }\r
                        break;\r
                case DTYPE_Report: \r
                        }\r
                        break;\r
                case DTYPE_Report: \r