Added CDC functional descriptor structs to the Low Level CDC demos and CDC class...

[pub/USBasp.git] / Projects / Magstripe / Descriptors.c

diff --git a/Projects/Magstripe/Descriptors.c b/Projects/Magstripe/Descriptors.c
index 41c1c4b..a041760 100644 (file)
--- a/Projects/Magstripe/Descriptors.c
+++ b/Projects/Magstripe/Descriptors.c
@@ -138,12 +138,12 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .HID_KeyboardHID = 
                {  
 
        .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,
                        
                        .HIDSpec                = VERSION_BCD(01.11),
                        .CountryCode            = 0x00,
                        .TotalReportDescriptors = 1,

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

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


@@ -234,11 +234,11 @@ uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue,
                        }
                        
                        break;
                        }
                        
                        break;

-               case DTYPE_HID:
+               case HID_DTYPE_HID:

                        Address = &ConfigurationDescriptor.HID_KeyboardHID;
                        Size    = sizeof(USB_HID_Descriptor_HID_t);
                        break;
                        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;
                        Address = &KeyboardReport;
                        Size    = sizeof(KeyboardReport);
                        break;