diff options
Diffstat (limited to 'Demos/Device/KeyboardMouse/Descriptors.c')
| -rw-r--r-- | Demos/Device/KeyboardMouse/Descriptors.c | 170 |
1 files changed, 85 insertions, 85 deletions
diff --git a/Demos/Device/KeyboardMouse/Descriptors.c b/Demos/Device/KeyboardMouse/Descriptors.c index 39c1d4a2e..b5bc15ae6 100644 --- a/Demos/Device/KeyboardMouse/Descriptors.c +++ b/Demos/Device/KeyboardMouse/Descriptors.c @@ -120,24 +120,24 @@ USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] = */
USB_Descriptor_Device_t PROGMEM 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: 8,
+ .Endpoint0Size = 8,
- VendorID: 0x03EB,
- ProductID: 0x204D,
- ReleaseNumber: 0x0000,
+ .VendorID = 0x03EB,
+ .ProductID = 0x204D,
+ .ReleaseNumber = 0x0000,
- ManufacturerStrIndex: 0x01,
- ProductStrIndex: 0x02,
- SerialNumStrIndex: NO_DESCRIPTOR,
+ .ManufacturerStrIndex = 0x01,
+ .ProductStrIndex = 0x02,
+ .SerialNumStrIndex = NO_DESCRIPTOR,
- NumberOfConfigurations: 1
+ .NumberOfConfigurations = 1
};
/** Configuration descriptor structure. This descriptor, located in FLASH memory, describes the usage
@@ -147,103 +147,103 @@ USB_Descriptor_Device_t PROGMEM DeviceDescriptor = */
USB_Descriptor_Configuration_t PROGMEM 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)
},
- KeyboardInterface:
+ .KeyboardInterface =
{
- Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},
+ .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- InterfaceNumber: 0x00,
- AlternateSetting: 0x00,
+ .InterfaceNumber = 0x00,
+ .AlternateSetting = 0x00,
- TotalEndpoints: 2,
+ .TotalEndpoints = 2,
- Class: 0x03,
- SubClass: 0x01,
- Protocol: 0x01,
+ .Class = 0x03,
+ .SubClass = 0x01,
+ .Protocol = 0x01,
- InterfaceStrIndex: NO_DESCRIPTOR
+ .InterfaceStrIndex = NO_DESCRIPTOR
},
- KeyboardHID:
+ .KeyboardHID =
{
- Header: {Size: sizeof(USB_Descriptor_HID_t), Type: DTYPE_HID},
+ .Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
- HIDSpec: VERSION_BCD(01.11),
- CountryCode: 0x00,
- TotalHIDReports: 0x01,
- HIDReportType: DTYPE_Report,
- HIDReportLength: sizeof(KeyboardReport)
+ .HIDSpec = VERSION_BCD(01.11),
+ .CountryCode = 0x00,
+ .TotalHIDReports = 0x01,
+ .HIDReportType = DTYPE_Report,
+ .HIDReportLength = sizeof(KeyboardReport)
},
- KeyboardInEndpoint:
+ .KeyboardInEndpoint =
{
- 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 | KEYBOARD_IN_EPNUM),
- Attributes: EP_TYPE_INTERRUPT,
- EndpointSize: HID_EPSIZE,
- PollingIntervalMS: 0x02
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_IN_EPNUM),
+ .Attributes = EP_TYPE_INTERRUPT,
+ .EndpointSize = HID_EPSIZE,
+ .PollingIntervalMS = 0x02
},
- KeyboardOutEndpoint:
+ .KeyboardOutEndpoint =
{
- 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 | KEYBOARD_OUT_EPNUM),
- Attributes: EP_TYPE_INTERRUPT,
- EndpointSize: HID_EPSIZE,
- PollingIntervalMS: 0x02
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | KEYBOARD_OUT_EPNUM),
+ .Attributes = EP_TYPE_INTERRUPT,
+ .EndpointSize = HID_EPSIZE,
+ .PollingIntervalMS = 0x02
},
- MouseInterface:
+ .MouseInterface =
{
- Header: {Size: sizeof(USB_Descriptor_Interface_t), Type: DTYPE_Interface},
+ .Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
- InterfaceNumber: 0x01,
- AlternateSetting: 0x00,
+ .InterfaceNumber = 0x01,
+ .AlternateSetting = 0x00,
- TotalEndpoints: 1,
+ .TotalEndpoints = 1,
- Class: 0x03,
- SubClass: 0x01,
- Protocol: 0x02,
+ .Class = 0x03,
+ .SubClass = 0x01,
+ .Protocol = 0x02,
- InterfaceStrIndex: NO_DESCRIPTOR
+ .InterfaceStrIndex = NO_DESCRIPTOR
},
- MouseHID:
+ .MouseHID =
{
- Header: {Size: sizeof(USB_Descriptor_HID_t), Type: DTYPE_HID},
+ .Header = {.Size = sizeof(USB_Descriptor_HID_t), .Type = DTYPE_HID},
- HIDSpec: VERSION_BCD(01.11),
- CountryCode: 0x00,
- TotalHIDReports: 0x01,
- HIDReportType: DTYPE_Report,
- HIDReportLength: sizeof(MouseReport)
+ .HIDSpec = VERSION_BCD(01.11),
+ .CountryCode = 0x00,
+ .TotalHIDReports = 0x01,
+ .HIDReportType = DTYPE_Report,
+ .HIDReportLength = sizeof(MouseReport)
},
- MouseInEndpoint:
+ .MouseInEndpoint =
{
- 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 | MOUSE_IN_EPNUM),
- Attributes: EP_TYPE_INTERRUPT,
- EndpointSize: HID_EPSIZE,
- PollingIntervalMS: 0x02
+ .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | MOUSE_IN_EPNUM),
+ .Attributes = EP_TYPE_INTERRUPT,
+ .EndpointSize = HID_EPSIZE,
+ .PollingIntervalMS = 0x02
}
};
@@ -253,9 +253,9 @@ USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = */
USB_Descriptor_String_t PROGMEM 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}
};
/** Manufacturer descriptor string. This is a Unicode string containing the manufacturer's details in human readable
@@ -264,9 +264,9 @@ USB_Descriptor_String_t PROGMEM LanguageString = */
USB_Descriptor_String_t PROGMEM ManufacturerString =
{
- Header: {Size: USB_STRING_LEN(11), Type: DTYPE_String},
+ .Header = {.Size = USB_STRING_LEN(11), .Type = DTYPE_String},
- UnicodeString: L"Dean Camera"
+ .UnicodeString = L"Dean Camera"
};
/** Product descriptor string. This is a Unicode string containing the product's details in human readable form,
@@ -275,9 +275,9 @@ USB_Descriptor_String_t PROGMEM ManufacturerString = */
USB_Descriptor_String_t PROGMEM ProductString =
{
- Header: {Size: USB_STRING_LEN(28), Type: DTYPE_String},
+ .Header = {.Size = USB_STRING_LEN(28), .Type = DTYPE_String},
- UnicodeString: L"LUFA Mouse and Keyboard Demo"
+ .UnicodeString = L"LUFA Mouse and Keyboard Demo"
};
/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h
@@ -296,33 +296,33 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c switch (DescriptorType)
{
- case DTYPE_Device:
+ case DTYPE_Device:
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:
switch (DescriptorNumber)
{
- case 0x00:
+ case 0x00:
Address = DESCRIPTOR_ADDRESS(LanguageString);
Size = pgm_read_byte(&LanguageString.Header.Size);
break;
- case 0x01:
+ case 0x01:
Address = DESCRIPTOR_ADDRESS(ManufacturerString);
Size = pgm_read_byte(&ManufacturerString.Header.Size);
break;
- case 0x02:
+ case 0x02:
Address = DESCRIPTOR_ADDRESS(ProductString);
Size = pgm_read_byte(&ProductString.Header.Size);
break;
}
break;
- case DTYPE_HID:
+ case DTYPE_HID:
if (!(wIndex))
{
Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID);
@@ -334,7 +334,7 @@ uint16_t USB_GetDescriptor(const uint16_t wValue, const uint8_t wIndex, void** c Size = sizeof(USB_Descriptor_HID_t);
}
break;
- case DTYPE_Report:
+ case DTYPE_Report:
if (!(wIndex))
{
Address = DESCRIPTOR_ADDRESS(KeyboardReport);
|