Oops: Really disable building of Projects/Host/ClassDriver directory in the Projects...

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

diff --git a/Demos/Device/LowLevel/DualCDC/Descriptors.c b/Demos/Device/LowLevel/DualCDC/Descriptors.c
index d3710c1..a7f7b03 100644 (file)
--- a/Demos/Device/LowLevel/DualCDC/Descriptors.c
+++ b/Demos/Device/LowLevel/DualCDC/Descriptors.c
@@ -61,7 +61,7 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor =
        .ProductStrIndex        = 0x02,\r
        .SerialNumStrIndex      = USE_INTERNAL_SERIAL,\r
                \r
        .ProductStrIndex        = 0x02,\r
        .SerialNumStrIndex      = USE_INTERNAL_SERIAL,\r
                \r

-       .NumberOfConfigurations = 1\r
+       .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r

 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage\r


@@ -153,7 +153,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC1_NOTIFICATION_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC1_NOTIFICATION_EPNUM),\r

-                       .Attributes             = EP_TYPE_INTERRUPT,\r
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = CDC_NOTIFICATION_EPSIZE,\r
                        .PollingIntervalMS      = 0xFF\r
                },\r
                        .EndpointSize           = CDC_NOTIFICATION_EPSIZE,\r
                        .PollingIntervalMS      = 0xFF\r
                },\r


@@ -179,7 +179,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC1_RX_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC1_RX_EPNUM),\r

-                       .Attributes             = EP_TYPE_BULK,\r
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                },\r
                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                },\r


@@ -189,7 +189,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC1_TX_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC1_TX_EPNUM),\r

-                       .Attributes             = EP_TYPE_BULK,\r
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                },\r
                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                },\r


@@ -261,7 +261,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC2_NOTIFICATION_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC2_NOTIFICATION_EPNUM),\r

-                       .Attributes             = EP_TYPE_INTERRUPT,\r
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = CDC_NOTIFICATION_EPSIZE,\r
                        .PollingIntervalMS      = 0xFF\r
                },\r
                        .EndpointSize           = CDC_NOTIFICATION_EPSIZE,\r
                        .PollingIntervalMS      = 0xFF\r
                },\r


@@ -287,7 +287,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC2_RX_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC2_RX_EPNUM),\r

-                       .Attributes             = EP_TYPE_BULK,\r
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                },\r
                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                },\r


@@ -297,7 +297,7 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor =
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC2_TX_EPNUM),\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                        .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC2_TX_EPNUM),\r

-                       .Attributes             = EP_TYPE_BULK,\r
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r

                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                }\r
                        .EndpointSize           = CDC_TXRX_EPSIZE,\r
                        .PollingIntervalMS      = 0x00\r
                }\r