X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/6933f2e1a543b066ebe734bd126a7ff2f1c2777f..526e398986583e2fb65c0a36a2fbf2ce153446e5:/Demos/Device/Keyboard/Descriptors.c diff --git a/Demos/Device/Keyboard/Descriptors.c b/Demos/Device/Keyboard/Descriptors.c index 722b65818..69300eb9b 100644 --- a/Demos/Device/Keyboard/Descriptors.c +++ b/Demos/Device/Keyboard/Descriptors.c @@ -87,24 +87,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 = FIXED_CONTROL_ENDPOINT_SIZE, - VendorID: 0x03EB, - ProductID: 0x2042, - ReleaseNumber: 0x0000, + .VendorID = 0x03EB, + .ProductID = 0x2042, + .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 @@ -114,66 +114,66 @@ 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: 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) }, - Interface: + .Interface = { - 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) }, - KeyboardEndpoint: + .KeyboardEndpoint = { - 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_EPNUM), - Attributes: EP_TYPE_INTERRUPT, - EndpointSize: KEYBOARD_EPSIZE, - PollingIntervalMS: 0x04 + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | KEYBOARD_EPNUM), + .Attributes = EP_TYPE_INTERRUPT, + .EndpointSize = KEYBOARD_EPSIZE, + .PollingIntervalMS = 0x04 }, - KeyboardLEDsEndpoint: + .KeyboardLEDsEndpoint = { - 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_LEDS_EPNUM), - Attributes: EP_TYPE_INTERRUPT, - EndpointSize: KEYBOARD_EPSIZE, - PollingIntervalMS: 0x04 + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_OUT | KEYBOARD_LEDS_EPNUM), + .Attributes = EP_TYPE_INTERRUPT, + .EndpointSize = KEYBOARD_EPSIZE, + .PollingIntervalMS = 0x04 } }; @@ -183,9 +183,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 @@ -194,9 +194,9 @@ USB_Descriptor_String_t PROGMEM LanguageString = */ USB_Descriptor_String_t PROGMEM ManufacturerString = { - Header: {Size: USB_STRING_LEN(16), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(16), .Type = DTYPE_String}, - UnicodeString: L"Denver Gingerich" + .UnicodeString = L"Denver Gingerich" }; /** Product descriptor string. This is a Unicode string containing the product's details in human readable form, @@ -205,12 +205,12 @@ USB_Descriptor_String_t PROGMEM ManufacturerString = */ USB_Descriptor_String_t PROGMEM ProductString = { - Header: {Size: USB_STRING_LEN(18), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(18), .Type = DTYPE_String}, - UnicodeString: L"LUFA Keyboard Demo" + .UnicodeString = L"LUFA Keyboard Demo" }; -/** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h +/** This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors" * documentation) by the application code so that the address and size of a requested descriptor can be given * to the USB library. When the device receives a Get Descriptor request on the control endpoint, this function * is called so that the descriptor details can be passed back and the appropriate descriptor sent back to the @@ -226,37 +226,37 @@ 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: Address = DESCRIPTOR_ADDRESS(ConfigurationDescriptor.KeyboardHID); Size = sizeof(USB_Descriptor_HID_t); break; - case DTYPE_Report: + case DTYPE_Report: Address = DESCRIPTOR_ADDRESS(KeyboardReport); Size = sizeof(KeyboardReport); break;