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

8 files changed, 30 insertions, 29 deletions

diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
index 04ad9c05db..d4e1904d7d 100644
--- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
+++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c
@@ -46,8 +46,7 @@ STATIC CONST MEMORY_DEVICE_PATH MemoryDevicePathTemplate =
   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    sizeof (EFI_DEVICE_PATH_PROTOCOL),

-    0

+    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }

   } // End

 };

 

diff --git a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
index 8e9da2a9b6..8ec78aeb53 100644
--- a/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
+++ b/EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcp.c
@@ -318,10 +318,10 @@ TcpFastbootTransportStart (
     255,                                            // IPv4 Time to Live

     {                                               // AccessPoint:

       TRUE,                                         // Use default address

-      {0, 0, 0, 0},                                 // IP Address  (ignored - use default)

-      {0, 0, 0, 0},                                 // Subnet mask (ignored - use default)

+      { {0, 0, 0, 0} },                             // IP Address  (ignored - use default)

+      { {0, 0, 0, 0} },                             // Subnet mask (ignored - use default)

       FixedPcdGet32 (PcdAndroidFastbootTcpPort),    // Station port

-      {0, 0, 0, 0},                                 // Remote address: accept any

+      { {0, 0, 0, 0} },                             // Remote address: accept any

       0,                                            // Remote Port: accept any

       FALSE                                         // ActiveFlag: be a "server"

     },

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118Dxe.c
index fcaa351bf2..191215f7ca 100644
--- 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,

       { (UINT8) (sizeof(MAC_ADDR_DEVICE_PATH)), (UINT8) ((sizeof(MAC_ADDR_DEVICE_PATH)) >> 8) }

     },

-    { 0 },

+    { { 0 } },

     0

   },

   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    sizeof(EFI_DEVICE_PATH_PROTOCOL),

-    0

+    { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0 }

   }

 };

 

diff --git a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
index 99c3ff0cec..d271dcd0dd 100644
--- a/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
+++ b/EmbeddedPkg/Drivers/Lan9118Dxe/Lan9118DxeUtil.c
@@ -14,7 +14,7 @@
 

 #include "Lan9118Dxe.h"

 

-STATIC EFI_MAC_ADDRESS mZeroMac = { 0 };

+STATIC EFI_MAC_ADDRESS mZeroMac = { { 0 } };

 

 /**

   This internal function reverses bits for 32bit data.

diff --git a/EmbeddedPkg/Ebl/HwDebug.c b/EmbeddedPkg/Ebl/HwDebug.c
index 1b33222827..c87d1c4d1a 100644
--- a/EmbeddedPkg/Ebl/HwDebug.c
+++ b/EmbeddedPkg/Ebl/HwDebug.c
@@ -297,10 +297,12 @@ EblPciCmd (
 

 

 GLOBAL_REMOVE_IF_UNREFERENCED const EBL_COMMAND_TABLE mCmdPciDebugTemplate[] = {

-  "pci",

-  " [bus] [dev] [func]; Dump PCI",

-  NULL,

-  EblPciCmd

+  {

+    "pci",

+    " [bus] [dev] [func]; Dump PCI",

+    NULL,

+    EblPciCmd

+  }

 };

 

 

diff --git a/EmbeddedPkg/GdbStub/SerialIo.c b/EmbeddedPkg/GdbStub/SerialIo.c
index 2df967a52a..ed06268443 100644
--- a/EmbeddedPkg/GdbStub/SerialIo.c
+++ b/EmbeddedPkg/GdbStub/SerialIo.c
@@ -475,15 +475,17 @@ GDB_SERIAL_DEV gdbSerialDevTemplate = {
     0,      // Parity

     0       // StopBits

   },

-  { 

+  {

     {

-      HARDWARE_DEVICE_PATH,

-      HW_VENDOR_DP,

       {

-        (UINT8) (sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)),

-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)) >> 8)

+        HARDWARE_DEVICE_PATH,

+        HW_VENDOR_DP,

+        {

+          (UINT8) (sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)),

+          (UINT8) ((sizeof (VENDOR_DEVICE_PATH) + sizeof (UINT32)) >> 8)

+        },

       },

-      EFI_SERIAL_IO_PROTOCOL_GUID,

+      EFI_SERIAL_IO_PROTOCOL_GUID

     },

     0,

     {

diff --git a/EmbeddedPkg/SerialDxe/SerialIo.c b/EmbeddedPkg/SerialDxe/SerialIo.c
index 288f353cba..5a20e3c14b 100644
--- a/EmbeddedPkg/SerialDxe/SerialIo.c
+++ b/EmbeddedPkg/SerialDxe/SerialIo.c
@@ -1,14 +1,13 @@
 /** @file

   Serial IO Abstraction for GDB stub. This allows an EFI consoles that shows up on the system 

   running GDB. One console for error information and another console for user input/output.

-  

+

   Basic packet format is $packet-data#checksum. So every command has 4 bytes of overhead: $,

   #, 0, 0. The 0 and 0 are the ascii characters for the checksum. 

-  

 

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

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

-  

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

+

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -37,18 +36,18 @@ typedef struct {
 

 SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {

   {

-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0},

+    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },

     EFI_CALLER_ID_GUID // Use the drivers GUID

   },

   {

-    { MESSAGING_DEVICE_PATH, MSG_UART_DP, sizeof (UART_DEVICE_PATH), 0},

+    { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },

     0,        // Reserved

     FixedPcdGet64 (PcdUartDefaultBaudRate),   // BaudRate

     FixedPcdGet8 (PcdUartDefaultDataBits),    // DataBits

     FixedPcdGet8 (PcdUartDefaultParity),      // Parity (N)

     FixedPcdGet8 (PcdUartDefaultStopBits)     // StopBits

   },

-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}

+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 } }

 };

 

 EFI_HANDLE  gHandle = NULL;

diff --git a/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c b/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c
index 3241ab28a3..5905a108b1 100644
--- a/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c
+++ b/EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOut.c
@@ -210,18 +210,18 @@ typedef struct {
 

 SIMPLE_TEXT_OUT_DEVICE_PATH mDevicePath = {

   {

-    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH), 0},

+    { HARDWARE_DEVICE_PATH, HW_VENDOR_DP, { sizeof (VENDOR_DEVICE_PATH), 0} },

     EFI_CALLER_ID_GUID

   },

   {

-    { MESSAGING_DEVICE_PATH, MSG_UART_DP, sizeof (UART_DEVICE_PATH), 0},

+    { MESSAGING_DEVICE_PATH, MSG_UART_DP, { sizeof (UART_DEVICE_PATH), 0} },

     0,        // Reserved

     FixedPcdGet64 (PcdUartDefaultBaudRate),   // BaudRate

     FixedPcdGet8 (PcdUartDefaultDataBits),    // DataBits

     FixedPcdGet8 (PcdUartDefaultParity),      // Parity (N)

     FixedPcdGet8 (PcdUartDefaultStopBits)     // StopBits

   },

-  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, sizeof (EFI_DEVICE_PATH_PROTOCOL), 0}

+  { END_DEVICE_PATH_TYPE, END_ENTIRE_DEVICE_PATH_SUBTYPE, { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0} }

 };