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

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

diff --git a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
index cce7270..45f1d4e 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
@@ -128,28 +128,29 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 

-       .CDC1_Functional_IntHeader = 
+       .CDC1_Functional_Header = 

                {
                {

-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
-                       .SubType                = 0x00,
+                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = 0x00,

                        
                        

-                       .Data                   = {0x01, 0x10}
+                       .CDCSpecification       = VERSION_BCD(01.10),

                },
 
                },
 

-       .CDC1_Functional_AbstractControlManagement = 
+       .CDC1_Functional_ACM = 

                {
                {

-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},
-                       .SubType                = 0x02,
+                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalACM_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = 0x02,

                        
                        

-                       .Data                   = {0x06}
+                       .Capabilities           = 0x06,

                },
                
        .CDC1_Functional_Union = 
                {
                },
                
        .CDC1_Functional_Union = 
                {

-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
-                       .SubType                = 0x06,
+                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = 0x06,

                        
                        

-                       .Data                   = {0x00, 0x01}
+                       .MasterInterfaceNumber  = 0,
+                       .SlaveInterfaceNumber   = 1,

                },
 
        .CDC1_ManagementEndpoint = 
                },
 
        .CDC1_ManagementEndpoint = 


@@ -228,28 +229,29 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 
                        .InterfaceStrIndex      = NO_DESCRIPTOR
                },
 

-       .CDC2_Functional_IntHeader = 
+       .CDC2_Functional_Header = 

                {
                {

-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
-                       .SubType                = 0x00,
+                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = 0x00,

                        
                        

-                       .Data                   = {0x01, 0x10}
+                       .CDCSpecification       = VERSION_BCD(01.10),

                },
 
                },
 

-       .CDC2_Functional_AbstractControlManagement = 
+       .CDC2_Functional_ACM = 

                {
                {

-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},
-                       .SubType                = 0x02,
+                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalACM_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = 0x02,

                        
                        

-                       .Data                   = {0x06}
+                       .Capabilities           = 0x06,

                },
                
        .CDC2_Functional_Union = 
                {
                },
                
        .CDC2_Functional_Union = 
                {

-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
-                       .SubType                = 0x06,
+                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = 0x06,

                        
                        

-                       .Data                   = {0x02, 0x03}
+                       .MasterInterfaceNumber  = 2,
+                       .SlaveInterfaceNumber   = 3,

                },
 
        .CDC2_ManagementEndpoint = 
                },
 
        .CDC2_ManagementEndpoint =