ARM Packages: Fixed missing braces (the warning was disabled by GCC)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15578 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Drivers/CpuDxe/CpuMpCore.c b/ArmPkg/Drivers/CpuDxe/CpuMpCore.c
index 49bc25c8c58779d34d14cf4aefcd31f0b5a85a93..81d858ea2502c40ac8caebb3ce0b6518c5562ca5 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/CpuMpCore.c
+++ b/ArmPkg/Drivers/CpuDxe/CpuMpCore.c
@@ -1,14 +1,14 @@
 /** @file\r
 *\r
 /** @file\r
 *\r

-*  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-*  \r
-*  This program and the accompanying materials                          \r
-*  are licensed and made available under the terms and conditions of the BSD License         \r
-*  which accompanies this distribution.  The full text of the license may be found at        \r
-*  http://opensource.org/licenses/bsd-license.php                                            \r
+*  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\r

 *\r
 *\r

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+*  This program and the accompanying materials\r
+*  are licensed and made available under the terms and conditions of the BSD License\r
+*  which accompanies this distribution.  The full text of the license may be found at\r
+*  http://opensource.org/licenses/bsd-license.php\r
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 *\r
 **/\r
 \r
 *\r
 **/\r
 \r


@@ -30,7 +30,7 @@ ARM_PROCESSOR_TABLE mArmProcessorTableTemplate = {
     EFI_ARM_PROCESSOR_TABLE_OEM_REVISION,\r
     EFI_ARM_PROCESSOR_TABLE_CREATOR_ID,\r
     EFI_ARM_PROCESSOR_TABLE_CREATOR_REVISION,\r
     EFI_ARM_PROCESSOR_TABLE_OEM_REVISION,\r
     EFI_ARM_PROCESSOR_TABLE_CREATOR_ID,\r
     EFI_ARM_PROCESSOR_TABLE_CREATOR_REVISION,\r

-    0,\r
+    { 0 },\r

     0\r
   },   //ARM Processor table header\r
   0,   // Number of entries in ARM processor Table\r
     0\r
   },   //ARM Processor table header\r
   0,   // Number of entries in ARM processor Table\r

diff --git a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
index aae9582a6aa5a71221f3e1b2e5e73b258d0ee614..ede23ef2edc58065427d33cc8e51a08266284f5f 100644 (file)
--- a/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
+++ b/ArmPkg/Filesystem/SemihostFs/Arm/SemihostFs.c
@@ -66,10 +66,10 @@ typedef struct {
 \r
 SEMIHOST_DEVICE_PATH gDevicePath = {\r
   {\r
 \r
 SEMIHOST_DEVICE_PATH gDevicePath = {\r
   {\r

-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0 },\r
+    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0 } },\r

     EFI_CALLER_ID_GUID\r
   },\r
     EFI_CALLER_ID_GUID\r
   },\r

-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}\r
+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } }\r

 };\r
 \r
 typedef struct {\r
 };\r
 \r
 typedef struct {\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c
index 4365e51d889a804b351708e447c12e75bf3af0fb..33524c06f11473dfa13e4ca6d4f7b6dad3e236b9 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

- Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>\r
+ Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r

 \r
  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
 \r
  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r


@@ -25,7 +25,7 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = {
     ARM_EB_SMB_NOR_BASE,\r
     SIZE_128KB * 512,\r
     SIZE_128KB,\r
     ARM_EB_SMB_NOR_BASE,\r
     SIZE_128KB * 512,\r
     SIZE_128KB,\r

-    {0xE7223039, 0x5836, 0x41E1, 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59}\r
+    {0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59 } }\r

   }\r
 };\r
 \r
   }\r
 };\r
 \r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
index 6a0b3191ae94f97e9172ac46da3234b1a61b107b..a136bff4a1d6432f9b8da291292f8f5b69223a67 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

- Copyright (c) 2011-2012, ARM Ltd. All rights reserved.<BR>\r
+ Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r

 \r
  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
 \r
  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r


@@ -26,28 +26,28 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = {
     ARM_VE_SMB_NOR0_BASE,\r
     SIZE_256KB * 255,\r
     SIZE_256KB,\r
     ARM_VE_SMB_NOR0_BASE,\r
     SIZE_256KB * 255,\r
     SIZE_256KB,\r

-    {0xE7223039, 0x5836, 0x41E1, 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59}\r
+    { 0xE7223039, 0x5836, 0x41E1, { 0xB5, 0x42, 0xD7, 0xEC, 0x73, 0x6C, 0x5E, 0x59 } }\r

   },\r
   { // BootMon non-volatile storage\r
     ARM_VE_SMB_NOR0_BASE,\r
     ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255,\r
     SIZE_64KB * 4,\r
     SIZE_64KB,\r
   },\r
   { // BootMon non-volatile storage\r
     ARM_VE_SMB_NOR0_BASE,\r
     ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255,\r
     SIZE_64KB * 4,\r
     SIZE_64KB,\r

-    {0x02118005, 0x9DA7, 0x443A, 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB}\r
+    { 0x02118005, 0x9DA7, 0x443A, { 0x92, 0xD5, 0x78, 0x1F, 0x02, 0x2A, 0xED, 0xBB } }\r

   },\r
   { // UEFI\r
     ARM_VE_SMB_NOR1_BASE,\r
     ARM_VE_SMB_NOR1_BASE,\r
     SIZE_256KB * 255,\r
     SIZE_256KB,\r
   },\r
   { // UEFI\r
     ARM_VE_SMB_NOR1_BASE,\r
     ARM_VE_SMB_NOR1_BASE,\r
     SIZE_256KB * 255,\r
     SIZE_256KB,\r

-    {0x1F15DA3C, 0x37FF, 0x4070, 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A}\r
+    { 0x1F15DA3C, 0x37FF, 0x4070, { 0xB4, 0x71, 0xBB, 0x4A, 0xF1, 0x2A, 0x72, 0x4A } }\r

   },\r
   { // UEFI Variable Services non-volatile storage\r
     ARM_VE_SMB_NOR1_BASE,\r
     ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255,\r
     SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks\r
     SIZE_64KB,\r
   },\r
   { // UEFI Variable Services non-volatile storage\r
     ARM_VE_SMB_NOR1_BASE,\r
     ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255,\r
     SIZE_64KB * 3, //FIXME: Set 3 blocks because I did not succeed to copy 4 blocks into the ARM Versatile Express NOR Flash in the last NOR Flash. It should be 4 blocks\r
     SIZE_64KB,\r

-    {0xCC2CBF29, 0x1498, 0x4CDD, 0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09}\r
+    { 0xCC2CBF29, 0x1498, 0x4CDD, { 0x81, 0x71, 0xF8, 0xB6, 0xB4, 0x1D, 0x09, 0x09 } }\r

   }\r
 };\r
 \r
   }\r
 };\r
 \r

diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
index b42336446cdbdf6d3ab29983d874b11b9cad7288..0091c7597c70b27684ed8dc1d737aa0ea653fbb4 100644 (file)
--- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
+++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

- Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r
+ Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r

  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r
  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r


@@ -43,7 +43,7 @@ LCD_INSTANCE mLcdTemplate = {
     0, // HorizontalResolution\r
     0, // VerticalResolution\r
     PixelBltOnly, // PixelFormat\r
     0, // HorizontalResolution\r
     0, // VerticalResolution\r
     PixelBltOnly, // PixelFormat\r

-    0, // PixelInformation\r
+    { 0 }, // PixelInformation\r

     0, // PixelsPerScanLine\r
   },\r
   {\r
     0, // PixelsPerScanLine\r
   },\r
   {\r


@@ -64,8 +64,7 @@ LCD_INSTANCE mLcdTemplate = {
     {\r
       {\r
         HARDWARE_DEVICE_PATH, HW_VENDOR_DP,\r
     {\r
       {\r
         HARDWARE_DEVICE_PATH, HW_VENDOR_DP,\r

-        (UINT8) (sizeof(VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8),\r
+        { (UINT8) (sizeof(VENDOR_DEVICE_PATH)), (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8) },\r

       },\r
       // Hardware Device Path for Lcd\r
       EFI_CALLER_ID_GUID // Use the driver's GUID\r
       },\r
       // Hardware Device Path for Lcd\r
       EFI_CALLER_ID_GUID // Use the driver's GUID\r


@@ -74,8 +73,7 @@ LCD_INSTANCE mLcdTemplate = {
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-      sizeof(EFI_DEVICE_PATH_PROTOCOL),\r
-      0\r
+      { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0 }\r

     }\r
   },\r
   (EFI_EVENT) NULL // ExitBootServicesEvent\r
     }\r
   },\r
   (EFI_EVENT) NULL // ExitBootServicesEvent\r

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
index 4fac20199ba0b0e929de5a0bfcb85fda1c547788..a5933792acf86eae21e747be26d2b4e42be7382f 100644 (file)
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
@@ -86,16 +86,14 @@ NOR_FLASH_INSTANCE  mNorFlashInstanceTemplate = {
       {\r
         HARDWARE_DEVICE_PATH,\r
         HW_VENDOR_DP,\r
       {\r
         HARDWARE_DEVICE_PATH,\r
         HW_VENDOR_DP,\r

-        (UINT8)( sizeof(VENDOR_DEVICE_PATH)      ),\r
-        (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8),\r
+        { (UINT8)sizeof(VENDOR_DEVICE_PATH), (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8) }\r

       },\r
       },\r

-      { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 }, // GUID ... NEED TO BE FILLED\r
+      { 0x0, 0x0, 0x0, { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }, // GUID ... NEED TO BE FILLED\r

     },\r
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     },\r
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-      sizeof (EFI_DEVICE_PATH_PROTOCOL),\r
-      0\r
+      { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }\r

     }\r
     } // DevicePath\r
 };\r
     }\r
     } // DevicePath\r
 };\r

diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
index 04ad9c05db4b433f33c8db10342528e2d38f0308..d4e1904d7dcfc2b232b485511e2a6456b60dded4 100644 (file)
--- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
@@ -46,8 +46,7 @@ STATIC CONST MEMORY_DEVICE_PATH MemoryDevicePathTemplate =
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    sizeof (EFI_DEVICE_PATH_PROTOCOL),\r
-    0\r
+    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }\r

   } // End\r
 };\r
 \r
   } // End\r
 };\r
 \r

diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
index 8e9da2a9b6b4aebdd017b99285f5a62c6c658b00..8ec78aeb534e5a3830eeeb8d3671e10179392093 100644 (file)
--- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
+++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
@@ -318,10 +318,10 @@ TcpFastbootTransportStart (
     255,                                            // IPv4 Time to Live\r
     {                                               // AccessPoint:\r
       TRUE,                                         // Use default address\r
     255,                                            // IPv4 Time to Live\r
     {                                               // AccessPoint:\r
       TRUE,                                         // Use default address\r

-      {0, 0, 0, 0},                                 // IP Address  (ignored - use default)\r
-      {0, 0, 0, 0},                                 // Subnet mask (ignored - use default)\r
+      { {0, 0, 0, 0} },                             // IP Address  (ignored - use default)\r
+      { {0, 0, 0, 0} },                             // Subnet mask (ignored - use default)\r

       FixedPcdGet32 (PcdAndroidFastbootTcpPort),    // Station port\r
       FixedPcdGet32 (PcdAndroidFastbootTcpPort),    // Station port\r

-      {0, 0, 0, 0},                                 // Remote address: accept any\r
+      { {0, 0, 0, 0} },                             // Remote address: accept any\r

       0,                                            // Remote Port: accept any\r
       FALSE                                         // ActiveFlag: be a "server"\r
     },\r
       0,                                            // Remote Port: accept any\r
       FALSE                                         // ActiveFlag: be a "server"\r
     },\r

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
index fcaa351bf2d31cf08521315848ffc0a364432e73..191215f7ca6cdd837948222c9aff11eff7376281 100644 (file)
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
@@ -26,14 +26,13 @@ LAN9118_DEVICE_PATH Lan9118PathTemplate =  {
       MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP,\r
       { (UINT8) (sizeof(MAC_ADDR_DEVICE_PATH)), (UINT8) ((sizeof(MAC_ADDR_DEVICE_PATH)) >> 8) }\r
     },\r
       MESSAGING_DEVICE_PATH, MSG_MAC_ADDR_DP,\r
       { (UINT8) (sizeof(MAC_ADDR_DEVICE_PATH)), (UINT8) ((sizeof(MAC_ADDR_DEVICE_PATH)) >> 8) }\r
     },\r

-    { 0 },\r
+    { { 0 } },\r

     0\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     0\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    sizeof(EFI_DEVICE_PATH_PROTOCOL),\r
-    0\r
+    { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0 }\r

   }\r
 };\r
 \r
   }\r
 };\r
 \r

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
index 99c3ff0cec518207020fceec054162df052b235b..d271dcd0dd52252c2323fe18dfd94b46f575dd53 100644 (file)
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
@@ -14,7 +14,7 @@
 \r
 #include "Lan9118Dxe.h"\r
 \r
 \r
 #include "Lan9118Dxe.h"\r
 \r

-STATIC EFI_MAC_ADDRESS mZeroMac = { 0 };\r
+STATIC EFI_MAC_ADDRESS mZeroMac = { { 0 } };\r

 \r
 /**\r
   This internal function reverses bits for 32bit data.\r
 \r
 /**\r
   This internal function reverses bits for 32bit data.\r

diff --git a/EmbeddedPkg/Ebl/HwDebug.c b/EmbeddedPkg/Ebl/HwDebug.c
index 1b332228279474e5fe526ec43c9647e1550ad338..c87d1c4d1ab6dcac8349d3179482b84be8826517 100644 (file)
--- a/EmbeddedPkg/Ebl/HwDebug.c
+++ b/EmbeddedPkg/Ebl/HwDebug.c
@@ -297,10 +297,12 @@ EblPciCmd (
 \r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdPciDebugTemplate[] = {\r
 \r
 \r
 GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdPciDebugTemplate[] = {\r

-  "pci",\r
-  " [bus] [dev] [func]; Dump PCI",\r
-  NULL,\r
-  EblPciCmd\r
+  {\r
+    "pci",\r
+    " [bus] [dev] [func]; Dump PCI",\r
+    NULL,\r
+    EblPciCmd\r
+  }\r

 };\r
 \r
 \r
 };\r
 \r
 \r

diff --git a/EmbeddedPkg/GdbStub/SerialIo.c b/EmbeddedPkg/GdbStub/SerialIo.c
index 2df967a52a3c4ebbe293430b8c0891bd2c41263e..ed062684434cc5c2eccfc988d4c1770bec62032d 100644 (file)
--- a/EmbeddedPkg/GdbStub/SerialIo.c
+++ b/EmbeddedPkg/GdbStub/SerialIo.c
@@ -475,15 +475,17 @@ GDB_SERIAL_DEV gdbSerialDevTemplate = {
     0,      // Parity\r
     0       // StopBits\r
   },\r
     0,      // Parity\r
     0       // StopBits\r
   },\r

-  { \r
+  {\r

     {\r
     {\r

-      HARDWARE_DEVICE_PATH,\r
-      HW_VENDOR_DP,\r

       {\r
       {\r

-        (UINT8) (sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)) >> 8)\r
+        HARDWARE_DEVICE_PATH,\r
+        HW_VENDOR_DP,\r
+        {\r
+          (UINT8) (sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)),\r
+          (UINT8) ((sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)) >> 8)\r
+        },\r

       },\r
       },\r

-      EFI_SERIAL_IO_PROTOCOL_GUID,\r
+      EFI_SERIAL_IO_PROTOCOL_GUID\r

     },\r
     0,\r
     {\r
     },\r
     0,\r
     {\r

diff --git a/EmbeddedPkg/SerialDxe/SerialIo.c b/EmbeddedPkg/SerialDxe/SerialIo.c
index 288f353cba8d86281cac735977396d2c863812c2..5a20e3c14b11a0640a935504561c3d26e23755a6 100644 (file)
--- a/EmbeddedPkg/SerialDxe/SerialIo.c
+++ b/EmbeddedPkg/SerialDxe/SerialIo.c
@@ -1,14 +1,13 @@
 /** @file\r
   Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system \r
   running GDB. One console for error information and another console for user input/output.\r
 /** @file\r
   Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system \r
   running GDB. One console for error information and another console for user input/output.\r

-  \r
+\r

   Basic packet format is $packet-data#checksum. So every command has 4 bytes of overhead: $,\r
   #, 0, 0. The 0 and 0 are the ascii characters for the checksum. \r
   Basic packet format is $packet-data#checksum. So every command has 4 bytes of overhead: $,\r
   #, 0, 0. The 0 and 0 are the ascii characters for the checksum. \r

-  \r

 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r

-  Copyright (c) 2013, ARM Ltd. All rights reserved.<BR>\r
-  \r
+  Copyright (c) 2013-2014, ARM Ltd. All rights reserved.<BR>\r
+\r

   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r


@@ -37,18 +36,18 @@ typedef struct {
 \r
 SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {\r
   {\r
 \r
 SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {\r
   {\r

-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0},\r
+    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },\r

     EFI_CALLER_ID_GUID // Use the drivers GUID\r
   },\r
   {\r
     EFI_CALLER_ID_GUID // Use the drivers GUID\r
   },\r
   {\r

-    { MESSAGING_DEVICE_PATH, MSG_UART_DP, sizeof (UART_DEVICE_PATH), 0},\r
+    { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },\r

     0,        // Reserved\r
     FixedPcdGet64 (PcdUartDefaultBaudRate),   // BaudRate\r
     FixedPcdGet8 (PcdUartDefaultDataBits),    // DataBits\r
     FixedPcdGet8 (PcdUartDefaultParity),      // Parity (N)\r
     FixedPcdGet8 (PcdUartDefaultStopBits)     // StopBits\r
   },\r
     0,        // Reserved\r
     FixedPcdGet64 (PcdUartDefaultBaudRate),   // BaudRate\r
     FixedPcdGet8 (PcdUartDefaultDataBits),    // DataBits\r
     FixedPcdGet8 (PcdUartDefaultParity),      // Parity (N)\r
     FixedPcdGet8 (PcdUartDefaultStopBits)     // StopBits\r
   },\r

-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}\r
+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } }\r

 };\r
 \r
 EFI_HANDLE  gHandle = NULL;\r
 };\r
 \r
 EFI_HANDLE  gHandle = NULL;\r

diff --git a/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c b/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c
index 3241ab28a3ba3470cffb5f533dc92b231a9ea6f9..5905a108b1650d0b0dcec8f3ace79791f47bed98 100644 (file)
--- a/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c
+++ b/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c
@@ -210,18 +210,18 @@ typedef struct {
 \r
 SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {\r
   {\r
 \r
 SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {\r
   {\r

-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0},\r
+    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },\r

     EFI_CALLER_ID_GUID\r
   },\r
   {\r
     EFI_CALLER_ID_GUID\r
   },\r
   {\r

-    { MESSAGING_DEVICE_PATH, MSG_UART_DP, sizeof (UART_DEVICE_PATH), 0},\r
+    { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },\r

     0,        // Reserved\r
     FixedPcdGet64 (PcdUartDefaultBaudRate),   // BaudRate\r
     FixedPcdGet8 (PcdUartDefaultDataBits),    // DataBits\r
     FixedPcdGet8 (PcdUartDefaultParity),      // Parity (N)\r
     FixedPcdGet8 (PcdUartDefaultStopBits)     // StopBits\r
   },\r
     0,        // Reserved\r
     FixedPcdGet64 (PcdUartDefaultBaudRate),   // BaudRate\r
     FixedPcdGet8 (PcdUartDefaultDataBits),    // DataBits\r
     FixedPcdGet8 (PcdUartDefaultParity),      // Parity (N)\r
     FixedPcdGet8 (PcdUartDefaultStopBits)     // StopBits\r
   },\r

-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}\r
+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} }\r

 };\r
 \r
 \r
 };\r
 \r
 \r

diff --git a/Omap35xxPkg/Flash/Flash.c b/Omap35xxPkg/Flash/Flash.c
index c63e0a3395b2c6813245ab4023744452118d3a4e..b33c9badf70fec23344ab3ff3f4303157385e457 100644 (file)
--- a/Omap35xxPkg/Flash/Flash.c
+++ b/Omap35xxPkg/Flash/Flash.c
@@ -39,17 +39,11 @@ typedef struct {
 \r
 \r
 FLASH_DEVICE_PATH gDevicePath = {\r
 \r
 \r
 FLASH_DEVICE_PATH gDevicePath = {\r

-\r

   {\r
   {\r

-\r
-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0 },\r
-\r
+    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0 } },\r

     EFI_CALLER_ID_GUID\r
     EFI_CALLER_ID_GUID\r

-\r

   },\r
   },\r

-\r
-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}\r
-\r
+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} }\r

 };\r
 \r
 \r
 };\r
 \r
 \r

diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
index e30a679d8433e87af60e265ee694018e095e693e..f7d247865dc0d6e6805da706e50a80da1693c0a5 100644 (file)
--- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
+++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
 /** @file\r
 \r

- Copyright (c) 2011, ARM Ltd. All rights reserved.<BR>\r
+ Copyright (c) 2011-2014, ARM Ltd. All rights reserved.<BR>\r

  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r
  This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r


@@ -70,18 +70,15 @@ LCD_INSTANCE mLcdTemplate = {
     {\r
       {\r
         HARDWARE_DEVICE_PATH, HW_VENDOR_DP,\r
     {\r
       {\r
         HARDWARE_DEVICE_PATH, HW_VENDOR_DP,\r

-        (UINT8) (sizeof(VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8),\r
+        { (UINT8) (sizeof(VENDOR_DEVICE_PATH)), (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8) },\r

       },\r
       // Hardware Device Path for Lcd\r
       EFI_CALLER_ID_GUID // Use the driver's GUID\r
     },\r
       },\r
       // Hardware Device Path for Lcd\r
       EFI_CALLER_ID_GUID // Use the driver's GUID\r
     },\r

-\r

     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
       END_DEVICE_PATH_TYPE,\r
       END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-      sizeof(EFI_DEVICE_PATH_PROTOCOL),\r
-      0\r
+      { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0}\r

     }\r
   }\r
 };\r
     }\r
   }\r
 };\r

diff --git a/Omap35xxPkg/MMCHSDxe/MMCHS.c b/Omap35xxPkg/MMCHSDxe/MMCHS.c
index 7d4e22f5246aad7fb22c06cb32229475718aa28f..3d0a7c606760ecb88ffabf47f3e50bf138d5ca5b 100644 (file)
--- a/Omap35xxPkg/MMCHSDxe/MMCHS.c
+++ b/Omap35xxPkg/MMCHSDxe/MMCHS.c
@@ -52,8 +52,7 @@ MMCHS_DEVICE_PATH gMmcHsDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    sizeof (EFI_DEVICE_PATH_PROTOCOL),\r
-    0\r
+    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }\r

   }\r
 };\r
 \r
   }\r
 };\r
 \r

diff --git a/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c b/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c
index 0cbd82bd44d8593a8b045d4a772ea6078ea0fe57..dab932999f02f15feb6e723d7eb9eed6ce12a09d 100755 (executable)
--- a/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c
+++ b/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c
@@ -1,15 +1,15 @@
 /** @file\r
 *\r
 *  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.\r
 /** @file\r
 *\r
 *  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.\r

-*  Copyright (c) 2011, ARM Limited. All rights reserved.\r
-*  \r
-*  This program and the accompanying materials                          \r
-*  are licensed and made available under the terms and conditions of the BSD License         \r
-*  which accompanies this distribution.  The full text of the license may be found at        \r
-*  http://opensource.org/licenses/bsd-license.php                                            \r
+*  Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r

 *\r
 *\r

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+*  This program and the accompanying materials\r
+*  are licensed and made available under the terms and conditions of the BSD License\r
+*  which accompanies this distribution.  The full text of the license may be found at\r
+*  http://opensource.org/licenses/bsd-license.php\r
+*\r
+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 *\r
 **/\r
 \r
 *\r
 **/\r
 \r


@@ -28,17 +28,17 @@ typedef struct {
 \r
 MMCHS_DEVICE_PATH gMMCDevicePath = {\r
   {\r
 \r
 MMCHS_DEVICE_PATH gMMCDevicePath = {\r
   {\r

-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8)(sizeof(VENDOR_DEVICE_PATH)),\r
-    (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8),\r
-    0xb615f1f5, 0x5088, 0x43cd, 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00 \r
+    {\r
+      HARDWARE_DEVICE_PATH,\r
+      HW_VENDOR_DP,\r
+      { (UINT8)(sizeof(VENDOR_DEVICE_PATH)), (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8) },\r
+    },\r
+    { 0xb615f1f5, 0x5088, 0x43cd, { 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00 } }\r

   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    sizeof (EFI_DEVICE_PATH_PROTOCOL),\r
-    0\r
+    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }\r

   }\r
 };\r
 \r
   }\r
 };\r
 \r

diff --git a/Omap35xxPkg/PciEmulation/PciEmulation.c b/Omap35xxPkg/PciEmulation/PciEmulation.c
index 0cc0faa42c69bd7b3b8a8afcc91d03a9e0e57e7e..afa64193a261d0c97c4022cb02cc6f82957e9ae4 100644 (file)
--- a/Omap35xxPkg/PciEmulation/PciEmulation.c
+++ b/Omap35xxPkg/PciEmulation/PciEmulation.c
@@ -39,16 +39,16 @@ typedef struct {
 EFI_PCI_IO_DEVICE_PATH PciIoDevicePathTemplate = \r
 {\r
   {\r
 EFI_PCI_IO_DEVICE_PATH PciIoDevicePathTemplate = \r
 {\r
   {\r

-    { ACPI_DEVICE_PATH, ACPI_DP, sizeof (ACPI_HID_DEVICE_PATH), 0},\r
+    { ACPI_DEVICE_PATH, ACPI_DP, { sizeof (ACPI_HID_DEVICE_PATH), 0 } },\r

     EISA_PNP_ID(0x0A03),  // HID\r
     0                     // UID\r
   },\r
   {\r
     EISA_PNP_ID(0x0A03),  // HID\r
     0                     // UID\r
   },\r
   {\r

-    { HARDWARE_DEVICE_PATH, HW_PCI_DP, sizeof (PCI_DEVICE_PATH), 0},\r
+    { HARDWARE_DEVICE_PATH, HW_PCI_DP, { sizeof (PCI_DEVICE_PATH), 0 } },\r

     0,\r
     0\r
   },\r
     0,\r
     0\r
   },\r

-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}\r
+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} }\r

 };\r
 \r
 STATIC\r
 };\r
 \r
 STATIC\r


@@ -422,12 +422,9 @@ EFI_PCI_IO_PROTOCOL PciIoTemplate =
 {\r
   PciIoPollMem,\r
   PciIoPollIo,\r
 {\r
   PciIoPollMem,\r
   PciIoPollIo,\r

-  PciIoMemRead,\r
-  PciIoMemWrite,\r
-  PciIoIoRead,\r
-  PciIoIoWrite,\r
-  PciIoPciRead,\r
-  PciIoPciWrite,\r
+  { PciIoMemRead, PciIoMemWrite },\r
+  { PciIoIoRead,  PciIoIoWrite },\r
+  { PciIoPciRead, PciIoPciWrite },\r

   PciIoCopyMem,\r
   PciIoMap,\r
   PciIoUnmap,\r
   PciIoCopyMem,\r
   PciIoMap,\r
   PciIoUnmap,\r