Move class-specific functional descriptor definitions to their respective classes.

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

diff --git a/Projects/SerialToLCD/Descriptors.c b/Projects/SerialToLCD/Descriptors.c
index 8e1bf3f..63d0b21 100644 (file)
--- a/Projects/SerialToLCD/Descriptors.c
+++ b/Projects/SerialToLCD/Descriptors.c
@@ -117,7 +117,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .CDC_Functional_Header =
                {
 
        .CDC_Functional_Header =
                {

-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = CDC_DTYPE_CSInterface},

                        .Subtype                = CDC_DSUBTYPE_CSInterface_Header,
 
                        .CDCSpecification       = VERSION_BCD(1,1,0),
                        .Subtype                = CDC_DSUBTYPE_CSInterface_Header,
 
                        .CDCSpecification       = VERSION_BCD(1,1,0),


@@ -125,7 +125,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .CDC_Functional_ACM =
                {
 
        .CDC_Functional_ACM =
                {

-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = CDC_DTYPE_CSInterface},

                        .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,
 
                        .Capabilities           = 0x06,
                        .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,
 
                        .Capabilities           = 0x06,


@@ -133,7 +133,7 @@ const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .CDC_Functional_Union =
                {
 
        .CDC_Functional_Union =
                {

-                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = CDC_DTYPE_CSInterface},

                        .Subtype                = CDC_DSUBTYPE_CSInterface_Union,
 
                        .MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI,
                        .Subtype                = CDC_DSUBTYPE_CSInterface_Union,
 
                        .MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI,