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/Host/CDCHost/CDCHost.c | 14 +-- Demos/Host/GenericHIDHost/GenericHIDHost.c | 24 ++-- Demos/Host/KeyboardHost/KeyboardHost.c | 24 ++-- Demos/Host/KeyboardHostWithParser/HIDReport.c | 10 +- .../KeyboardHostWithParser.c | 14 +-- Demos/Host/MassStorageHost/MassStorageHost.c | 14 +-- Demos/Host/MassStorageHost/MassStoreCommands.c | 126 ++++++++++----------- Demos/Host/MouseHost/MouseHost.c | 24 ++-- Demos/Host/MouseHostWithParser/HIDReport.c | 10 +- .../Host/MouseHostWithParser/MouseHostWithParser.c | 14 +-- Demos/Host/StillImageHost/StillImageCommands.c | 10 +- Demos/Host/StillImageHost/StillImageHost.c | 44 +++---- 12 files changed, 164 insertions(+), 164 deletions(-) (limited to 'Demos/Host') diff --git a/Demos/Host/CDCHost/CDCHost.c b/Demos/Host/CDCHost/CDCHost.c index 80d993953..aa999645a 100644 --- a/Demos/Host/CDCHost/CDCHost.c +++ b/Demos/Host/CDCHost/CDCHost.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_CDC_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_CDC_Host , .TaskStatus = TASK_STOP }, }; @@ -183,11 +183,11 @@ TASK(USB_CDC_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/GenericHIDHost/GenericHIDHost.c b/Demos/Host/GenericHIDHost/GenericHIDHost.c index b047841f6..f0d196768 100644 --- a/Demos/Host/GenericHIDHost/GenericHIDHost.c +++ b/Demos/Host/GenericHIDHost/GenericHIDHost.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_HID_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_HID_Host , .TaskStatus = TASK_STOP }, }; @@ -259,11 +259,11 @@ void WriteNextReport(uint8_t* ReportOUTData, uint8_t ReportIndex, uint8_t Report /* Class specific request to send a HID report to the device */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), - bRequest: REQ_SetReport, - wValue: ((ReportType << 8) | ReportIndex), - wIndex: 0, - wLength: ReportLength, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), + .bRequest = REQ_SetReport, + .wValue = ((ReportType << 8) | ReportIndex), + .wIndex = 0, + .wLength = ReportLength, }; /* Select the control pipe for the request transfer */ @@ -288,11 +288,11 @@ TASK(USB_HID_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/KeyboardHost/KeyboardHost.c b/Demos/Host/KeyboardHost/KeyboardHost.c index 35055ca79..bc75bd3f3 100644 --- a/Demos/Host/KeyboardHost/KeyboardHost.c +++ b/Demos/Host/KeyboardHost/KeyboardHost.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_Keyboard_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_Keyboard_Host , .TaskStatus = TASK_STOP }, }; @@ -255,11 +255,11 @@ TASK(USB_Keyboard_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ @@ -305,11 +305,11 @@ TASK(USB_Keyboard_Host) /* HID class request to set the keyboard protocol to the Boot Protocol */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), - bRequest: REQ_SetProtocol, - wValue: 0, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), + .bRequest = REQ_SetProtocol, + .wValue = 0, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/KeyboardHostWithParser/HIDReport.c b/Demos/Host/KeyboardHostWithParser/HIDReport.c index b985a45fe..14b803840 100644 --- a/Demos/Host/KeyboardHostWithParser/HIDReport.c +++ b/Demos/Host/KeyboardHostWithParser/HIDReport.c @@ -49,11 +49,11 @@ uint8_t GetHIDReportData(void) USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE), - bRequest: REQ_GetDescriptor, - wValue: (DTYPE_Report << 8), - wIndex: 0, - wLength: HIDReportSize, + .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE), + .bRequest = REQ_GetDescriptor, + .wValue = (DTYPE_Report << 8), + .wIndex = 0, + .wLength = HIDReportSize, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c index ff4ae75c8..76ad5f258 100644 --- a/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c +++ b/Demos/Host/KeyboardHostWithParser/KeyboardHostWithParser.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_Keyboard_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_Keyboard_Host , .TaskStatus = TASK_STOP }, }; @@ -186,11 +186,11 @@ TASK(USB_Keyboard_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/MassStorageHost/MassStorageHost.c b/Demos/Host/MassStorageHost/MassStorageHost.c index 1c56e6eed..9352562de 100644 --- a/Demos/Host/MassStorageHost/MassStorageHost.c +++ b/Demos/Host/MassStorageHost/MassStorageHost.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_MassStore_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_MassStore_Host , .TaskStatus = TASK_STOP }, }; /* Globals */ @@ -157,11 +157,11 @@ TASK(USB_MassStore_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/MassStorageHost/MassStoreCommands.c b/Demos/Host/MassStorageHost/MassStoreCommands.c index 41c59dc43..864edf30c 100644 --- a/Demos/Host/MassStorageHost/MassStoreCommands.c +++ b/Demos/Host/MassStorageHost/MassStoreCommands.c @@ -252,11 +252,11 @@ uint8_t MassStore_ClearPipeStall(const uint8_t EndpointNum) { USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT), - bRequest: REQ_ClearFeature, - wValue: FEATURE_ENDPOINT_HALT, - wIndex: EndpointNum, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT), + .bRequest = REQ_ClearFeature, + .wValue = FEATURE_ENDPOINT_HALT, + .wIndex = EndpointNum, + .wLength = 0, }; /* Select the control pipe for the request transfer */ @@ -274,11 +274,11 @@ uint8_t MassStore_MassStorageReset(void) { USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), - bRequest: REQ_MassStorageReset, - wValue: 0, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), + .bRequest = REQ_MassStorageReset, + .wValue = 0, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ @@ -300,11 +300,11 @@ uint8_t MassStore_GetMaxLUN(uint8_t* const MaxLUNIndex) USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), - bRequest: REQ_GetMaxLUN, - wValue: 0, - wIndex: 0, - wLength: 1, + .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_CLASS | REQREC_INTERFACE), + .bRequest = REQ_GetMaxLUN, + .wValue = 0, + .wIndex = 0, + .wLength = 1, }; /* Select the control pipe for the request transfer */ @@ -337,17 +337,17 @@ uint8_t MassStore_RequestSense(const uint8_t LUNIndex, const SCSI_Request_Sense_ /* Create a CBW with a SCSI command to issue REQUEST SENSE command */ SCSICommandBlock = (CommandBlockWrapper_t) { - Header: + .Header = { - Signature: CBW_SIGNATURE, - Tag: MassStore_Tag, - DataTransferLength: sizeof(SCSI_Request_Sense_Response_t), - Flags: COMMAND_DIRECTION_DATA_IN, - LUN: LUNIndex, - SCSICommandLength: 6 + .Signature = CBW_SIGNATURE, + .Tag = MassStore_Tag, + .DataTransferLength = sizeof(SCSI_Request_Sense_Response_t), + .Flags = COMMAND_DIRECTION_DATA_IN, + .LUN = LUNIndex, + .SCSICommandLength = 6 }, - SCSICommandData: + .SCSICommandData = { SCSI_CMD_REQUEST_SENSE, 0x00, // Reserved @@ -404,17 +404,17 @@ uint8_t MassStore_ReadDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockAd /* Create a CBW with a SCSI command to read in the given blocks from the device */ SCSICommandBlock = (CommandBlockWrapper_t) { - Header: + .Header = { - Signature: CBW_SIGNATURE, - Tag: MassStore_Tag, - DataTransferLength: ((uint32_t)Blocks * BlockSize), - Flags: COMMAND_DIRECTION_DATA_IN, - LUN: LUNIndex, - SCSICommandLength: 10 + .Signature = CBW_SIGNATURE, + .Tag = MassStore_Tag, + .DataTransferLength = ((uint32_t)Blocks * BlockSize), + .Flags = COMMAND_DIRECTION_DATA_IN, + .LUN = LUNIndex, + .SCSICommandLength = 10 }, - SCSICommandData: + .SCSICommandData = { SCSI_CMD_READ_10, 0x00, // Unused (control bits, all off) @@ -475,17 +475,17 @@ uint8_t MassStore_WriteDeviceBlock(const uint8_t LUNIndex, const uint32_t BlockA /* Create a CBW with a SCSI command to write the given blocks to the device */ SCSICommandBlock = (CommandBlockWrapper_t) { - Header: + .Header = { - Signature: CBW_SIGNATURE, - Tag: MassStore_Tag, - DataTransferLength: ((uint32_t)Blocks * BlockSize), - Flags: COMMAND_DIRECTION_DATA_OUT, - LUN: LUNIndex, - SCSICommandLength: 10 + .Signature = CBW_SIGNATURE, + .Tag = MassStore_Tag, + .DataTransferLength = ((uint32_t)Blocks * BlockSize), + .Flags = COMMAND_DIRECTION_DATA_OUT, + .LUN = LUNIndex, + .SCSICommandLength = 10 }, - SCSICommandData: + .SCSICommandData = { SCSI_CMD_WRITE_10, 0x00, // Unused (control bits, all off) @@ -534,17 +534,17 @@ uint8_t MassStore_TestUnitReady(const uint8_t LUNIndex) /* Create a CBW with a SCSI command to issue TEST UNIT READY command */ SCSICommandBlock = (CommandBlockWrapper_t) { - Header: + .Header = { - Signature: CBW_SIGNATURE, - Tag: MassStore_Tag, - DataTransferLength: 0, - Flags: COMMAND_DIRECTION_DATA_IN, - LUN: LUNIndex, - SCSICommandLength: 6 + .Signature = CBW_SIGNATURE, + .Tag = MassStore_Tag, + .DataTransferLength = 0, + .Flags = COMMAND_DIRECTION_DATA_IN, + .LUN = LUNIndex, + .SCSICommandLength = 6 }, - SCSICommandData: + .SCSICommandData = { SCSI_CMD_TEST_UNIT_READY, 0x00, // Reserved @@ -583,17 +583,17 @@ uint8_t MassStore_ReadCapacity(const uint8_t LUNIndex, SCSI_Capacity_t* const Ca /* Create a CBW with a SCSI command to issue READ CAPACITY command */ SCSICommandBlock = (CommandBlockWrapper_t) { - Header: + .Header = { - Signature: CBW_SIGNATURE, - Tag: MassStore_Tag, - DataTransferLength: 8, - Flags: COMMAND_DIRECTION_DATA_IN, - LUN: LUNIndex, - SCSICommandLength: 10 + .Signature = CBW_SIGNATURE, + .Tag = MassStore_Tag, + .DataTransferLength = 8, + .Flags = COMMAND_DIRECTION_DATA_IN, + .LUN = LUNIndex, + .SCSICommandLength = 10 }, - SCSICommandData: + .SCSICommandData = { SCSI_CMD_READ_CAPACITY_10, 0x00, // Reserved @@ -655,17 +655,17 @@ uint8_t MassStore_PreventAllowMediumRemoval(const uint8_t LUNIndex, const bool P /* Create a CBW with a SCSI command to issue PREVENT ALLOW MEDIUM REMOVAL command */ SCSICommandBlock = (CommandBlockWrapper_t) { - Header: + .Header = { - Signature: CBW_SIGNATURE, - Tag: MassStore_Tag, - DataTransferLength: 0, - Flags: COMMAND_DIRECTION_DATA_OUT, - LUN: LUNIndex, - SCSICommandLength: 6 + .Signature = CBW_SIGNATURE, + .Tag = MassStore_Tag, + .DataTransferLength = 0, + .Flags = COMMAND_DIRECTION_DATA_OUT, + .LUN = LUNIndex, + .SCSICommandLength = 6 }, - SCSICommandData: + .SCSICommandData = { SCSI_CMD_PREVENT_ALLOW_MEDIUM_REMOVAL, 0x00, // Reserved diff --git a/Demos/Host/MouseHost/MouseHost.c b/Demos/Host/MouseHost/MouseHost.c index 6a59b4d59..a11ecc86b 100644 --- a/Demos/Host/MouseHost/MouseHost.c +++ b/Demos/Host/MouseHost/MouseHost.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_Mouse_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_Mouse_Host , .TaskStatus = TASK_STOP }, }; @@ -250,11 +250,11 @@ TASK(USB_Mouse_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ @@ -300,11 +300,11 @@ TASK(USB_Mouse_Host) /* HID class request to set the mouse protocol to the Boot Protocol */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), - bRequest: REQ_SetProtocol, - wValue: 0, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_CLASS | REQREC_INTERFACE), + .bRequest = REQ_SetProtocol, + .wValue = 0, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/MouseHostWithParser/HIDReport.c b/Demos/Host/MouseHostWithParser/HIDReport.c index 176f18cf6..68d6580f4 100644 --- a/Demos/Host/MouseHostWithParser/HIDReport.c +++ b/Demos/Host/MouseHostWithParser/HIDReport.c @@ -49,11 +49,11 @@ uint8_t GetHIDReportData(void) USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE), - bRequest: REQ_GetDescriptor, - wValue: (DTYPE_Report << 8), - wIndex: 0, - wLength: HIDReportSize, + .bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_INTERFACE), + .bRequest = REQ_GetDescriptor, + .wValue = (DTYPE_Report << 8), + .wIndex = 0, + .wLength = HIDReportSize, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c index 44c68eea7..df063dab3 100644 --- a/Demos/Host/MouseHostWithParser/MouseHostWithParser.c +++ b/Demos/Host/MouseHostWithParser/MouseHostWithParser.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_Mouse_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_Mouse_Host , .TaskStatus = TASK_STOP }, }; @@ -187,11 +187,11 @@ TASK(USB_Mouse_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/StillImageHost/StillImageCommands.c b/Demos/Host/StillImageHost/StillImageCommands.c index a12785743..233e5b116 100644 --- a/Demos/Host/StillImageHost/StillImageCommands.c +++ b/Demos/Host/StillImageHost/StillImageCommands.c @@ -265,11 +265,11 @@ uint8_t SImage_ClearPipeStall(const uint8_t EndpointNum) { USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT), - bRequest: REQ_ClearFeature, - wValue: FEATURE_ENDPOINT_HALT, - wIndex: EndpointNum, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_ENDPOINT), + .bRequest = REQ_ClearFeature, + .wValue = FEATURE_ENDPOINT_HALT, + .wIndex = EndpointNum, + .wLength = 0, }; /* Select the control pipe for the request transfer */ diff --git a/Demos/Host/StillImageHost/StillImageHost.c b/Demos/Host/StillImageHost/StillImageHost.c index 3e5bf6a78..4b196c3ed 100644 --- a/Demos/Host/StillImageHost/StillImageHost.c +++ b/Demos/Host/StillImageHost/StillImageHost.c @@ -39,8 +39,8 @@ /* Scheduler Task List */ TASK_LIST { - { Task: USB_USBTask , TaskStatus: TASK_STOP }, - { Task: USB_SImage_Host , TaskStatus: TASK_STOP }, + { .Task = USB_USBTask , .TaskStatus = TASK_STOP }, + { .Task = USB_SImage_Host , .TaskStatus = TASK_STOP }, }; @@ -153,11 +153,11 @@ TASK(USB_SImage_Host) /* Standard request to set the device configuration to configuration 1 */ USB_HostRequest = (USB_Host_Request_Header_t) { - bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), - bRequest: REQ_SetConfiguration, - wValue: 1, - wIndex: 0, - wLength: 0, + .bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE), + .bRequest = REQ_SetConfiguration, + .wValue = 1, + .wIndex = 0, + .wLength = 0, }; /* Select the control pipe for the request transfer */ @@ -211,11 +211,11 @@ TASK(USB_SImage_Host) PIMA_SendBlock = (PIMA_Container_t) { - DataLength: PIMA_COMMAND_SIZE(0), - Type: CType_CommandBlock, - Code: PIMA_OPERATION_GETDEVICEINFO, - TransactionID: 0x00000000, - Params: {}, + .DataLength = PIMA_COMMAND_SIZE(0), + .Type = CType_CommandBlock, + .Code = PIMA_OPERATION_GETDEVICEINFO, + .TransactionID = 0x00000000, + .Params = {}, }; /* Send the GETDEVICEINFO block */ @@ -290,11 +290,11 @@ TASK(USB_SImage_Host) PIMA_SendBlock = (PIMA_Container_t) { - DataLength: PIMA_COMMAND_SIZE(1), - Type: CType_CommandBlock, - Code: PIMA_OPERATION_OPENSESSION, - TransactionID: 0x00000000, - Params: {0x00000001}, + .DataLength = PIMA_COMMAND_SIZE(1), + .Type = CType_CommandBlock, + .Code = PIMA_OPERATION_OPENSESSION, + .TransactionID = 0x00000000, + .Params = {0x00000001}, }; /* Send the OPENSESSION block, open a session with an ID of 0x0001 */ @@ -318,11 +318,11 @@ TASK(USB_SImage_Host) PIMA_SendBlock = (PIMA_Container_t) { - DataLength: PIMA_COMMAND_SIZE(1), - Type: CType_CommandBlock, - Code: PIMA_OPERATION_CLOSESESSION, - TransactionID: 0x00000001, - Params: {0x00000001}, + .DataLength = PIMA_COMMAND_SIZE(1), + .Type = CType_CommandBlock, + .Code = PIMA_OPERATION_CLOSESESSION, + .TransactionID = 0x00000001, + .Params = {0x00000001}, }; /* Send the CLOSESESSION block, close the session with an ID of 0x0001 */ -- cgit v1.2.3