Move out many of the common class driver constants into grouped enums, to make them...

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

diff --git a/Demos/Device/ClassDriver/Keyboard/Descriptors.c b/Demos/Device/ClassDriver/Keyboard/Descriptors.c
index 63114b1..ed2cb6c 100644 (file)
--- a/Demos/Device/ClassDriver/Keyboard/Descriptors.c
+++ b/Demos/Device/ClassDriver/Keyboard/Descriptors.c
@@ -139,19 +139,19 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                                
                        .Class                  = 0x03,
                        .SubClass               = 0x01,
-                       .Protocol               = HID_BOOT_KEYBOARD_PROTOCOL,
+                       .Protocol               = HID_BOOTP_KeyboardBootProtocol,
                                
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
        .HID_KeyboardHID = 
                {  
-                       .Header                 = {.Size = sizeof(USB_HID_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,
-                       .HIDReportType          = DTYPE_Report,
+                       .HIDReportType          = HID_DTYPE_Report,
                        .HIDReportLength        = sizeof(KeyboardReport)
                },
                
@@ -243,11 +243,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                        }
                        
                        break;
-               case DTYPE_HID: 
+               case HID_DTYPE_HID: 
                        Address = &ConfigurationDescriptor.HID_KeyboardHID;
                        Size    = sizeof(USB_HID_Descriptor_HID_t);
                        break;
-               case DTYPE_Report: 
+               case HID_DTYPE_Report: 
                        Address = &KeyboardReport;
                        Size    = sizeof(KeyboardReport);
                        break;