Changed over all deprecated GCC structure tag initializers to the standardized C99 format (thanks to Mike Alexander).

7 files changed, 25 insertions, 25 deletions

diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index d2f7fcb5e..38b666b49 100644
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -55,6 +55,7 @@
   *  - Fixed incorrect HID interface class and subclass values in the Mouse and KeyboardMouse demos (thanks to Brian Dickman)

   *  - Capitalised the "Descriptor_Search" and "Descriptor_Search_Comp" prefixes of the values in the DSearch_Return_ErrorCodes_t and

   *    DSearch_Comp_Return_ErrorCodes_t enums

+  *  - Changed over all deprecated GCC structure tag initializers to the standardized C99 format (thanks to Mike Alexander)

   *    

   *

   *  \section Sec_ChangeLog090401 Version 090401

diff --git a/LUFA/Drivers/USB/Class/ConfigDescriptor.c b/LUFA/Drivers/USB/Class/ConfigDescriptor.c
index c9f8c3cbb..dd782c81d 100644
--- a/LUFA/Drivers/USB/Class/ConfigDescriptor.c
+++ b/LUFA/Drivers/USB/Class/ConfigDescriptor.c
@@ -37,11 +37,11 @@ uint8_t USB_GetDeviceConfigDescriptor(uint16_t* const ConfigSizePtr, void* Buffe
 

 	USB_HostRequest = (USB_Host_Request_Header_t)

 		{

-			bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),

-			bRequest:      REQ_GetDescriptor,

-			wValue:        (DTYPE_Configuration << 8),

-			wIndex:        0,

-			wLength:       sizeof(USB_Descriptor_Configuration_Header_t),

+			.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),

+			.bRequest      = REQ_GetDescriptor,

+			.wValue        = (DTYPE_Configuration << 8),

+			.wIndex        = 0,

+			.wLength       = sizeof(USB_Descriptor_Configuration_Header_t),

 		};

 	

 	Pipe_SelectPipe(PIPE_CONTROLPIPE);

diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.c b/LUFA/Drivers/USB/HighLevel/USBTask.c
index 80731ac19..e1c065905 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.c
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.c
@@ -171,11 +171,11 @@ static void USB_HostTask(void)
 		case HOST_STATE_Default:

 			USB_HostRequest = (USB_Host_Request_Header_t)

 				{

-					bmRequestType: (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),

-					bRequest:      REQ_GetDescriptor,

-					wValue:        (DTYPE_Device << 8),

-					wIndex:        0,

-					wLength:       PIPE_CONTROLPIPE_DEFAULT_SIZE,

+					.bmRequestType = (REQDIR_DEVICETOHOST | REQTYPE_STANDARD | REQREC_DEVICE),

+					.bRequest      = REQ_GetDescriptor,

+					.wValue        = (DTYPE_Device << 8),

+					.wIndex        = 0,

+					.wLength       = PIPE_CONTROLPIPE_DEFAULT_SIZE,

 				};

 

 			uint8_t DataBuffer[PIPE_CONTROLPIPE_DEFAULT_SIZE];

@@ -216,11 +216,11 @@ static void USB_HostTask(void)
 			

 			USB_HostRequest = (USB_Host_Request_Header_t)

 				{

-					bmRequestType: (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),

-					bRequest:      REQ_SetAddress,

-					wValue:        USB_HOST_DEVICEADDRESS,

-					wIndex:        0,

-					wLength:       0,

+					.bmRequestType = (REQDIR_HOSTTODEVICE | REQTYPE_STANDARD | REQREC_DEVICE),

+					.bRequest      = REQ_SetAddress,

+					.wValue        = USB_HOST_DEVICEADDRESS,

+					.wIndex        = 0,

+					.wLength       = 0,

 				};

 

 			if ((SubErrorCode = USB_Host_SendControlRequest(NULL)) != HOST_SENDCONTROL_Successful)

diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 4e2ffec5a..c4a58b471 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -805,8 +805,8 @@
 			 *

 			 *  \ingroup Group_PipeRW

 			 */

-			static inline void Pipe_Ignore_DWord(void) ATTR_ALWAYS_INLINE;

-			static inline void Pipe_Ignore_DWord(void)

+			static inline void Pipe_Discard_DWord(void) ATTR_ALWAYS_INLINE;

+			static inline void Pipe_Discard_DWord(void)

 			{

 				uint8_t Dummy;

 				

@@ -854,8 +854,6 @@
 			/** Spinloops until the currently selected non-control pipe is ready for the next packed of data

 			 *  to be read or written to it.

 			 *

-			 *  \note This routine should not be called on CONTROL type pipes.

-			 *

 			 *  \ingroup Group_PipeRW

 			 *

 			 *  \return A value from the Pipe_WaitUntilReady_ErrorCodes_t enum.

diff --git a/LUFA/MemoryAllocator/DynAlloc.c b/LUFA/MemoryAllocator/DynAlloc.c
index a91e0f35e..4f1c82241 100644
--- a/LUFA/MemoryAllocator/DynAlloc.c
+++ b/LUFA/MemoryAllocator/DynAlloc.c
@@ -38,8 +38,8 @@ struct
 	uint8_t Mem_Block_Flags[(NUM_BLOCKS / 4) + ((NUM_BLOCKS % 4) ? 1 : 0)];

 	uint8_t FlagMaskLookupMask[4];

 	uint8_t FlagMaskLookupNum[4];

-} Mem_MemData = {FlagMaskLookupMask:  {(3 << 0), (3 << 2), (3 << 4), (3 << 6)},

-                 FlagMaskLookupNum:   {      0,        2,        4,        6}};

+} Mem_MemData = {.FlagMaskLookupMask = {(3 << 0), (3 << 2), (3 << 4), (3 << 6)},

+                 .FlagMaskLookupNum  = {      0,        2,        4,        6}};

 

 static uint8_t Mem_GetBlockFlags(const Block_Number_t BlockNum)

 {

diff --git a/LUFA/MigrationInformation.txt b/LUFA/MigrationInformation.txt
index beb0cb6ed..104f0984b 100644
--- a/LUFA/MigrationInformation.txt
+++ b/LUFA/MigrationInformation.txt
@@ -54,7 +54,8 @@
  *    - All pipe read/write/discard aliases which did not have an explicitly endianness specifier (such as Pipe_Read_Word()) have

  *      been removed for clarity. Existing projects should use the "_LE" suffix on such calls to use the explicit Little Endian versions.

  *    - The Host_IsResetBusDone() macro has been renamed to Host_IsBusResetComplete().

- *    - The Pipe_Ignore_Word() function has been renamed to Pipe_Discard_Word() to remain consistent with the rest of the pipe API.

+ *    - The Pipe_Ignore_Word() and Pipe_Ignore_DWord() functions have been renamed to Pipe_Discard_Word() and Pipe_Discard_DWord() to remain

+ *      consistent with the rest of the pipe API.

  *    - It is no longer needed to manually include the headers from LUFA/Drivers/USB/Class, as they are now included along with the rest

  *      of the USB headers when LUFA/Drivers/USB/USB.h is included.

  *    - Functions in the ConfigDescriptor.h header file no longer have "Host_" as part of their names.

diff --git a/LUFA/Scheduler/Scheduler.h b/LUFA/Scheduler/Scheduler.h
index 1ef477cad..0da80bb27 100644
--- a/LUFA/Scheduler/Scheduler.h
+++ b/LUFA/Scheduler/Scheduler.h
@@ -55,8 +55,8 @@
  *      

  *      TASK_LIST

  *      {

- *      	{ Task: MyTask1, TaskStatus: TASK_RUN, GroupID: 1  },

- *      	{ Task: MyTask2, TaskStatus: TASK_RUN, GroupID: 1  },

+ *      	{ .Task = MyTask1, .TaskStatus = TASK_RUN, .GroupID = 1  },

+ *      	{ .Task = MyTask2, .TaskStatus = TASK_RUN, .GroupID = 1  },

  *      }

  *

  *      int main(void)

@@ -115,7 +115,7 @@
 			 *  \code

 			 *      TASK_LIST

 			 *      {

-			 *           { Task: MyTask1, TaskStatus: TASK_RUN, GroupID: 1 },

+			 *           { .Task = MyTask1, .TaskStatus = TASK_RUN, .GroupID = 1 },

 			 *           // More task entries here

 			 *      }

 			 *  \endcode