diff options
Diffstat (limited to 'Bootloaders/DFU/Descriptors.c')
-rw-r--r-- | Bootloaders/DFU/Descriptors.c | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/Bootloaders/DFU/Descriptors.c b/Bootloaders/DFU/Descriptors.c index 1313118c9..3e8978a92 100644 --- a/Bootloaders/DFU/Descriptors.c +++ b/Bootloaders/DFU/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: 0x00,
- SubClass: 0x00,
- Protocol: 0x00,
+ .USBSpecification = VERSION_BCD(01.10),
+ .Class = 0x00,
+ .SubClass = 0x00,
+ .Protocol = 0x00,
- Endpoint0Size: FIXED_CONTROL_ENDPOINT_SIZE,
+ .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
- VendorID: 0x03EB,
- ProductID: PRODUCT_ID_CODE,
- ReleaseNumber: 0x0000,
+ .VendorID = 0x03EB,
+ .ProductID = PRODUCT_ID_CODE,
+ .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 FLASH memory, describes the usage
@@ -71,47 +71,47 @@ 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: 1,
+ .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
+ .TotalInterfaces = 1,
- 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)
},
- DFUInterface:
+ .DFUInterface =
{
- 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: 0,
+ .TotalEndpoints = 0,
- Class: 0xFE,
- SubClass: 0x01,
- Protocol: 0x02,
+ .Class = 0xFE,
+ .SubClass = 0x01,
+ .Protocol = 0x02,
- InterfaceStrIndex: NO_DESCRIPTOR
+ .InterfaceStrIndex = NO_DESCRIPTOR
},
- DFUFunctional:
+ .DFUFunctional =
{
- Header: {Size: sizeof(USB_DFU_Functional_Descriptor_t), Type: DTYPE_DFUFunctional},
+ .Header = {.Size = sizeof(USB_DFU_Functional_Descriptor_t), .Type = DTYPE_DFUFunctional},
- Attributes: (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD),
+ .Attributes = (ATTR_CAN_UPLOAD | ATTR_CAN_DOWNLOAD),
- DetatchTimeout: 0x0000,
- TransferSize: 0x0c00,
+ .DetatchTimeout = 0x0000,
+ .TransferSize = 0x0c00,
- DFUSpecification: VERSION_BCD(01.01)
+ .DFUSpecification = VERSION_BCD(01.01)
}
};
@@ -121,9 +121,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,
@@ -132,9 +132,9 @@ USB_Descriptor_String_t LanguageString = */
USB_Descriptor_String_t ProductString =
{
- Header: {Size: USB_STRING_LEN(18), Type: DTYPE_String},
+ .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String},
- UnicodeString: L"AVR DFU Bootloader"
+ .UnicodeString = L"AVR DFU Bootloader"
};
/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h
@@ -157,11 +157,11 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c Address = DESCRIPTOR_ADDRESS(DeviceDescriptor);
Size = sizeof(USB_Descriptor_Device_t);
break;
- case DTYPE_Configuration:
+ case DTYPE_Configuration:
Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor);
Size = sizeof(USB_Descriptor_Configuration_t);
break;
- case DTYPE_String:
+ case DTYPE_String:
if (!(DescriptorNumber))
{
Address = DESCRIPTOR_ADDRESS(LanguageString);
|