fix some minor warning for unix package

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

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
index c9f2402eb140de7171062caf5b28cad425d20ba9..76dd54f0c7521f0ed1327cf60795a507d7273eed 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
@@ -24,10 +24,14 @@ Abstract:
 #include "BBSsupport.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
 VOID\r
@@ -446,7 +450,7 @@ BdsDeleteAllInvalidLegacyBootOptions (
   LocalBbsTable = NULL;\r
   BbsEntry      = NULL;\r
 \r
-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -680,7 +684,7 @@ Returns:
   LocalHddInfo  = NULL;\r
   LocalBbsTable = NULL;\r
 \r
-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**)&LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -985,7 +989,7 @@ Index# is a 16 bit integer, the low byte of it stands for the index in BBS table
   BEVIndex      = 0;\r
   NewDevPtr     = NULL;\r
 \r
-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -1497,7 +1501,7 @@ BdsRefreshBbsTableForBoot (
   LocalBbsTable = NULL;\r
   DevType       = BBS_UNKNOWN;\r
 \r
-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
index 7dfad5156941b7994f35beefc874f80824c855a2..9b84db59d0aa498b4e7bf5ac1c7f3d0e68253fc9 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
@@ -757,7 +757,7 @@ Returns:
   //\r
   // There should be only one EFI_HII_PROTOCOL Image\r
   //\r
-  Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);\r
+  Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -893,7 +893,7 @@ Returns:
   }\r
 \r
   Location  = (UINT8 *) &UpdateData->Data;\r
-  Status    = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);\r
+  Status    = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // If LegacyBios Protocol is installed, add 3 tags about legacy boot option\r
@@ -1240,7 +1240,7 @@ Returns:
   //\r
   // There should only be one Form Configuration protocol\r
   //\r
-  Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, &FormConfig);\r
+  Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, (VOID**) &FormConfig);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
index 02be71e789ed847a31ce2e784a7cc9ffad4cebc6..3de404ba7c166e991cbfb9dc87cae565e9a0dffc 100644 (file)
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
@@ -411,7 +411,7 @@ Returns:
 \r
   ASSERT (FPCallbackInfo.Data.VideoBIOS <= 1);\r
 \r
-  Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), &IfrOptionList);\r
+  Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), (VOID**) &IfrOptionList);\r
   if (IfrOptionList != NULL) {\r
     IfrOptionList[0].Flags        = EFI_IFR_FLAG_INTERACTIVE;\r
     IfrOptionList[0].Key          = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000;\r

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c
index 1bf280b1416dd69eea165d3d50f93fb27b05291b..0c95b310ed8eac4d1c5c5423b57ecd74400da077 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c
@@ -27,7 +27,7 @@ Abstract:
 //\r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_BOOT_INFORMATION_STATUS_DATA, BootInformationStatus) = {\r
   EfiBootInformationStatusNoError,  // BootInformationStatus\r
-  0                                 // BootInformationData\r
+  {0}                                 // BootInformationData\r
 };\r
 \r
 /* eof - MiscBootInformationData.c */\r

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscOemStringData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscOemStringData.c
index fdfbd1f2e1afa6a4ca2e229d0057e07315ce1c43..e5116843a16bcefc8fbdb010bac51cac528aa6a7 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscOemStringData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscOemStringData.c
@@ -26,7 +26,7 @@ Abstract:
 // Static (possibly build generated) Bios Vendor data.\r
 //\r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_OEM_STRING_DATA, OemString) = {\r
-  STRING_TOKEN(STR_MISC_OEM_STRING)\r
+  { STRING_TOKEN(STR_MISC_OEM_STRING) }\r
 };\r
 \r
 /* eof - MiscOemStringData.c */\r

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
index d886a9d8c40185e09b01945f73830302d26fc4a0..78eac76393a37d1192356ba94cb8cba190ca86d6 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
@@ -31,7 +31,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOther,  // PortInternalConnectorType\r
   EfiPortConnectorTypeOther,  // PortExternalConnectorType\r
   EfiPortTypeNone,            // PortType\r
-  0                           // PortPath\r
+  {0, 0, 0}                         // PortPath\r
 };\r
 \r
 //\r
@@ -45,7 +45,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeKeyboard,      // PortType\r
   // mPs2KbyboardDevicePath                          // PortPath\r
   //\r
-  0\r
+  {0}\r
 };\r
 \r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortMouse) = {\r
@@ -56,7 +56,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeMouse,         // PortType\r
   // mPs2MouseDevicePath                // PortPath\r
   //\r
-  0\r
+  {0}\r
 };\r
 \r
 \r
@@ -66,7 +66,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeNone,\r
   EfiPortConnectorTypeDB9Female,\r
   EfiPortTypeSerial16550ACompatible,\r
-  0\r
+  {0}\r
 };\r
 \r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortCom2) = {\r
@@ -84,7 +84,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOther,\r
   EfiPortConnectorTypeNone,\r
   EfiPortTypeOther,\r
-  0\r
+  {0}\r
 };\r
 \r
 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortFloppy) = {\r
@@ -93,7 +93,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOnboardFloppy,\r
   EfiPortConnectorTypeNone,\r
   EfiPortTypeOther,\r
-  0\r
+  {0}\r
 };\r
 \r
 /* eof - MiscPortInternalConnectorDesignatorData.c */\r

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
index 35351aa2df6ecf44b695cba8769d0ae0be21e519..206c114741c211bb52659a8c76065351abbf6cc4 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
@@ -74,15 +74,15 @@ Returns:
   STATIC PS2_CONN_DEVICE_PATH       mPs2MouseDevicePath     = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0303, 1), DP_END };\r
   STATIC SERIAL_CONN_DEVICE_PATH    mCom1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 0), DP_END };\r
   STATIC SERIAL_CONN_DEVICE_PATH    mCom2DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 1), DP_END };\r
-  STATIC PARALLEL_CONN_DEVICE_PATH  mLpt1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };\r
+  //STATIC PARALLEL_CONN_DEVICE_PATH  mLpt1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };\r
   STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyADevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 0), DP_END };\r
-  STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyBDevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };\r
-  STATIC USB_PORT_DEVICE_PATH       mUsb0DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };\r
-  STATIC USB_PORT_DEVICE_PATH       mUsb1DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };\r
-  STATIC USB_PORT_DEVICE_PATH       mUsb2DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };\r
-  STATIC USB_PORT_DEVICE_PATH       mUsb3DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };\r
-  STATIC IDE_DEVICE_PATH            mIdeDevicePath          = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };\r
-  STATIC GB_NIC_DEVICE_PATH         mGbNicDevicePath        = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };\r
+  //STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyBDevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };\r
+  //STATIC USB_PORT_DEVICE_PATH       mUsb0DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };\r
+  //STATIC USB_PORT_DEVICE_PATH       mUsb1DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };\r
+  //STATIC USB_PORT_DEVICE_PATH       mUsb2DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };\r
+  //STATIC USB_PORT_DEVICE_PATH       mUsb3DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };\r
+  //STATIC IDE_DEVICE_PATH            mIdeDevicePath          = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };\r
+  //STATIC GB_NIC_DEVICE_PATH         mGbNicDevicePath        = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };\r
   EFI_DEVICE_PATH_PROTOCOL          EndDevicePath           = DP_END;\r
 \r
   //\r

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c
index bddc0415c729e33e257c0ad3ecbb034559892454..910564d365b63d16e8a1d4e70313699c6f6c9236 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c
@@ -175,7 +175,7 @@ Returns:
   //\r
   // Locate data hub protocol.\r
   //\r
-  EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);\r
+  EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**) &DataHub);\r
 \r
   if (EFI_ERROR (EfiStatus)) {\r
     DEBUG ((EFI_D_ERROR, "Could not locate DataHub protocol.  %r\n", EfiStatus));\r
@@ -187,7 +187,7 @@ Returns:
   //\r
   // Locate hii protocol.\r
   //\r
-  EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);\r
+  EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, (VOID**)&Hii);\r
 \r
   if (EFI_ERROR (EfiStatus)) {\r
     DEBUG ((EFI_D_ERROR, "Could not locate Hii protocol.  %r\n", EfiStatus));\r
@@ -436,7 +436,7 @@ Returns:
   //\r
   // Locate DataHub protocol.\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);\r
+  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**)&DataHub);\r
   if (EFI_ERROR (Status)) {\r
     return ;\r
   }\r
@@ -447,7 +447,7 @@ Returns:
     Status = gBS->OpenProtocol (\r
                     HandleBuffer[HandleIndex],\r
                     &gEfiUnixIoProtocolGuid,\r
-                    &UnixIo,\r
+                    (VOID**)&UnixIo,\r
                     Context,\r
                     NULL,\r
                     EFI_OPEN_PROTOCOL_GET_PROTOCOL\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c
index 0db3b1c35820aeea0dcb31c96036b9fe5ff11127..b4bbb328f4573553d057cf4c3befeed47f7952d4 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c
@@ -173,7 +173,7 @@ UnixSimpleFileSystemComponentNameGetControllerName (
   Status = gBS->OpenProtocol (\r
                   ControllerHandle,\r
                   &gEfiSimpleFileSystemProtocolGuid,\r
-                  &SimpleFileSystem,\r
+                  (VOID**)&SimpleFileSystem,\r
                   gUnixSimpleFileSystemDriverBinding.DriverBindingHandle,\r
                   ControllerHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
index 2a745cbdd22da7e6edf37901f883db78fbb729f8..42a361b53dc602d98709828a6f31ff1ab33e215c 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
@@ -632,7 +632,7 @@ Returns:
   CHAR16                            *Src;
   char                              *Dst;
   CHAR8                             *RealFileName;\r
-  CHAR16                            *TempFileName;\r
+  //CHAR16                            *TempFileName;\r
   char                              *ParseFileName;\r
   char                              *GuardPointer;\r
   CHAR8                             TempChar;\r
@@ -863,7 +863,7 @@ OpenRoot:
 \r
         LastError = PrivateFile->UnixThunk->GetErrno ();\r
         if (LastError != EEXIST) {
-          gBS->FreePool (TempFileName);\r
+          //gBS->FreePool (TempFileName);\r
           Status = EFI_ACCESS_DENIED;\r
           goto Done;\r
         }\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
index b52a4715318ad54737599f02b65e7b805b7e0742..2045f8fdd603b585bef1304c8ee1cf59472b0284 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
@@ -167,7 +167,7 @@ UnixBusDriverComponentNameGetControllerName (
   Status = gBS->OpenProtocol (\r
                   ChildHandle,\r
                   &gEfiUnixIoProtocolGuid,\r
-                  &UnixIo,\r
+                  (VOID**)&UnixIo,\r
                   gUnixBusDriverBinding.DriverBindingHandle,\r
                   ChildHandle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
index 5346774ae211baa47ddd769a74176b9477b3f5c9..0e93e48f5c8b6b813d012427816d93f46e09ec16 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
@@ -97,7 +97,7 @@ EFI_UNIX_UGA            - Builds UGA Windows of Width and Height
 // Define GUID for the Unix Bus Driver\r
 //\r
 static EFI_GUID gUnixBusDriverGuid = {\r
-  0x419f582, 0x625, 0x4531, 0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc\r
+  0x419f582, 0x625, 0x4531, {0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc}\r
 };\r
 \r
 //\r

diff --git a/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c b/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c
index e7f4a24ec3b066506fc9154ed73d2d558e6cc7a1..3520bf7d5de9b9b4d0a958b536771752d0a77647 100644 (file)
--- a/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c
@@ -33,17 +33,23 @@ Abstract:
 //\r
 static UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {\r
   {\r
-    HARDWARE_DEVICE_PATH,\r
-    HW_VENDOR_DP,\r
-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-    (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8),\r
+    {\r
+      HARDWARE_DEVICE_PATH,\r
+      HW_VENDOR_DP,\r
+      {\r
+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+      }\r
+    },\r
     EFI_UNIX_THUNK_PROTOCOL_GUID,\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
-    END_DEVICE_PATH_LENGTH,\r
-    0\r
+    {\r
+      END_DEVICE_PATH_LENGTH,\r
+      0\r
+    }\r
   }\r
 };\r
 \r

diff --git a/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c b/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c
index 84c40f4314084cc62972db757c449d8acb2697c3..fad36f8f0e9fc67490e8fef2f9abf9313356ef79 100644 (file)
--- a/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c
+++ b/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c
@@ -1255,7 +1255,7 @@ Returns:
   Status = gBS->AllocatePool (\r
                   EfiRuntimeServicesData,\r
                   sizeof (ESAL_FWB_GLOBAL),\r
-                  &mFvbModuleGlobal\r
+                  (VOID**) &mFvbModuleGlobal\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1309,7 +1309,7 @@ Returns:
   Status = gBS->AllocatePool (\r
                   EfiRuntimeServicesData,\r
                   BufferSize,\r
-                  &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]\r
+                  (VOID**) &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1395,7 +1395,7 @@ Returns:
     Status = gBS->AllocatePool (\r
                     EfiRuntimeServicesData,\r
                     sizeof (EFI_FW_VOL_BLOCK_DEVICE),\r
-                    &FvbDevice\r
+                    (VOID**) &FvbDevice\r
                     );\r
     ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1437,7 +1437,7 @@ Returns:
       Status = gBS->HandleProtocol (\r
                       FwbHandle,\r
                       &gEfiFirmwareVolumeBlockProtocolGuid,\r
-                      &OldFwbInterface\r
+                      (VOID**)&OldFwbInterface\r
                       );\r
       ASSERT_EFI_ERROR (Status);\r
 \r
@@ -1484,7 +1484,7 @@ Returns:
   Status = gBS->AllocatePool (\r
                   EfiRuntimeServicesData,\r
                   MaxLbaSize,\r
-                  &mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL]\r
+                  (VOID**)&mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL]\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r

diff --git a/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c b/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c
index d079423af8fb9ccd8613eb5d4615ee1d8d2ab216..5c152ea65f358f6b046168acb2638a51abdcc879 100644 (file)
--- a/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c
+++ b/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c
@@ -62,13 +62,17 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       },  // Reserved[3]\r
       1,  // Revision\r
       {\r
-        RECOVERY_BOIS_BLOCK_NUM,\r
-        FVB_MEDIA_BLOCK_SIZE,\r
+        {\r
+          RECOVERY_BOIS_BLOCK_NUM,\r
+          FVB_MEDIA_BLOCK_SIZE\r
+        }\r
       }\r
     },\r
     {\r
-      0,\r
-      0\r
+      {\r
+        0,\r
+        0\r
+      }\r
     }\r
   },\r
   //\r
@@ -95,13 +99,17 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       },  // Reserved[3]\r
       1,  // Revision\r
       {\r
-        SYSTEM_NV_BLOCK_NUM,\r
-        FVB_MEDIA_BLOCK_SIZE,\r
+        {\r
+          SYSTEM_NV_BLOCK_NUM,\r
+          FVB_MEDIA_BLOCK_SIZE\r
+        }\r
       }\r
     },\r
     {\r
-      0,\r
-      0\r
+      {\r
+        0,\r
+        0\r
+      }\r
     }\r
   }\r
 };\r

diff --git a/EdkUnixPkg/Sec/UnixThunk.c b/EdkUnixPkg/Sec/UnixThunk.c
index a94cb38d109b0b0acaf96f1d8ad83d6261c7a680..46b0e34c55d2df820d6814cfc52432d3f3f2ca6f 100644 (file)
--- a/EdkUnixPkg/Sec/UnixThunk.c
+++ b/EdkUnixPkg/Sec/UnixThunk.c
@@ -147,7 +147,7 @@ GetErrno(void)
 }
 
 extern EFI_STATUS
-UgaCreate(struct _EFI_UNIX_UGA_IO_PROTOCOL *UgaIo, CONST CHAR16 *Title);
+UgaCreate(struct _EFI_UNIX_UGA_IO_PROTOCOL **UgaIo, CONST CHAR16 *Title);
 
 EFI_UNIX_THUNK_PROTOCOL mUnixThunkTable = {\r
   EFI_UNIX_THUNK_PROTOCOL_SIGNATURE,\r

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 54d181b11af96b607803f22908c1d04209bc81e1..e8e894d1f5d59286c4c68defc76b4aaf3e2b935e 100644 (file)
--- a/Tools/Conf/tools_def.template
+++ b/Tools/Conf/tools_def.template
@@ -340,8 +340,8 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
 *_UNIXGCC_X64_PP_NAME       = gcc\r
 *_UNIXGCC_X64_VFRPP_NAME    = gcc\r
 \r
-*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
-*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
+*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h\r
+*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64\r
 *_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}\r
 *_UNIXGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name\r
 *_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h\r