All USB class drivers are now automatically included when LUFA/Drivers/USB.h is inclu...

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

diff --git a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
index b04dccd..39d6c73 100644 (file)
--- a/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
+++ b/Demos/Device/LowLevel/KeyboardMouse/Descriptors.c
@@ -180,12 +180,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .HID1_KeyboardHID =
                {
 
        .HID1_KeyboardHID =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
+                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},

 
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,
 
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,

-                       .HIDReportType          = DTYPE_Report,
+                       .HIDReportType          = HID_DTYPE_Report,

                        .HIDReportLength        = sizeof(KeyboardReport)
                },
 
                        .HIDReportLength        = sizeof(KeyboardReport)
                },
 


@@ -227,12 +227,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .HID2_MouseHID =
                {
 
        .HID2_MouseHID =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
+                       .Header                 = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID},

 
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,
 
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,

-                       .HIDReportType          = DTYPE_Report,
+                       .HIDReportType          = HID_DTYPE_Report,

                        .HIDReportLength        = sizeof(MouseReport)
                },
 
                        .HIDReportLength        = sizeof(MouseReport)
                },
 


@@ -324,19 +324,19 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                        }
 
                        break;
                        }
 
                        break;

-               case DTYPE_HID:
+               case HID_DTYPE_HID:

                        if (!(wIndex))
                        {
                                Address = &ConfigurationDescriptor.HID1_KeyboardHID;
                        if (!(wIndex))
                        {
                                Address = &ConfigurationDescriptor.HID1_KeyboardHID;

-                               Size    = sizeof(USB_Descriptor_HID_t);
+                               Size    = sizeof(USB_HID_Descriptor_HID_t);

                        }
                        else
                        {
                                Address = &ConfigurationDescriptor.HID2_MouseHID;
                        }
                        else
                        {
                                Address = &ConfigurationDescriptor.HID2_MouseHID;

-                               Size    = sizeof(USB_Descriptor_HID_t);
+                               Size    = sizeof(USB_HID_Descriptor_HID_t);

                        }
                        break;
                        }
                        break;

-               case DTYPE_Report:
+               case HID_DTYPE_Report:

                        if (!(wIndex))
                        {
                                Address = &KeyboardReport;
                        if (!(wIndex))
                        {
                                Address = &KeyboardReport;