Further check-in to smooth Intel IPF compiler building.

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

5 files changed, 17 insertions, 10 deletions

diff --git a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index 268a6a04f2..bd4b5adcec 100644
--- a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -144,6 +144,7 @@ PERFORMANCE_PROTOCOL mPerformanceInterface = {
   @retval The index of gauge entry in the array.

 

 **/

+STATIC

 UINT32

 InternalSearchForGaugeEntry (

   IN CONST VOID                 *Handle,  OPTIONAL

@@ -363,6 +364,7 @@ GetGauge (
   to DXE performance data structures.

 

 **/

+STATIC

 VOID

 InternalGetPeiPerformance (

   VOID

@@ -625,5 +627,5 @@ PerformanceMeasurementEnabled (
   VOID

   )

 {

-  return ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);

+  return (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);

 }

diff --git a/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c b/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c
index 45fbcf4777..cf3ac787bd 100644
--- a/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c
+++ b/EdkModulePkg/Library/DxeDebugLibSerialPort/DebugLib.c
@@ -65,7 +65,7 @@ DebugPrint (
   //

   // Send the print string to a Serial Port 

   //

-  SerialPortWrite (Buffer, AsciiStrLen(Buffer));

+  SerialPortWrite ((UINT8 *) Buffer, AsciiStrLen(Buffer));

 }

 

 

@@ -110,7 +110,7 @@ DebugAssert (
   //

   // Send the print string to the Console Output device

   //

-  SerialPortWrite (Buffer, AsciiStrLen(Buffer));

+  SerialPortWrite ((UINT8 *) Buffer, AsciiStrLen(Buffer));

 

   //

   // Generate a Breakpoint, DeadLoop, or NOP based on PCD settings

@@ -176,7 +176,7 @@ DebugAssertEnabled (
   VOID

   )

 {

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);

+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_ASSERT_ENABLED) != 0);

 }

 

 

@@ -197,7 +197,7 @@ DebugPrintEnabled (
   VOID

   )

 {

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);

+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_PRINT_ENABLED) != 0);

 }

 

 

@@ -218,7 +218,7 @@ DebugCodeEnabled (
   VOID

   )

 {

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);

+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_DEBUG_CODE_ENABLED) != 0);

 }

 

 

@@ -239,5 +239,5 @@ DebugClearMemoryEnabled (
   VOID

   )

 {

-  return ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);

+  return (BOOLEAN) ((PcdGet8(PcdDebugPropertyMask) & DEBUG_PROPERTY_CLEAR_MEMORY_ENABLED) != 0);

 }

diff --git a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index 74d71c54d9..d143039828 100644
--- a/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/EdkModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
@@ -31,6 +31,7 @@ STATIC PERFORMANCE_PROTOCOL    *mPerformance = NULL;
   @retval Other           Performance protocol is not located to log performance.  

 

 **/

+STATIC

 EFI_STATUS

 GetPerformanceProtocol (

   VOID

@@ -245,5 +246,5 @@ PerformanceMeasurementEnabled (
   VOID

   )

 {

-  return ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);

+  return (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);

 }

diff --git a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
index 199b14becc..2b4d297221 100644
--- a/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
+++ b/EdkModulePkg/Library/EdkDxeSalLib/Ipf/EsalServiceLib.c
@@ -22,6 +22,7 @@ Abstract:
 EXTENDED_SAL_BOOT_SERVICE_PROTOCOL  *mEsalBootService = NULL;

 EFI_PLABEL                          mPlabel;

 

+STATIC

 EFI_STATUS

 EFIAPI

 DxeSalLibInitialize (

@@ -43,7 +44,7 @@ DxeSalLibInitialize (
   // virtual). So lets grap the physical PLABEL for the EsalEntryPoint and store it

   // away. We cache it in a module global, so we can register the vitrual version.

   //

-  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, &mEsalBootService);

+  Status = gBS->LocateProtocol (&gEfiExtendedSalBootServiceProtocolGuid, NULL, (VOID **) &mEsalBootService);

   if (EFI_ERROR (Status)) {

     mEsalBootService = NULL;

     return EFI_SUCCESS;

@@ -58,6 +59,7 @@ DxeSalLibInitialize (
   return EFI_SUCCESS;

 }

 

+STATIC

 VOID

 EFIAPI

 DxeSalVirtualNotifyEvent (

diff --git a/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index dcb360c5e7..c71f1e7167 100644
--- a/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/EdkModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -36,6 +36,7 @@ Abstract:
   @retval The index of log entry in the array.

 

 **/

+STATIC

 PEI_PERFORMANCE_LOG_HEADER *

 InternalGetPerformanceHobLog (

   VOID

@@ -83,6 +84,7 @@ InternalGetPerformanceHobLog (
   @retval The index of log entry in the array.

 

 **/

+STATIC

 UINT32

 InternalSearchForLogEntry (

   IN PEI_PERFORMANCE_LOG_HEADER *PeiPerformanceLog,

@@ -326,5 +328,5 @@ PerformanceMeasurementEnabled (
   VOID

   )

 {

-  return ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);

+  return (BOOLEAN) ((PcdGet8(PcdPerformanceLibraryPropertyMask) & PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED) != 0);

 }