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

[pub/USBasp.git] / Bootloaders / CDC / Descriptors.c

diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index 81fbe24..ab9d808 100644 (file)
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -104,7 +104,7 @@ const USB_Descriptor_Configuration_t 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                = 0x00,
 
                        .CDCSpecification       = VERSION_BCD(1,1,0),
                        .Subtype                = 0x00,
 
                        .CDCSpecification       = VERSION_BCD(1,1,0),


@@ -112,7 +112,7 @@ const USB_Descriptor_Configuration_t 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                = 0x02,
 
                        .Capabilities           = 0x02,
                        .Subtype                = 0x02,
 
                        .Capabilities           = 0x02,


@@ -120,7 +120,7 @@ const USB_Descriptor_Configuration_t 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                = 0x06,
 
                        .MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI,
                        .Subtype                = 0x06,
 
                        .MasterInterfaceNumber  = INTERFACE_ID_CDC_CCI,