All USB class drivers are now automatically included when LUFA/Drivers/USB.h is inclu...

[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 ca5af27..775ab08 100644 (file)
--- a/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
+++ b/Demos/Device/LowLevel/DualVirtualSerial/Descriptors.c
@@ -130,24 +130,24 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .CDC1_Functional_Header =
                {
 
        .CDC1_Functional_Header =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalHeader_t), .Type = DTYPE_CSInterface},
-                       .Subtype                = 0x00,
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = CDC_DSUBTYPE_CSInterface_Header,

 
                        .CDCSpecification       = VERSION_BCD(01.10),
                },
 
        .CDC1_Functional_ACM =
                {
 
                        .CDCSpecification       = VERSION_BCD(01.10),
                },
 
        .CDC1_Functional_ACM =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalACM_t), .Type = DTYPE_CSInterface},
-                       .Subtype                = 0x02,
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

 
                        .Capabilities           = 0x06,
                },
 
        .CDC1_Functional_Union =
                {
 
                        .Capabilities           = 0x06,
                },
 
        .CDC1_Functional_Union =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalUnion_t), .Type = DTYPE_CSInterface},
-                       .Subtype                = 0x06,
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = CDC_DSUBTYPE_CSInterface_Union,

 
                        .MasterInterfaceNumber  = 0,
                        .SlaveInterfaceNumber   = 1,
 
                        .MasterInterfaceNumber  = 0,
                        .SlaveInterfaceNumber   = 1,


@@ -231,24 +231,24 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
 
        .CDC2_Functional_Header =
                {
 
        .CDC2_Functional_Header =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalHeader_t), .Type = DTYPE_CSInterface},
-                       .Subtype                = 0x00,
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = CDC_DSUBTYPE_CSInterface_Header,

 
                        .CDCSpecification       = VERSION_BCD(01.10),
                },
 
        .CDC2_Functional_ACM =
                {
 
                        .CDCSpecification       = VERSION_BCD(01.10),
                },
 
        .CDC2_Functional_ACM =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalACM_t), .Type = DTYPE_CSInterface},
-                       .Subtype                = 0x02,
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = CDC_DSUBTYPE_CSInterface_ACM,

 
                        .Capabilities           = 0x06,
                },
 
        .CDC2_Functional_Union =
                {
 
                        .Capabilities           = 0x06,
                },
 
        .CDC2_Functional_Union =
                {

-                       .Header                 = {.Size = sizeof(USB_Descriptor_CDC_FunctionalUnion_t), .Type = DTYPE_CSInterface},
-                       .Subtype                = 0x06,
+                       .Header                 = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = DTYPE_CSInterface},
+                       .Subtype                = CDC_DSUBTYPE_CSInterface_Union,

 
                        .MasterInterfaceNumber  = 2,
                        .SlaveInterfaceNumber   = 3,
 
                        .MasterInterfaceNumber  = 2,
                        .SlaveInterfaceNumber   = 3,