Refine MdeModulePkg to pass GCC build.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6575 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 709720c200d3230629482eee810deb6daa1f4f50..48f750d444fb383c751dfb1684de69eeb7bb7672 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -18,10 +18,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "FrontPage.h"\r
 \r
 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {\r
-  END_DEVICE_PATH_TYPE,\r
-  END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-  END_DEVICE_PATH_LENGTH,\r
-  0\r
+  {\r
+    END_DEVICE_PATH_TYPE,\r
+    END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
+    {\r
+      END_DEVICE_PATH_LENGTH,\r
+      0\r
+    }\r
+  }\r
 };\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c b/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c
index 00ef4102292883515ccacb67993600bcee1170a9..5a22e77a9ae86853e4cea5feba23ae27f076bd4b 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c
+++ b/MdeModulePkg/Universal/BdsDxe/BootMaint/Data.c
@@ -38,7 +38,7 @@ UINT16              TerminalType[] = {
 ///\r
 BM_MENU_OPTION      FsOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -47,7 +47,7 @@ BM_MENU_OPTION      FsOptionMenu = {
 ///\r
 BM_MENU_OPTION      ConsoleInpMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -56,7 +56,7 @@ BM_MENU_OPTION      ConsoleInpMenu = {
 ///\r
 BM_MENU_OPTION      ConsoleOutMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -65,7 +65,7 @@ BM_MENU_OPTION      ConsoleOutMenu = {
 ///\r
 BM_MENU_OPTION      ConsoleErrMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -74,7 +74,7 @@ BM_MENU_OPTION      ConsoleErrMenu = {
 ///\r
 BM_MENU_OPTION      BootOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -83,7 +83,7 @@ BM_MENU_OPTION      BootOptionMenu = {
 ///\r
 BM_MENU_OPTION      DriverOptionMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -92,7 +92,7 @@ BM_MENU_OPTION      DriverOptionMenu = {
 ///\r
 BM_MENU_OPTION      LegacyFDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -101,7 +101,7 @@ BM_MENU_OPTION      LegacyFDMenu = {
 ///\r
 BM_MENU_OPTION      LegacyHDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -110,7 +110,7 @@ BM_MENU_OPTION      LegacyHDMenu = {
 ///\r
 BM_MENU_OPTION      LegacyCDMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -119,7 +119,7 @@ BM_MENU_OPTION      LegacyCDMenu = {
 ///\r
 BM_MENU_OPTION      LegacyNETMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -128,7 +128,7 @@ BM_MENU_OPTION      LegacyNETMenu = {
 ///\r
 BM_MENU_OPTION      LegacyBEVMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -137,7 +137,7 @@ BM_MENU_OPTION      LegacyBEVMenu = {
 ///\r
 BM_MENU_OPTION      DirectoryMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
@@ -146,13 +146,13 @@ BM_MENU_OPTION      DirectoryMenu = {
 ///\r
 BM_MENU_OPTION      DriverMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r
 BM_MENU_OPTION      TerminalMenu = {\r
   BM_MENU_OPTION_SIGNATURE,\r
-  NULL,\r
+  {NULL},\r
   0\r
 };\r
 \r

diff --git a/MdeModulePkg/Universal/BdsDxe/FrontPage.h b/MdeModulePkg/Universal/BdsDxe/FrontPage.h
index f774351d4c03dcf73f695d300af48688e4dbbebc..aaefbd565a725eb24c6df62ffff0ce449e768cb0 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/FrontPage.h
+++ b/MdeModulePkg/Universal/BdsDxe/FrontPage.h
@@ -43,7 +43,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #define FRONT_PAGE_FORMSET_GUID \\r
   { \\r
-    0x9e0c30bc, 0x3f06, 0x4ba6, 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe \\r
+    0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe} \\r
   }\r
 \r
 #define FRONT_PAGE_CALLBACK_DATA_SIGNATURE  EFI_SIGNATURE_32 ('F', 'P', 'C', 'B')\r

diff --git a/MdeModulePkg/Universal/BdsDxe/String.c b/MdeModulePkg/Universal/BdsDxe/String.c
index b78b22f97e1273242fb4fa73c73f97784d174af4..d1c6651977054658105b8d8eed6be7a0d525e9f3 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/String.c
+++ b/MdeModulePkg/Universal/BdsDxe/String.c
@@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 EFI_HII_HANDLE gStringPackHandle;\r
 \r
 EFI_GUID mBdsStringPackGuid = {\r
-  0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a\r
+  0x7bac95d3, 0xddf, 0x42f3, {0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a}\r
 };\r
 \r
 /**\r

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 6a0aad5716eac3b4fe9c89a58aea7a4d5be132b3..ada795b99c1fd1007610d1ccf1ebba06062c41b4 100644 (file)
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -132,7 +132,7 @@ EFI_HII_DATABASE_PROTOCOL   *mHiiDatabase;
 EFI_HII_FONT_PROTOCOL       *mHiiFont;\r
 BOOLEAN                     mFirstAccessFlag = TRUE;\r
 \r
-EFI_GUID             mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, 0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad};\r
+EFI_GUID             mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, {0xac, 0x8d, 0xd6, 0x1d, 0xfb, 0x7b, 0xc6, 0xad}};\r
 \r
 CHAR16               mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };\r
 \r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 171d3baf08f277fc7442e7f477e2a9d0234060b8..453e474b6719b865aacd8dfe7e03fcd75a577514 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -27,12 +27,12 @@ Revision History:
 \r
 #define FORMSET_GUID \\r
   { \\r
-    0xA04A27f4, 0xDF00, 0x4D42, 0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D \\r
+    0xA04A27f4, 0xDF00, 0x4D42, {0xB5, 0x52, 0x39, 0x51, 0x13, 0x02, 0x11, 0x3D} \\r
   }\r
 \r
 #define INVENTORY_GUID \\r
   { \\r
-    0xb3f56470, 0x6141, 0x4621, 0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8 \\r
+    0xb3f56470, 0x6141, 0x4621, {0x8f, 0x19, 0x70, 0x4e, 0x57, 0x7a, 0xa9, 0xe8} \\r
   }\r
 \r
 #define CONFIGURATION_VARSTORE_ID    0x1234\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 841ea09a01bc430f9af5d7f7c7d8c694018177b9..40f7277a677ae0d35d8b4db5d1003dd8d3ca0fb5 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -1909,13 +1909,13 @@ EfiPxeBcSetStationIP (
   }\r
 \r
   if (NewStationIp != NULL) {\r
-    Mode->StationIp    = *NewStationIp;\r
-    Private->StationIp = *NewStationIp;\r
+    CopyMem (&Mode->StationIp, NewStationIp, sizeof (EFI_IP_ADDRESS));\r
+    CopyMem (&Private->StationIp, NewStationIp, sizeof (EFI_IP_ADDRESS));\r
   }\r
 \r
   if (NewSubnetMask != NULL) {\r
-    Mode->SubnetMask    = *NewSubnetMask;\r
-    Private->SubnetMask = *NewSubnetMask;\r
+    CopyMem (&Mode->SubnetMask, NewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
+    CopyMem (&Private->SubnetMask ,NewSubnetMask, sizeof (EFI_IP_ADDRESS));\r
   }\r
 \r
   Private->AddressIsOk = TRUE;\r

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
index 5ac780c8bf30222eb3bbec5f08f034baf7ff025b..f1f4e1c801f455f2254674f68bd9f69c11ad429c 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.h
@@ -70,7 +70,7 @@ extern UINT8  PlatOverMngrStrings[];
 //\r
 #define PLAT_OVER_MNGR_GUID \\r
   { \\r
-    0x8614567d, 0x35be, 0x4415, 0x8d, 0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0 \\r
+    0x8614567d, 0x35be, 0x4415, {0x8d, 0x88, 0xbd, 0x7d, 0xc, 0x9c, 0x70, 0xc0} \\r
   }\r
 \r
 typedef struct {\r