projects / pub / USBasp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove serial driver use from the AVRISP project now that it is no longer needed.
[pub/USBasp.git] / Bootloaders / CDC / Descriptors.c
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c
index bfa66a7..e97b9d4 100644 (file)
--- a/Bootloaders/CDC/Descriptors.c
+++ b/Bootloaders/CDC/Descriptors.c
@@ -44,24 +44,24 @@
  */\r
 USB_Descriptor_Device_t DeviceDescriptor =\r
 {\r
  */\r
 USB_Descriptor_Device_t DeviceDescriptor =\r
 {\r
-       Header:                 {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device},\r
+       .Header                 = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},\r
                \r
                \r
-       USBSpecification:       VERSION_BCD(01.10),\r
-       Class:                  0x02,\r
-       SubClass:               0x00,\r
-       Protocol:               0x00,\r
+       .USBSpecification       = VERSION_BCD(01.10),\r
+       .Class                  = 0x02,\r
+       .SubClass               = 0x00,\r
+       .Protocol               = 0x00,\r
                                \r
                                \r
-       Endpoint0Size:          FIXED_CONTROL_ENDPOINT_SIZE,\r
+       .Endpoint0Size          = FIXED_CONTROL_ENDPOINT_SIZE,\r
                \r
                \r
-       VendorID:               0x03EB,\r
-       ProductID:              0x204A,\r
-       ReleaseNumber:          0x0000,\r
+       .VendorID               = 0x03EB,\r
+       .ProductID              = 0x204A,\r
+       .ReleaseNumber          = 0x0000,\r
                \r
                \r
-       ManufacturerStrIndex:   NO_DESCRIPTOR,\r
-       ProductStrIndex:        0x01,\r
-       SerialNumStrIndex:      NO_DESCRIPTOR,\r
+       .ManufacturerStrIndex   = NO_DESCRIPTOR,\r
+       .ProductStrIndex        = 0x01,\r
+       .SerialNumStrIndex      = NO_DESCRIPTOR,\r
                \r
                \r
-       NumberOfConfigurations: 1\r
+       .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in SRAM memory, describes the usage\r
 };\r
 \r
 /** Configuration descriptor structure. This descriptor, located in SRAM memory, describes the usage\r
@@ -71,113 +71,113 @@ USB_Descriptor_Device_t DeviceDescriptor =
  */\r
 USB_Descriptor_Configuration_t ConfigurationDescriptor =\r
 {\r
  */\r
 USB_Descriptor_Configuration_t ConfigurationDescriptor =\r
 {\r
-       Config:\r
+       .Config = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},\r
 \r
 \r
-                       TotalConfigurationSize: sizeof(USB_Descriptor_Configuration_t),\r
-                       TotalInterfaces:        2,\r
+                       .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),\r
+                       .TotalInterfaces        = 2,\r
                                \r
                                \r
-                       ConfigurationNumber:    1,\r
-                       ConfigurationStrIndex:  NO_DESCRIPTOR,\r
+                       .ConfigurationNumber    = 1,\r
+                       .ConfigurationStrIndex  = NO_DESCRIPTOR,\r
                                \r
                                \r
-                       ConfigAttributes:       (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),\r
+                       .ConfigAttributes       = USB_CONFIG_ATTR_BUSPOWERED,\r
                        \r
                        \r
-                       MaxPowerConsumption:    USB_CONFIG_POWER_MA(100)\r
+                       .MaxPowerConsumption    = USB_CONFIG_POWER_MA(100)\r
                },\r
                \r
                },\r
                \r
-       CCI_Interface:\r
+       .CCI_Interface = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
 \r
-                       InterfaceNumber:        0,\r
-                       AlternateSetting:       0,\r
+                       .InterfaceNumber        = 0,\r
+                       .AlternateSetting       = 0,\r
                        \r
                        \r
-                       TotalEndpoints:         1,\r
+                       .TotalEndpoints         = 1,\r
                                \r
                                \r
-                       Class:                  0x02,\r
-                       SubClass:               0x02,\r
-                       Protocol:               0x01,\r
+                       .Class                  = 0x02,\r
+                       .SubClass               = 0x02,\r
+                       .Protocol               = 0x01,\r
                                \r
                                \r
-                       InterfaceStrIndex:      NO_DESCRIPTOR\r
+                       .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
                },\r
 \r
-       CDC_Functional_IntHeader:\r
+       .CDC_Functional_IntHeader = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},\r
-                       SubType:                0x00,\r
+                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
+                       .SubType                = 0x00,\r
                        \r
                        \r
-                       Data:                   {0x10, 0x01}\r
+                       .Data                   = {0x10, 0x01}\r
                },\r
 \r
                },\r
 \r
-       CDC_Functional_CallManagement:\r
+       .CDC_Functional_CallManagement = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},\r
-                       SubType:                0x01,\r
+                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
+                       .SubType                = 0x01,\r
                        \r
                        \r
-                       Data:                   {0x03, 0x01}\r
+                       .Data                   = {0x03, 0x01}\r
                },\r
 \r
                },\r
 \r
-       CDC_Functional_AbstractControlManagement:\r
+       .CDC_Functional_AbstractControlManagement = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), Type: 0x24},\r
-                       SubType:                0x02,\r
+                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},\r
+                       .SubType                = 0x02,\r
                        \r
                        \r
-                       Data:                   {0x06}\r
+                       .Data                   = {0x06}\r
                },\r
                \r
                },\r
                \r
-       CDC_Functional_Union:\r
+       .CDC_Functional_Union = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},\r
-                       SubType:                0x06,\r
+                       .Header                 = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},\r
+                       .SubType                = 0x06,\r
                        \r
                        \r
-                       Data:                   {0x00, 0x01}\r
+                       .Data                   = {0x00, 0x01}\r
                },      \r
 \r
                },      \r
 \r
-       ManagementEndpoint:\r
+       .ManagementEndpoint = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                                                                                 \r
-                       EndpointAddress:        (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),\r
-                       Attributes:                     EP_TYPE_INTERRUPT,\r
-                       EndpointSize:           CDC_NOTIFICATION_EPSIZE,\r
-                       PollingIntervalMS:              0x02\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),\r
+                       .Attributes             = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+                       .EndpointSize           = CDC_NOTIFICATION_EPSIZE,\r
+                       .PollingIntervalMS      = 0x02\r
                },\r
 \r
                },\r
 \r
-       DCI_Interface:\r
+       .DCI_Interface = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},\r
 \r
 \r
-                       InterfaceNumber:        1,\r
-                       AlternateSetting:       0,\r
+                       .InterfaceNumber        = 1,\r
+                       .AlternateSetting       = 0,\r
                        \r
                        \r
-                       TotalEndpoints:         2,\r
+                       .TotalEndpoints         = 2,\r
                                \r
                                \r
-                       Class:                  0x0A,\r
-                       SubClass:               0x00,\r
-                       Protocol:               0x00,\r
+                       .Class                  = 0x0A,\r
+                       .SubClass               = 0x00,\r
+                       .Protocol               = 0x00,\r
                                \r
                                \r
-                       InterfaceStrIndex:      NO_DESCRIPTOR\r
+                       .InterfaceStrIndex      = NO_DESCRIPTOR\r
                },\r
 \r
                },\r
 \r
-       DataOutEndpoint:\r
+       .DataOutEndpoint = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                                                                                 \r
-                       EndpointAddress:        (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),\r
-                       Attributes:                     EP_TYPE_BULK,\r
-                       EndpointSize:           CDC_TXRX_EPSIZE,\r
-                       PollingIntervalMS:              0x00\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),\r
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+                       .EndpointSize           = CDC_TXRX_EPSIZE,\r
+                       .PollingIntervalMS      = 0x00\r
                },\r
                \r
                },\r
                \r
-       DataInEndpoint:\r
+       .DataInEndpoint = \r
                {\r
                {\r
-                       Header:                 {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},\r
+                       .Header                 = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},\r
                                                                                 \r
                                                                                 \r
-                       EndpointAddress:        (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),\r
-                       Attributes:                     EP_TYPE_BULK,\r
-                       EndpointSize:           CDC_TXRX_EPSIZE,\r
-                       PollingIntervalMS:              0x00\r
+                       .EndpointAddress        = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),\r
+                       .Attributes             = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),\r
+                       .EndpointSize           = CDC_TXRX_EPSIZE,\r
+                       .PollingIntervalMS      = 0x00\r
                }\r
 };\r
 \r
                }\r
 };\r
 \r
@@ -187,9 +187,9 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor =
  */\r
 USB_Descriptor_String_t LanguageString =\r
 {\r
  */\r
 USB_Descriptor_String_t LanguageString =\r
 {\r
-       Header:                 {Size: USB_STRING_LEN(1), Type: DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},\r
                \r
                \r
-       UnicodeString:          {LANGUAGE_ID_ENG}\r
+       .UnicodeString          = {LANGUAGE_ID_ENG}\r
 };\r
 \r
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,\r
 };\r
 \r
 /** Product descriptor string. This is a Unicode string containing the product's details in human readable form,\r
@@ -198,18 +198,18 @@ USB_Descriptor_String_t LanguageString =
  */\r
 USB_Descriptor_String_t ProductString =\r
 {\r
  */\r
 USB_Descriptor_String_t ProductString =\r
 {\r
-       Header:                 {Size: USB_STRING_LEN(15), Type: DTYPE_String},\r
+       .Header                 = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},\r
                \r
                \r
-       UnicodeString:          L"AVR CDC Bootloader"\r
+       .UnicodeString          = L"AVR CDC Bootloader"\r
 };\r
 \r
 };\r
 \r
-/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h\r
+/** This function is called by the library when in device mode, and must be overridden (see LUFA library "USB Descriptors"\r
  *  documentation) by the application code so that the address and size of a requested descriptor can be given\r
  *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function\r
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\r
  *  documentation) by the application code so that the address and size of a requested descriptor can be given\r
  *  to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function\r
  *  is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the\r
  *  USB host.\r
  */\r
-uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
+uint16_t CALLBACK_USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** const DescriptorAddress)\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r
 {\r
        const uint8_t  DescriptorType   = (wValue >> 8);\r
        const uint8_t  DescriptorNumber = (wValue & 0xFF);\r
@@ -220,22 +220,22 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r
        switch (DescriptorType)\r
        {\r
                case DTYPE_Device:\r
-                       Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);\r
+                       Address = (void*)&DeviceDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r
                        Size    = sizeof(USB_Descriptor_Device_t);\r
                        break;\r
                case DTYPE_Configuration:\r
-                       Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);\r
+                       Address = (void*)&ConfigurationDescriptor;\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        if (!(DescriptorNumber))\r
                        {\r
                        Size    = sizeof(USB_Descriptor_Configuration_t);\r
                        break;\r
                case DTYPE_String:\r
                        if (!(DescriptorNumber))\r
                        {\r
-                               Address = DESCRIPTOR_ADDRESS(LanguageString);\r
+                               Address = (void*)&LanguageString;\r
                                Size    = LanguageString.Header.Size;\r
                        }\r
                        else\r
                        {\r
                                Size    = LanguageString.Header.Size;\r
                        }\r
                        else\r
                        {\r
-                               Address = DESCRIPTOR_ADDRESS(ProductString);\r
+                               Address = (void*)&ProductString;\r
                                Size    = ProductString.Header.Size;\r
                        }\r
                        \r
                                Size    = ProductString.Header.Size;\r
                        }\r
                        \r
USB isp AVR programmer