From 37b2130fb2767a39f3d95414c6aca75a67c26298 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Mon, 20 Apr 2009 11:21:36 +0000 Subject: Changed over all deprecated GCC structure tag initializers to the standardized C99 format (thanks to Mike Alexander). --- Demos/OTG/TestApp/Descriptors.c | 84 ++++++++++++++++++++--------------------- Demos/OTG/TestApp/TestApp.c | 8 ++-- 2 files changed, 46 insertions(+), 46 deletions(-) (limited to 'Demos/OTG/TestApp') diff --git a/Demos/OTG/TestApp/Descriptors.c b/Demos/OTG/TestApp/Descriptors.c index d5155678b..caf6c9107 100644 --- a/Demos/OTG/TestApp/Descriptors.c +++ b/Demos/OTG/TestApp/Descriptors.c @@ -44,24 +44,24 @@ */ 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: 0x2040, - ReleaseNumber: 0x0000, + .VendorID = 0x03EB, + .ProductID = 0x2040, + .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 @@ -71,37 +71,37 @@ 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_Header_t) - + sizeof(USB_Descriptor_Interface_t) ), + .TotalConfigurationSize = ( sizeof(USB_Descriptor_Configuration_Header_t) + + sizeof(USB_Descriptor_Interface_t) ), - TotalInterfaces: 1, + .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: 1, - AlternateSetting: 0, + .InterfaceNumber = 1, + .AlternateSetting = 0, - TotalEndpoints: 0, + .TotalEndpoints = 0, - Class: 0xFF, - SubClass: 0x00, - Protocol: 0x00, + .Class = 0xFF, + .SubClass = 0x00, + .Protocol = 0x00, - InterfaceStrIndex: NO_DESCRIPTOR + .InterfaceStrIndex = NO_DESCRIPTOR }, }; @@ -111,9 +111,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 @@ -122,9 +122,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, @@ -133,9 +133,9 @@ USB_Descriptor_String_t PROGMEM ManufacturerString = */ USB_Descriptor_String_t PROGMEM ProductString = { - Header: {Size: USB_STRING_LEN(9), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(9), .Type = DTYPE_String}, - UnicodeString: L"LUFA Demo" + .UnicodeString = L"LUFA Demo" }; /** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h @@ -158,22 +158,22 @@ 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: 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; diff --git a/Demos/OTG/TestApp/TestApp.c b/Demos/OTG/TestApp/TestApp.c index d5a752322..8c8a23ffc 100644 --- a/Demos/OTG/TestApp/TestApp.c +++ b/Demos/OTG/TestApp/TestApp.c @@ -39,10 +39,10 @@ /* Scheduler Task List */ TASK_LIST { - { Task: TestApp_CheckJoystick, TaskStatus: TASK_RUN }, - { Task: TestApp_CheckHWB , TaskStatus: TASK_RUN }, - { Task: TestApp_CheckTemp , TaskStatus: TASK_RUN }, - { Task: USB_USBTask , TaskStatus: TASK_RUN }, + { .Task = TestApp_CheckJoystick, .TaskStatus = TASK_RUN }, + { .Task = TestApp_CheckHWB , .TaskStatus = TASK_RUN }, + { .Task = TestApp_CheckTemp , .TaskStatus = TASK_RUN }, + { .Task = USB_USBTask , .TaskStatus = TASK_RUN }, }; /** Main program entry point. This routine configures the hardware required by the application, then -- cgit v1.2.3