Make sure that long reads are aborted early if the connection times out while waiting...

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

diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index 38906cf..fdaba83 100644 (file)
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -86,7 +86,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
-       .CCI_Interface = \r
+       .CDC_CCI_Interface = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
@@ -134,7 +134,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .Data                   = {0x00, 0x01}\r
                },      \r
 \r
-       .ManagementEndpoint = \r
+       .CDC_ManagementEndpoint = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
@@ -144,7 +144,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .PollingIntervalMS      = 0x02\r
                },\r
 \r
-       .DCI_Interface = \r
+       .CDC_DCI_Interface = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
@@ -160,7 +160,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
-       .DataOutEndpoint = \r
+       .CDC_DataOutEndpoint = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
@@ -170,7 +170,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .PollingIntervalMS      = 0x00\r
                },\r
                \r
-       .DataInEndpoint = \r
+       .CDC_DataInEndpoint = \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r