diff options
Diffstat (limited to 'Bootloaders/CDC')
-rw-r--r-- | Bootloaders/CDC/BootloaderCDC.c | 8 | ||||
-rw-r--r-- | Bootloaders/CDC/Descriptors.c | 154 |
2 files changed, 81 insertions, 81 deletions
diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index cb2672c75..9cdb77695 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -43,10 +43,10 @@ * current encoding options, including baud rate, character format, parity mode and total number of
* bits in each data chunk.
*/
-CDC_Line_Coding_t LineCoding = { BaudRateBPS: 9600,
- CharFormat: OneStopBit,
- ParityType: Parity_None,
- DataBits: 8 };
+CDC_Line_Coding_t LineCoding = { .BaudRateBPS = 9600,
+ .CharFormat = OneStopBit,
+ .ParityType = Parity_None,
+ .DataBits = 8 };
/** Current address counter. This stores the current address of the FLASH or EEPROM as set by the host,
* and is used when reading or writing to the AVRs memory (either FLASH or EEPROM depending on the issued
diff --git a/Bootloaders/CDC/Descriptors.c b/Bootloaders/CDC/Descriptors.c index bfa66a738..e9787cf7f 100644 --- a/Bootloaders/CDC/Descriptors.c +++ b/Bootloaders/CDC/Descriptors.c @@ -44,24 +44,24 @@ */
USB_Descriptor_Device_t DeviceDescriptor =
{
- Header: {Size: sizeof(USB_Descriptor_Device_t), Type: DTYPE_Device},
+ .Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
- USBSpecification: VERSION_BCD(01.10),
- Class: 0x02,
- SubClass: 0x00,
- Protocol: 0x00,
+ .USBSpecification = VERSION_BCD(01.10),
+ .Class = 0x02,
+ .SubClass = 0x00,
+ .Protocol = 0x00,
- Endpoint0Size: FIXED_CONTROL_ENDPOINT_SIZE,
+ .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
- VendorID: 0x03EB,
- ProductID: 0x204A,
- ReleaseNumber: 0x0000,
+ .VendorID = 0x03EB,
+ .ProductID = 0x204A,
+ .ReleaseNumber = 0x0000,
- ManufacturerStrIndex: NO_DESCRIPTOR,
- ProductStrIndex: 0x01,
- SerialNumStrIndex: NO_DESCRIPTOR,
+ .ManufacturerStrIndex = NO_DESCRIPTOR,
+ .ProductStrIndex = 0x01,
+ .SerialNumStrIndex = NO_DESCRIPTOR,
- NumberOfConfigurations: 1
+ .NumberOfConfigurations = 1
};
/** Configuration descriptor structure. This descriptor, located in SRAM memory, describes the usage
@@ -71,113 +71,113 @@ USB_Descriptor_Device_t DeviceDescriptor = */
USB_Descriptor_Configuration_t ConfigurationDescriptor =
{
- Config:
+ .Config =
{
- Header: {Size: sizeof(USB_Descriptor_Configuration_Header_t), Type: DTYPE_Configuration},
+ .Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration},
- TotalConfigurationSize: sizeof(USB_Descriptor_Configuration_t),
- TotalInterfaces: 2,
+ .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
+ .TotalInterfaces = 2,
- ConfigurationNumber: 1,
- ConfigurationStrIndex: NO_DESCRIPTOR,
+ .ConfigurationNumber = 1,
+ .ConfigurationStrIndex = NO_DESCRIPTOR,
- ConfigAttributes: (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
+ .ConfigAttributes = (USB_CONFIG_ATTR_BUSPOWERED | USB_CONFIG_ATTR_SELFPOWERED),
- MaxPowerConsumption: USB_CONFIG_POWER_MA(100)
+ .MaxPowerConsumption = USB_CONFIG_POWER_MA(100)
},
- CCI_Interface:
+ .CCI_Interface =
{
- Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},
+ .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- InterfaceNumber: 0,
- AlternateSetting: 0,
+ .InterfaceNumber = 0,
+ .AlternateSetting = 0,
- TotalEndpoints: 1,
+ .TotalEndpoints = 1,
- Class: 0x02,
- SubClass: 0x02,
- Protocol: 0x01,
+ .Class = 0x02,
+ .SubClass = 0x02,
+ .Protocol = 0x01,
- InterfaceStrIndex: NO_DESCRIPTOR
+ .InterfaceStrIndex = NO_DESCRIPTOR
},
- CDC_Functional_IntHeader:
+ .CDC_Functional_IntHeader =
{
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},
- SubType: 0x00,
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+ .SubType = 0x00,
- Data: {0x10, 0x01}
+ .Data = {0x10, 0x01}
},
- CDC_Functional_CallManagement:
+ .CDC_Functional_CallManagement =
{
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},
- SubType: 0x01,
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+ .SubType = 0x01,
- Data: {0x03, 0x01}
+ .Data = {0x03, 0x01}
},
- CDC_Functional_AbstractControlManagement:
+ .CDC_Functional_AbstractControlManagement =
{
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), Type: 0x24},
- SubType: 0x02,
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(1)), .Type = 0x24},
+ .SubType = 0x02,
- Data: {0x06}
+ .Data = {0x06}
},
- CDC_Functional_Union:
+ .CDC_Functional_Union =
{
- Header: {Size: sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), Type: 0x24},
- SubType: 0x06,
+ .Header = {.Size = sizeof(CDC_FUNCTIONAL_DESCRIPTOR(2)), .Type = 0x24},
+ .SubType = 0x06,
- Data: {0x00, 0x01}
+ .Data = {0x00, 0x01}
},
- ManagementEndpoint:
+ .ManagementEndpoint =
{
- Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
- EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),
- Attributes: EP_TYPE_INTERRUPT,
- EndpointSize: CDC_NOTIFICATION_EPSIZE,
- PollingIntervalMS: 0x02
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM),
+ .Attributes = EP_TYPE_INTERRUPT,
+ .EndpointSize = CDC_NOTIFICATION_EPSIZE,
+ .PollingIntervalMS = 0x02
},
- DCI_Interface:
+ .DCI_Interface =
{
- Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},
+ .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- InterfaceNumber: 1,
- AlternateSetting: 0,
+ .InterfaceNumber = 1,
+ .AlternateSetting = 0,
- TotalEndpoints: 2,
+ .TotalEndpoints = 2,
- Class: 0x0A,
- SubClass: 0x00,
- Protocol: 0x00,
+ .Class = 0x0A,
+ .SubClass = 0x00,
+ .Protocol = 0x00,
- InterfaceStrIndex: NO_DESCRIPTOR
+ .InterfaceStrIndex = NO_DESCRIPTOR
},
- DataOutEndpoint:
+ .DataOutEndpoint =
{
- Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
- EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),
- Attributes: EP_TYPE_BULK,
- EndpointSize: CDC_TXRX_EPSIZE,
- PollingIntervalMS: 0x00
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | CDC_RX_EPNUM),
+ .Attributes = EP_TYPE_BULK,
+ .EndpointSize = CDC_TXRX_EPSIZE,
+ .PollingIntervalMS = 0x00
},
- DataInEndpoint:
+ .DataInEndpoint =
{
- Header: {Size: sizeof(USB_Descriptor_Endpoint_t), Type: DTYPE_Endpoint},
+ .Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint},
- EndpointAddress: (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),
- Attributes: EP_TYPE_BULK,
- EndpointSize: CDC_TXRX_EPSIZE,
- PollingIntervalMS: 0x00
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_TX_EPNUM),
+ .Attributes = EP_TYPE_BULK,
+ .EndpointSize = CDC_TXRX_EPSIZE,
+ .PollingIntervalMS = 0x00
}
};
@@ -187,9 +187,9 @@ USB_Descriptor_Configuration_t ConfigurationDescriptor = */
USB_Descriptor_String_t LanguageString =
{
- Header: {Size: USB_STRING_LEN(1), Type: DTYPE_String},
+ .Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String},
- UnicodeString: {LANGUAGE_ID_ENG}
+ .UnicodeString = {LANGUAGE_ID_ENG}
};
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
@@ -198,9 +198,9 @@ USB_Descriptor_String_t LanguageString = */
USB_Descriptor_String_t ProductString =
{
- Header: {Size: USB_STRING_LEN(15), Type: DTYPE_String},
+ .Header = {.Size = USB_STRING_LEN(15), .Type = DTYPE_String},
- UnicodeString: L"AVR CDC Bootloader"
+ .UnicodeString = L"AVR CDC Bootloader"
};
/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h
|