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

17 files changed, 77 insertions, 59 deletions

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
index c9f2402eb1..76dd54f0c7 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BBSsupport.c
@@ -24,10 +24,14 @@ Abstract:
 #include "BBSsupport.h"

 

 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {

-  END_DEVICE_PATH_TYPE,

-  END_ENTIRE_DEVICE_PATH_SUBTYPE,

-  END_DEVICE_PATH_LENGTH,

-  0

+  {

+    END_DEVICE_PATH_TYPE,

+    END_ENTIRE_DEVICE_PATH_SUBTYPE,

+    {

+      END_DEVICE_PATH_LENGTH,

+      0

+    }

+  }

 };

 

 VOID

@@ -446,7 +450,7 @@ BdsDeleteAllInvalidLegacyBootOptions (
   LocalBbsTable = NULL;

   BbsEntry      = NULL;

 

-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);

+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -680,7 +684,7 @@ Returns:
   LocalHddInfo  = NULL;

   LocalBbsTable = NULL;

 

-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);

+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**)&LegacyBios);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -985,7 +989,7 @@ Index# is a 16 bit integer, the low byte of it stands for the index in BBS table
   BEVIndex      = 0;

   NewDevPtr     = NULL;

 

-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);

+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -1497,7 +1501,7 @@ BdsRefreshBbsTableForBoot (
   LocalBbsTable = NULL;

   DevType       = BBS_UNKNOWN;

 

-  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);

+  Status        = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);

   if (EFI_ERROR (Status)) {

     return Status;

   }

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
index 7dfad51569..9b84db59d0 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/BootMaint/BootMaint.c
@@ -757,7 +757,7 @@ Returns:
   //

   // There should be only one EFI_HII_PROTOCOL Image

   //

-  Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, &Hii);

+  Status = EfiLibLocateProtocol (&gEfiHiiProtocolGuid, (VOID**)&Hii);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -893,7 +893,7 @@ Returns:
   }

 

   Location  = (UINT8 *) &UpdateData->Data;

-  Status    = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, &LegacyBios);

+  Status    = EfiLibLocateProtocol (&gEfiLegacyBiosProtocolGuid, (VOID**) &LegacyBios);

   if (!EFI_ERROR (Status)) {

     //

     // If LegacyBios Protocol is installed, add 3 tags about legacy boot option

@@ -1240,7 +1240,7 @@ Returns:
   //

   // There should only be one Form Configuration protocol

   //

-  Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, &FormConfig);

+  Status = EfiLibLocateProtocol (&gEfiFormBrowserProtocolGuid, (VOID**) &FormConfig);

   if (EFI_ERROR (Status)) {

     return Status;

   }

diff --git a/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c b/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
index 02be71e789..3de404ba7c 100644
--- a/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
+++ b/EdkUnixPkg/Dxe/PlatformBds/Generic/DeviceMngr/DeviceManager.c
@@ -411,7 +411,7 @@ Returns:
 

   ASSERT (FPCallbackInfo.Data.VideoBIOS <= 1);

 

-  Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), &IfrOptionList);

+  Status = gBS->AllocatePool (EfiBootServicesData, 2 * sizeof (IFR_OPTION), (VOID**) &IfrOptionList);

   if (IfrOptionList != NULL) {

     IfrOptionList[0].Flags        = EFI_IFR_FLAG_INTERACTIVE;

     IfrOptionList[0].Key          = SET_VIDEO_BIOS_TYPE_QUESTION_ID + 0x2000;

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c
index 1bf280b141..0c95b310ed 100644
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscBootInformationData.c
@@ -27,7 +27,7 @@ Abstract:
 //

 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_BOOT_INFORMATION_STATUS_DATA, BootInformationStatus) = {

   EfiBootInformationStatusNoError,  // BootInformationStatus

-  0                                 // BootInformationData

+  {0}                                 // BootInformationData

 };

 

 /* eof - MiscBootInformationData.c */

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscOemStringData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscOemStringData.c
index fdfbd1f2e1..e5116843a1 100644
--- 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.

 //

 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_OEM_STRING_DATA, OemString) = {

-  STRING_TOKEN(STR_MISC_OEM_STRING)

+  { STRING_TOKEN(STR_MISC_OEM_STRING) }

 };

 

 /* eof - MiscOemStringData.c */

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorData.c
index d886a9d8c4..78eac76393 100644
--- 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

   EfiPortConnectorTypeOther,  // PortExternalConnectorType

   EfiPortTypeNone,            // PortType

-  0                           // PortPath

+  {0, 0, 0}                         // PortPath

 };

 

 //

@@ -45,7 +45,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeKeyboard,      // PortType

   // mPs2KbyboardDevicePath                          // PortPath

   //

-  0

+  {0}

 };

 

 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortMouse) = {

@@ -56,7 +56,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortTypeMouse,         // PortType

   // mPs2MouseDevicePath                // PortPath

   //

-  0

+  {0}

 };

 

 

@@ -66,7 +66,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeNone,

   EfiPortConnectorTypeDB9Female,

   EfiPortTypeSerial16550ACompatible,

-  0

+  {0}

 };

 

 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortCom2) = {

@@ -84,7 +84,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOther,

   EfiPortConnectorTypeNone,

   EfiPortTypeOther,

-  0

+  {0}

 };

 

 MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscPortFloppy) = {

@@ -93,7 +93,7 @@ MISC_SUBCLASS_TABLE_DATA(EFI_MISC_PORT_INTERNAL_CONNECTOR_DESIGNATOR_DATA, MiscP
   EfiPortConnectorTypeOnboardFloppy,

   EfiPortConnectorTypeNone,

   EfiPortTypeOther,

-  0

+  {0}

 };

 

 /* eof - MiscPortInternalConnectorDesignatorData.c */

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscPortInternalConnectorDesignatorFunction.c
index 35351aa2df..206c114741 100644
--- 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 };

   STATIC SERIAL_CONN_DEVICE_PATH    mCom1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 0), DP_END };

   STATIC SERIAL_CONN_DEVICE_PATH    mCom2DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0501, 1), DP_END };

-  STATIC PARALLEL_CONN_DEVICE_PATH  mLpt1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };

+  //STATIC PARALLEL_CONN_DEVICE_PATH  mLpt1DevicePath         = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0401, 0), DP_END };

   STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyADevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 0), DP_END };

-  STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyBDevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };

-  STATIC USB_PORT_DEVICE_PATH       mUsb0DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };

-  STATIC USB_PORT_DEVICE_PATH       mUsb1DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };

-  STATIC USB_PORT_DEVICE_PATH       mUsb2DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };

-  STATIC USB_PORT_DEVICE_PATH       mUsb3DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };

-  STATIC IDE_DEVICE_PATH            mIdeDevicePath          = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };

-  STATIC GB_NIC_DEVICE_PATH         mGbNicDevicePath        = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };

+  //STATIC FLOOPY_CONN_DEVICE_PATH    mFloopyBDevicePath      = { DP_ACPI, DP_PCI (0x1F, 0x00), DP_LPC (0x0604, 1), DP_END };

+  //STATIC USB_PORT_DEVICE_PATH       mUsb0DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x00), DP_END };

+  //STATIC USB_PORT_DEVICE_PATH       mUsb1DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x01), DP_END };

+  //STATIC USB_PORT_DEVICE_PATH       mUsb2DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x02), DP_END };

+  //STATIC USB_PORT_DEVICE_PATH       mUsb3DevicePath         = { DP_ACPI, DP_PCI (0x1d, 0x07), DP_END };

+  //STATIC IDE_DEVICE_PATH            mIdeDevicePath          = { DP_ACPI, DP_PCI (0x1F, 0x01), DP_END };

+  //STATIC GB_NIC_DEVICE_PATH         mGbNicDevicePath        = { DP_ACPI, DP_PCI( 0x03,0x00 ),DP_PCI( 0x1F,0x00 ),DP_PCI( 0x07,0x00 ), DP_END };

   EFI_DEVICE_PATH_PROTOCOL          EndDevicePath           = DP_END;

 

   //

diff --git a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c
index bddc0415c7..910564d365 100644
--- a/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c
+++ b/EdkUnixPkg/Dxe/UnixPlatform/MiscSubclass/MiscSubclassDriverEntryPoint.c
@@ -175,7 +175,7 @@ Returns:
   //

   // Locate data hub protocol.

   //

-  EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);

+  EfiStatus = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**) &DataHub);

 

   if (EFI_ERROR (EfiStatus)) {

     DEBUG ((EFI_D_ERROR, "Could not locate DataHub protocol.  %r\n", EfiStatus));

@@ -187,7 +187,7 @@ Returns:
   //

   // Locate hii protocol.

   //

-  EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, &Hii);

+  EfiStatus = gBS->LocateProtocol (&gEfiHiiProtocolGuid, NULL, (VOID**)&Hii);

 

   if (EFI_ERROR (EfiStatus)) {

     DEBUG ((EFI_D_ERROR, "Could not locate Hii protocol.  %r\n", EfiStatus));

@@ -436,7 +436,7 @@ Returns:
   //

   // Locate DataHub protocol.

   //

-  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, &DataHub);

+  Status = gBS->LocateProtocol (&gEfiDataHubProtocolGuid, NULL, (VOID**)&DataHub);

   if (EFI_ERROR (Status)) {

     return ;

   }

@@ -447,7 +447,7 @@ Returns:
     Status = gBS->OpenProtocol (

                     HandleBuffer[HandleIndex],

                     &gEfiUnixIoProtocolGuid,

-                    &UnixIo,

+                    (VOID**)&UnixIo,

                     Context,

                     NULL,

                     EFI_OPEN_PROTOCOL_GET_PROTOCOL

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c
index 0db3b1c358..b4bbb328f4 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/ComponentName.c
@@ -173,7 +173,7 @@ UnixSimpleFileSystemComponentNameGetControllerName (
   Status = gBS->OpenProtocol (

                   ControllerHandle,

                   &gEfiSimpleFileSystemProtocolGuid,

-                  &SimpleFileSystem,

+                  (VOID**)&SimpleFileSystem,

                   gUnixSimpleFileSystemDriverBinding.DriverBindingHandle,

                   ControllerHandle,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/SimpleFileSystem/UnixSimpleFileSystem.c
index 2a745cbdd2..42a361b53d 100644
--- 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;

-  CHAR16                            *TempFileName;

+  //CHAR16                            *TempFileName;

   char                              *ParseFileName;

   char                              *GuardPointer;

   CHAR8                             TempChar;

@@ -863,7 +863,7 @@ OpenRoot:
 

         LastError = PrivateFile->UnixThunk->GetErrno ();

         if (LastError != EEXIST) {
-          gBS->FreePool (TempFileName);

+          //gBS->FreePool (TempFileName);

           Status = EFI_ACCESS_DENIED;

           goto Done;

         }

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
index b52a471531..2045f8fdd6 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/ComponentName.c
@@ -167,7 +167,7 @@ UnixBusDriverComponentNameGetControllerName (
   Status = gBS->OpenProtocol (

                   ChildHandle,

                   &gEfiUnixIoProtocolGuid,

-                  &UnixIo,

+                  (VOID**)&UnixIo,

                   gUnixBusDriverBinding.DriverBindingHandle,

                   ChildHandle,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

diff --git a/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c b/EdkUnixPkg/Dxe/UnixThunk/Bus/UnixBusDriver/UnixBusDriver.c
index 5346774ae2..0e93e48f5c 100644
--- 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

 //

 static EFI_GUID gUnixBusDriverGuid = {

-  0x419f582, 0x625, 0x4531, 0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc

+  0x419f582, 0x625, 0x4531, {0x8a, 0x33, 0x85, 0xa9, 0x96, 0x5c, 0x95, 0xbc}

 };

 

 //

diff --git a/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c b/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c
index e7f4a24ec3..3520bf7d5d 100644
--- a/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c
+++ b/EdkUnixPkg/Dxe/UnixThunk/UnixThunk/UnixThunk.c
@@ -33,17 +33,23 @@ Abstract:
 //

 static UNIX_THUNK_DEVICE_PATH mUnixThunkDevicePath = {

   {

-    HARDWARE_DEVICE_PATH,

-    HW_VENDOR_DP,

-    (UINT8) (sizeof (VENDOR_DEVICE_PATH)),

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

+    {

+      HARDWARE_DEVICE_PATH,

+      HW_VENDOR_DP,

+      {

+        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),

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

+      }

+    },

     EFI_UNIX_THUNK_PROTOCOL_GUID,

   },

   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    END_DEVICE_PATH_LENGTH,

-    0

+    {

+      END_DEVICE_PATH_LENGTH,

+      0

+    }

   }

 };

 

diff --git a/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c b/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c
index 84c40f4314..fad36f8f0e 100644
--- a/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c
+++ b/EdkUnixPkg/RuntimeDxe/FvbServices/FWBlockService.c
@@ -1255,7 +1255,7 @@ Returns:
   Status = gBS->AllocatePool (

                   EfiRuntimeServicesData,

                   sizeof (ESAL_FWB_GLOBAL),

-                  &mFvbModuleGlobal

+                  (VOID**) &mFvbModuleGlobal

                   );

   ASSERT_EFI_ERROR (Status);

 

@@ -1309,7 +1309,7 @@ Returns:
   Status = gBS->AllocatePool (

                   EfiRuntimeServicesData,

                   BufferSize,

-                  &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]

+                  (VOID**) &mFvbModuleGlobal->FvInstance[FVB_PHYSICAL]

                   );

   ASSERT_EFI_ERROR (Status);

 

@@ -1395,7 +1395,7 @@ Returns:
     Status = gBS->AllocatePool (

                     EfiRuntimeServicesData,

                     sizeof (EFI_FW_VOL_BLOCK_DEVICE),

-                    &FvbDevice

+                    (VOID**) &FvbDevice

                     );

     ASSERT_EFI_ERROR (Status);

 

@@ -1437,7 +1437,7 @@ Returns:
       Status = gBS->HandleProtocol (

                       FwbHandle,

                       &gEfiFirmwareVolumeBlockProtocolGuid,

-                      &OldFwbInterface

+                      (VOID**)&OldFwbInterface

                       );

       ASSERT_EFI_ERROR (Status);

 

@@ -1484,7 +1484,7 @@ Returns:
   Status = gBS->AllocatePool (

                   EfiRuntimeServicesData,

                   MaxLbaSize,

-                  &mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL]

+                  (VOID**)&mFvbModuleGlobal->FvbScratchSpace[FVB_PHYSICAL]

                   );

   ASSERT_EFI_ERROR (Status);

 

diff --git a/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c b/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c
index d079423af8..5c152ea65f 100644
--- a/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c
+++ b/EdkUnixPkg/RuntimeDxe/FvbServices/FvbInfo.c
@@ -62,13 +62,17 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       },  // Reserved[3]

       1,  // Revision

       {

-        RECOVERY_BOIS_BLOCK_NUM,

-        FVB_MEDIA_BLOCK_SIZE,

+        {

+          RECOVERY_BOIS_BLOCK_NUM,

+          FVB_MEDIA_BLOCK_SIZE

+        }

       }

     },

     {

-      0,

-      0

+      {

+        0,

+        0

+      }

     }

   },

   //

@@ -95,13 +99,17 @@ EFI_FVB_MEDIA_INFO  mPlatformFvbMediaInfo[] = {
       },  // Reserved[3]

       1,  // Revision

       {

-        SYSTEM_NV_BLOCK_NUM,

-        FVB_MEDIA_BLOCK_SIZE,

+        {

+          SYSTEM_NV_BLOCK_NUM,

+          FVB_MEDIA_BLOCK_SIZE

+        }

       }

     },

     {

-      0,

-      0

+      {

+        0,

+        0

+      }

     }

   }

 };

diff --git a/EdkUnixPkg/Sec/UnixThunk.c b/EdkUnixPkg/Sec/UnixThunk.c
index a94cb38d10..46b0e34c55 100644
--- 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 = {

   EFI_UNIX_THUNK_PROTOCOL_SIGNATURE,

diff --git a/Tools/Conf/tools_def.template b/Tools/Conf/tools_def.template
index 54d181b11a..e8e894d1f5 100644
--- 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

 *_UNIXGCC_X64_VFRPP_NAME    = gcc

 

-*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h

-*_UNIXGCC_X64_CC_FLAGS      = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -D_EFI_P64

+*_UNIXGCC_IA32_CC_FLAGS     = -Os -fshort-wchar -fno-strict-aliasing -Wall -Werror -Wno-missing-braces -c -include ${DEST_DIR_DEBUG}/AutoGen.h

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

 *_UNIXGCC_*_DLINK_FLAGS     = -nostdlib -O2 --gc-sections --dll --export-all-symbols --entry _${ENTRYPOINT}

 *_UNIXGCC_*_ASM_FLAGS       = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=_##name

 *_UNIXGCC_*_PP_FLAGS        = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h