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

4 files changed, 14 insertions, 18 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c
index 4365e51..33524c0 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/NorFlashArmRealViewEbLib/NorFlashArmRealViewEb.c
@@ -1,6 +1,6 @@
 /** @file

 

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

@@ -25,7 +25,7 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = {
     ARM_EB_SMB_NOR_BASE,

     SIZE_128KB * 512,

     SIZE_128KB,

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

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

   }

 };

 

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
index 6a0b319..a136bff 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/NorFlashArmVExpressLib/NorFlashArmVExpress.c
@@ -1,6 +1,6 @@
 /** @file

 

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

@@ -26,28 +26,28 @@ NOR_FLASH_DESCRIPTION mNorFlashDevices[NOR_FLASH_DEVICE_COUNT] = {
     ARM_VE_SMB_NOR0_BASE,

     SIZE_256KB * 255,

     SIZE_256KB,

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

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

   },

   { // BootMon non-volatile storage

     ARM_VE_SMB_NOR0_BASE,

     ARM_VE_SMB_NOR0_BASE + SIZE_256KB * 255,

     SIZE_64KB * 4,

     SIZE_64KB,

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

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

   },

   { // UEFI

     ARM_VE_SMB_NOR1_BASE,

     ARM_VE_SMB_NOR1_BASE,

     SIZE_256KB * 255,

     SIZE_256KB,

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

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

   },

   { // UEFI Variable Services non-volatile storage

     ARM_VE_SMB_NOR1_BASE,

     ARM_VE_SMB_NOR1_BASE + SIZE_256KB * 255,

     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

     SIZE_64KB,

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

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

   }

 };

 

diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
index b423364..0091c75 100644
--- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c
+++ b/ArmPlatformPkg/Drivers/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

@@ -43,7 +43,7 @@ LCD_INSTANCE mLcdTemplate = {
     0, // HorizontalResolution

     0, // VerticalResolution

     PixelBltOnly, // PixelFormat

-    0, // PixelInformation

+    { 0 }, // PixelInformation

     0, // PixelsPerScanLine

   },

   {

@@ -64,8 +64,7 @@ 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

@@ -74,8 +73,7 @@ LCD_INSTANCE mLcdTemplate = {
     {

       END_DEVICE_PATH_TYPE,

       END_ENTIRE_DEVICE_PATH_SUBTYPE,

-      sizeof(EFI_DEVICE_PATH_PROTOCOL),

-      0

+      { sizeof(EFI_DEVICE_PATH_PROTOCOL), 0 }

     }

   },

   (EFI_EVENT) NULL // ExitBootServicesEvent

diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
index 4fac201..a593379 100644
--- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
+++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.c
@@ -86,16 +86,14 @@ NOR_FLASH_INSTANCE  mNorFlashInstanceTemplate = {
       {

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

       },

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

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

     },

     {

       END_DEVICE_PATH_TYPE,

       END_ENTIRE_DEVICE_PATH_SUBTYPE,

-      sizeof (EFI_DEVICE_PATH_PROTOCOL),

-      0

+      { sizeof (EFI_DEVICE_PATH_PROTOCOL), 0 }

     }

     } // DevicePath

 };