Fix some GCC build errors.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: zwei4 <david.wei@intel.com>

7 files changed, 13 insertions, 14 deletions

diff --git a/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c b/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
index 82efcfe366..ef45fdb6bf 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/S3/SmramSaveInfoHandlerSmm/SmramSaveInfoHandlerSmm.c
@@ -1,7 +1,7 @@
 /** @file

   A helper driver to save information to SMRAM after SMRR is enabled.

 

-  Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -19,7 +19,7 @@
 

 #define EFI_SMRAM_CPU_NVS_HEADER_GUID \

   { \

-    0x429501d9, 0xe447, 0x40f4, 0x86, 0x7b, 0x75, 0xc9, 0x3a, 0x1d, 0xb5, 0x4e \

+    0x429501d9, 0xe447, 0x40f4, {0x86, 0x7b, 0x75, 0xc9, 0x3a, 0x1d, 0xb5, 0x4e} \

   }

 

 GLOBAL_REMOVE_IF_UNREFERENCED UINT8   mSmiDataRegister;

diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
index f52cad23ff..b511e96cc3 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscNumberOfInstallableLanguagesFunction.c
@@ -48,7 +48,7 @@ CurrentLanguageMatch (
     return;

   }

 

-  GetEfiGlobalVariable2 (L"PlatformLang", &CurrentLang, NULL);

+  GetEfiGlobalVariable2 (L"PlatformLang", (VOID **)&CurrentLang, NULL);

   DefaultLang  = (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLang);

   BestLanguage = GetBestLanguage (

                    Languages,

diff --git a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
index 0382858feb..68d68d3272 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/Smbios/SmBiosMiscDxe/MiscOemType0x94Function.c
@@ -1,7 +1,7 @@
 /** @file

   The function that processes the Smbios data type 0x94.

 

-  Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>

 

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

@@ -30,7 +30,7 @@
 #include <Protocol/CpuIo2.h>

 #include <Library/IoLib.h>

 #include <Library/PlatformSecureDefaultsLib.h>

-#include <Library/I2clib.h>

+#include <Library/I2CLib.h>

 #include <Library/CpuIA32.h>

 #include <Library/DriverLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

@@ -1576,7 +1576,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscOemType0x94)
 

   Status = EfiCreateEventReadyToBootEx (

              TPL_CALLBACK,

-             AddSmbiosT0x94Callback,

+             (EFI_EVENT_NOTIFY)AddSmbiosT0x94Callback,

              RecordData,

              &AddSmbiosT0x94CallbackEvent

              );

diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c
index 03bf27d6e5..06705c8b65 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbDeviceDxe.c
@@ -342,7 +342,7 @@ UsbDeviceDxeDriverStop (
   Status = gBS->OpenProtocol (

                   Controller,

                   &gEfiUsbFnIoProtocolGuid,

-                  &UsbFunIoProtocol,

+                  (VOID **)&UsbFunIoProtocol,

                   This->DriverBindingHandle,

                   Controller,

                   EFI_OPEN_PROTOCOL_GET_PROTOCOL

diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c
index 9a156ba9b4..e1027d2485 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/UsbFuncIo.c
@@ -1901,7 +1901,7 @@ StartXdciController (
   UsbFuncIoDevPtr->DeviceId = USBFU_PID;

   UsbFuncIoDevPtr->StartUpController = TRUE;

 

-  Status = UsbDeviceInit (&ConfigParams, &UsbFuncIoDevPtr->DrvCore);

+  Status = UsbDeviceInit (&ConfigParams, (VOID **)&UsbFuncIoDevPtr->DrvCore);

   if (Status != EFI_SUCCESS) {

     Status = EFI_DEVICE_ERROR;

     goto EXIT_START_CONTROLLER;

@@ -2166,6 +2166,7 @@ DEV_INIT_EXIT:
 }

 

 EFI_STATUS

+EFIAPI

 StartController (

   IN EFI_USBFN_IO_PROTOCOL        *This

   )

@@ -2210,6 +2211,7 @@ DEV_DEINIT_EXIT:
 }

 

 EFI_STATUS

+EFIAPI

 StopController (

   IN EFI_USBFN_IO_PROTOCOL        *This

   )

diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c
index 47c5b80bd4..2c1e929ab7 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciDWC.c
@@ -15,7 +15,6 @@
 #include "XdciInterface.h"

 #include "XdciDWC.h"

 

-#pragma optimize ("", off)

 

 UINT32

 UsbRegRead (

@@ -3628,8 +3627,8 @@ UsbXdciCoreReinit (
     DWC_XDCI_DCTL_REG,

     UsbRegRead (BaseAddr, DWC_XDCI_DCTL_REG) &

     (~DWC_XDCI_DCTL_KEEP_CONNECT_MASK) &

-    (~DWC_XDCI_DCTL_STATE_CHANGE_REQ_MASK) |

-    (DWC_XDCI_DCTL_STATE_CHANGE_REQ_RX_DETECT << DWC_XDCI_DCTL_STATE_CHANGE_REQ_BIT_POS)

+    ((~DWC_XDCI_DCTL_STATE_CHANGE_REQ_MASK) |

+    (DWC_XDCI_DCTL_STATE_CHANGE_REQ_RX_DETECT << DWC_XDCI_DCTL_STATE_CHANGE_REQ_BIT_POS))

     );

 

   DEBUG ((DEBUG_INFO, "Device controller Synopsys ID: %x\n", UsbRegRead (BaseAddr, DWC_XDCI_GSNPSID_REG)));

@@ -4029,5 +4028,3 @@ UsbXdciCoreFlushEpFifo (
 

   return Status;

 }

-#pragma optimize ("", on)

-

diff --git a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h
index 90264e84f5..93eb77367f 100644
--- a/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h
+++ b/Platform/BroxtonPlatformPkg/Common/Features/UsbDeviceDxe/XdciInterface.h
@@ -65,7 +65,7 @@ EFI_STATUS
 (EFIAPI *DEV_CORE_REG_CALLBACK) (

   IN VOID                      *CoreHandle,

   IN USB_DEVICE_EVENT_ID       Event,

-  IN EFI_STATUS                (*callbackFn)(IN USB_DEVICE_CALLBACK_PARAM *CbEventParams)

+  IN USB_DEVICE_CALLBACK_FUNC  CallbackFn

   );

 

 typedef