PerformancePkg: Fix build with GCC

Fix compiler warnings and include filename issue.

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

diff --git a/PerformancePkg/Dp_App/Dp.h b/PerformancePkg/Dp_App/Dp.h
index e4c5a76d413c491d503ce490dfcdde3d25a929a9..072ae1b983ce2d20803efd1981129bf7b63950cb 100644 (file)
--- a/PerformancePkg/Dp_App/Dp.h
+++ b/PerformancePkg/Dp_App/Dp.h
@@ -76,9 +76,9 @@ typedef struct {
 } PERF_SUMMARY_DATA;\r
 \r
 typedef struct {\r
-  VOID                  *Handle;\r
-  CHAR8                 *Token;           ///< Measured token string name.\r
-  CHAR8                 *Module;          ///< Module string name.\r
+  CONST VOID            *Handle;\r
+  CONST CHAR8           *Token;           ///< Measured token string name.\r
+  CONST CHAR8           *Module;          ///< Module string name.\r
   UINT64                StartTimeStamp;   ///< Start time point.\r
   UINT64                EndTimeStamp;     ///< End time point.\r
 } MEASUREMENT_RECORD;\r

diff --git a/PerformancePkg/Dp_App/DpTrace.c b/PerformancePkg/Dp_App/DpTrace.c
index 77939c596e3e2db37a7ba804198b16fb090fc2a0..593c269f729208381c977c6ebb6d2e655c7da998 100644 (file)
--- a/PerformancePkg/Dp_App/DpTrace.c
+++ b/PerformancePkg/Dp_App/DpTrace.c
@@ -568,7 +568,7 @@ ProcessPeims(
     Duration = GetDuration (&Measurement);\r
     ElapsedTime = DurationInMicroSeconds ( Duration );  // Calculate elapsed time in microseconds\r
     if (ElapsedTime >= mInterestThreshold) {\r
-      GetNameFromHandle (Measurement.Handle);           // Name placed in mGaugeString\r
+      GetNameFromHandle ((EFI_HANDLE) Measurement.Handle); // Name placed in mGaugeString\r
       PrintToken (STRING_TOKEN (STR_DP_PEIM_STAT2),\r
             TIndex,   // 1 based, Which measurement record is being printed\r
             Measurement.Handle,\r

diff --git a/PerformancePkg/Dp_App/DpUtilities.c b/PerformancePkg/Dp_App/DpUtilities.c
index dbb268a21c0eac5fe1c46c7f179afa7501afc611..1d48e1430a112e956a457e41bf1f8b0ca3a416c9 100644 (file)
--- a/PerformancePkg/Dp_App/DpUtilities.c
+++ b/PerformancePkg/Dp_App/DpUtilities.c
@@ -23,7 +23,7 @@
 #include <Library/PcdLib.h>\r
 \r
 #include <Protocol/LoadedImage.h>\r
-#include <Protocol/Driverbinding.h>\r
+#include <Protocol/DriverBinding.h>\r
 \r
 #include <Guid/Performance.h>\r
 \r
@@ -191,7 +191,7 @@ GetNameFromHandle (
   Status = gBS->HandleProtocol (\r
                 Handle,\r
                 &gEfiLoadedImageProtocolGuid,\r
-                &Image\r
+                (VOID**) &Image\r
                 );\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -213,7 +213,7 @@ GetNameFromHandle (
     Status = gBS->HandleProtocol (\r
                   DriverBinding->ImageHandle,\r
                   &gEfiLoadedImageProtocolGuid,\r
-                  &Image\r
+                  (VOID**) &Image\r
                   );\r
   }\r
 \r