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

5 files changed, 27 insertions, 40 deletions

diff --git a/Omap35xxPkg/Flash/Flash.c b/Omap35xxPkg/Flash/Flash.c
index c63e0a3395..b33c9badf7 100644
--- a/Omap35xxPkg/Flash/Flash.c
+++ b/Omap35xxPkg/Flash/Flash.c
@@ -39,17 +39,11 @@ typedef struct {
 

 

 FLASH_DEVICE_PATH gDevicePath = {

-

   {

-

-    { 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

-

   },

-

-  { 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} }

 };

 

 

diff --git a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
index e30a679d84..f7d247865d 100644
--- a/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
+++ b/Omap35xxPkg/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
@@ -1,6 +1,6 @@
 /** @file

 

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

+ Copyright (c) 2011-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

@@ -70,18 +70,15 @@ LCD_INSTANCE mLcdTemplate = {
     {

       {

         HARDWARE_DEVICE_PATH, HW_VENDOR_DP,

-        (UINT8) (sizeof(VENDOR_DEVICE_PATH)),

-        (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8),

+        { (UINT8) (sizeof(VENDOR_DEVICE_PATH)), (UINT8) ((sizeof(VENDOR_DEVICE_PATH)) >> 8) },

       },

       // Hardware Device Path for Lcd

       EFI_CALLER_ID_GUID // Use the driver's GUID

     },

-

     {

       END_DEVICE_PATH_TYPE,

       END_ENTIRE_DEVICE_PATH_SUBTYPE,

-      sizeof(EFI_DEVICE_PATH_PROTOCOL),

-      0

+      { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0}

     }

   }

 };

diff --git a/Omap35xxPkg/MMCHSDxe/MMCHS.c b/Omap35xxPkg/MMCHSDxe/MMCHS.c
index 7d4e22f524..3d0a7c6067 100644
--- a/Omap35xxPkg/MMCHSDxe/MMCHS.c
+++ b/Omap35xxPkg/MMCHSDxe/MMCHS.c
@@ -52,8 +52,7 @@ MMCHS_DEVICE_PATH gMmcHsDevicePath = {
   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    sizeof (EFI_DEVICE_PATH_PROTOCOL),

-    0

+    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }

   }

 };

 

diff --git a/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c b/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c
index 0cbd82bd44..dab932999f 100755
--- a/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c
+++ b/Omap35xxPkg/MmcHostDxe/MmcHostDxe.c
@@ -1,15 +1,15 @@
 /** @file

 *

 *  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.

-*  Copyright (c) 2011, ARM Limited. All rights reserved.

-*  

-*  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        

-*  http://opensource.org/licenses/bsd-license.php                                            

+*  Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.

 *

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+*  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

+*  http://opensource.org/licenses/bsd-license.php

+*

+*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 *

 **/

 

@@ -28,17 +28,17 @@ typedef struct {
 

 MMCHS_DEVICE_PATH gMMCDevicePath = {

   {

-    HARDWARE_DEVICE_PATH,

-    HW_VENDOR_DP,

-    (UINT8)(sizeof(VENDOR_DEVICE_PATH)),

-    (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8),

-    0xb615f1f5, 0x5088, 0x43cd, 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00 

+    {

+      HARDWARE_DEVICE_PATH,

+      HW_VENDOR_DP,

+      { (UINT8)(sizeof(VENDOR_DEVICE_PATH)), (UINT8)((sizeof(VENDOR_DEVICE_PATH)) >> 8) },

+    },

+    { 0xb615f1f5, 0x5088, 0x43cd, { 0x80, 0x9c, 0xa1, 0x6e, 0x52, 0x48, 0x7d, 0x00 } }

   },

   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    sizeof (EFI_DEVICE_PATH_PROTOCOL),

-    0

+    { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }

   }

 };

 

diff --git a/Omap35xxPkg/PciEmulation/PciEmulation.c b/Omap35xxPkg/PciEmulation/PciEmulation.c
index 0cc0faa42c..afa64193a2 100644
--- a/Omap35xxPkg/PciEmulation/PciEmulation.c
+++ b/Omap35xxPkg/PciEmulation/PciEmulation.c
@@ -39,16 +39,16 @@ typedef struct {
 EFI_PCI_IO_DEVICE_PATH PciIoDevicePathTemplate = 

 {

   {

-    { ACPI_DEVICE_PATH, ACPI_DP, sizeof (ACPI_HID_DEVICE_PATH), 0},

+    { ACPI_DEVICE_PATH, ACPI_DP, { sizeof (ACPI_HID_DEVICE_PATH), 0 } },

     EISA_PNP_ID(0x0A03),  // HID

     0                     // UID

   },

   {

-    { HARDWARE_DEVICE_PATH, HW_PCI_DP, sizeof (PCI_DEVICE_PATH), 0},

+    { HARDWARE_DEVICE_PATH, HW_PCI_DP, { sizeof (PCI_DEVICE_PATH), 0 } },

     0,

     0

   },

-  { 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} }

 };

 

 STATIC

@@ -422,12 +422,9 @@ EFI_PCI_IO_PROTOCOL PciIoTemplate =
 {

   PciIoPollMem,

   PciIoPollIo,

-  PciIoMemRead,

-  PciIoMemWrite,

-  PciIoIoRead,

-  PciIoIoWrite,

-  PciIoPciRead,

-  PciIoPciWrite,

+  { PciIoMemRead, PciIoMemWrite },

+  { PciIoIoRead,  PciIoIoWrite },

+  { PciIoPciRead, PciIoPciWrite },

   PciIoCopyMem,

   PciIoMap,

   PciIoUnmap,