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/Device/CDC/CDC.c | 22 +++--- Demos/Device/CDC/Descriptors.c | 168 ++++++++++++++++++++--------------------- 2 files changed, 95 insertions(+), 95 deletions(-) (limited to 'Demos/Device/CDC') diff --git a/Demos/Device/CDC/CDC.c b/Demos/Device/CDC/CDC.c index 29bc00373..4c51fc6b7 100644 --- a/Demos/Device/CDC/CDC.c +++ b/Demos/Device/CDC/CDC.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: CDC_Task , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = CDC_Task , .TaskStatus = TASK_STOP }, }; /* Globals: */ @@ -52,10 +52,10 @@ TASK_LIST * It is possible to completely ignore these value or use other settings as the host is completely unaware of the physical * serial link characteristics and instead sends and receives data in endpoint streams. */ -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 }; /** String to print through the virtual serial port when the joystick is pressed upwards. */ char JoystickUpString[] = "Joystick Up\r\n"; @@ -256,11 +256,11 @@ TASK(CDC_Task) */ USB_Notification_Header_t Notification = (USB_Notification_Header_t) { - NotificationType: (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), - Notification: NOTIF_SerialState, - wValue: 0, - wIndex: 0, - wLength: sizeof(uint16_t), + .NotificationType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), + .Notification = NOTIF_SerialState, + .wValue = 0, + .wIndex = 0, + .wLength = sizeof(uint16_t), }; uint16_t LineStateMask; diff --git a/Demos/Device/CDC/Descriptors.c b/Demos/Device/CDC/Descriptors.c index 869dc5deb..41b6e4d22 100644 --- a/Demos/Device/CDC/Descriptors.c +++ b/Demos/Device/CDC/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: 0x02, - SubClass: 0x00, - Protocol: 0x00, + .USBSpecification = VERSION_BCD(01.10), + .Class = 0x02, + .SubClass = 0x00, + .Protocol = 0x00, - Endpoint0Size: 8, + .Endpoint0Size = 8, - VendorID: 0x03EB, - ProductID: 0x2044, - ReleaseNumber: 0x0000, + .VendorID = 0x03EB, + .ProductID = 0x2044, + .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,113 +71,113 @@ 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) }, - 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: {0x01, 0x10} + .Data = {0x01, 0x10} }, - 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: 0xFF + .EndpointAddress = (ENDPOINT_DESCRIPTOR_DIR_IN | CDC_NOTIFICATION_EPNUM), + .Attributes = EP_TYPE_INTERRUPT, + .EndpointSize = CDC_NOTIFICATION_EPSIZE, + .PollingIntervalMS = 0xFF }, - 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 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 @@ -198,9 +198,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, @@ -209,9 +209,9 @@ USB_Descriptor_String_t PROGMEM ManufacturerString = */ USB_Descriptor_String_t PROGMEM ProductString = { - Header: {Size: USB_STRING_LEN(13), Type: DTYPE_String}, + .Header = {.Size = USB_STRING_LEN(13), .Type = DTYPE_String}, - UnicodeString: L"LUFA CDC Demo" + .UnicodeString = L"LUFA CDC Demo" }; /** This function is called by the library when in device mode, and must be overridden (see StdDescriptors.h @@ -234,22 +234,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; -- cgit v1.2.3