Don't cast the line encoding baud rate to a uint16_t before performing the baud rate...

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

diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index 38906cf..110c14b 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
                        .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
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r


@@ -110,14 +110,6 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .Data                   = {0x10, 0x01}\r
                },\r
 \r
                        .Data                   = {0x10, 0x01}\r
                },\r
 \r

-       .CDC_Functional_CallManagement = \r
-               {\r
-                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
-                       .SubType                = 0x01,\r
-                       \r
-                       .Data                   = {0x03, 0x01}\r
-               },\r
-\r

        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
        .CDC_Functional_AbstractControlManagement = \r
                {\r
                        .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r


@@ -134,7 +126,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .Data                   = {0x00, 0x01}\r
                },      \r
 \r
                        .Data                   = {0x00, 0x01}\r
                },      \r
 \r

-       .ManagementEndpoint = \r
+       .CDC_ManagementEndpoint = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r


@@ -144,7 +136,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .PollingIntervalMS      = 0x02\r
                },\r
 \r
                        .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
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r


@@ -160,7 +152,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
                        .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r

-       .DataOutEndpoint = \r
+       .CDC_DataOutEndpoint = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r


@@ -170,7 +162,7 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
                        .PollingIntervalMS      = 0x00\r
                },\r
                \r
                        .PollingIntervalMS      = 0x00\r
                },\r
                \r

-       .DataInEndpoint = \r
+       .CDC_DataInEndpoint = \r

                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                {\r
                        .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r