Clean up PERF macro usage. The macros were being used with 0 as the first parameter. This parameter is actually a void*. All of these instances were corrected to use NULL as the first parameter.

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

2 files changed, 18 insertions, 18 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index 25b5c63474..dcaa488894 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -1,5 +1,5 @@
 /** @file

-  This module produce main entry for BDS phase - BdsEntry. 

+  This module produce main entry for BDS phase - BdsEntry.

   When this module was dispatched by DxeCore, gEfiBdsArchProtocolGuid will be installed

   which contains interface of BdsEntry.

   After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will be invoked

@@ -27,7 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///

 /// Note: Current BDS not directly get the BootMode, DefaultBoot,

 /// TimeoutDefault, MemoryTestLevel value from the BDS arch protocol.

-/// Please refer to the library useage of BdsLibGetBootMode, BdsLibGetTimeout 

+/// Please refer to the library useage of BdsLibGetBootMode, BdsLibGetTimeout

 /// and PlatformBdsDiagnostics in BdsPlatform.c

 ///

 EFI_HANDLE  gBdsHandle = NULL;

@@ -136,14 +136,14 @@ BdsBootDeviceSelect (
     //

     UnicodeSPrint (Buffer, sizeof (Buffer), L"Boot%04x", *mBootNext);

     BootOption = BdsLibVariableToOption (&BootLists, Buffer);

-    

+

     //

     // If fail to get boot option from variable, just return and do nothing.

     //

     if (BootOption == NULL) {

       return;

     }

-    

+

     BootOption->BootCurrent = *mBootNext;

   }

   //

@@ -231,7 +231,7 @@ BdsBootDeviceSelect (
       //

       // Call platform action to indicate the boot success

       //

-      BootOption->StatusString = GetStringById (STRING_TOKEN (STR_BOOT_SUCCEEDED)); 

+      BootOption->StatusString = GetStringById (STRING_TOKEN (STR_BOOT_SUCCEEDED));

       PlatformBdsBootSuccess (BootOption);

 

       //

@@ -286,8 +286,8 @@ BdsEntry (
   //

   // Insert the performance probe

   //

-  PERF_END (0, "DXE", NULL, 0);

-  PERF_START (0, "BDS", NULL, 0);

+  PERF_END (NULL, "DXE", NULL, 0);

+  PERF_START (NULL, "BDS", NULL, 0);

 

   //

   // Initialize the global system boot option and driver option

@@ -316,11 +316,11 @@ BdsEntry (
   //

   // Do the platform init, can be customized by OEM/IBV

   //

-  PERF_START (0, "PlatformBds", "BDS", 0);

+  PERF_START (NULL, "PlatformBds", "BDS", 0);

   PlatformBdsInit ();

 

   InitializeHwErrRecSupport();

-  

+

   //

   // bugbug: platform specific code

   // Initialize the platform specific string and language

@@ -351,7 +351,7 @@ BdsEntry (
   // Setup some platform policy here

   //

   PlatformBdsPolicyBehavior (&DriverOptionList, &BootOptionList, ProcessCapsules, BdsMemoryTest);

-  PERF_END (0, "PlatformBds", "BDS", 0);

+  PERF_END (NULL, "PlatformBds", "BDS", 0);

 

   //

   // BDS select the boot device to load OS

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 2098602b2f..9f25ebca6b 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -56,7 +56,7 @@ HII_VENDOR_DEVICE_PATH  mFrontPageHiiVendorDevicePath = {
   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    { 

+    {

       (UINT8) (END_DEVICE_PATH_LENGTH),

       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)

     }

@@ -205,7 +205,7 @@ FrontPageCallback (
     //

     Lang = AllocatePool (AsciiStrSize (LanguageString));

     ASSERT (Lang != NULL);

-    

+

     Index = 0;

     LangCode = LanguageString;

     while (*LangCode != 0) {

@@ -226,7 +226,7 @@ FrontPageCallback (
                                      );

       ASSERT (PlatformSupportedLanguages != NULL);

     }

-    

+

     //

     // Select the best language in platform supported Language.

     //

@@ -437,7 +437,7 @@ InitializeFrontPage (
   OptionCount = 0;

   LangCode    = LanguageString;

   FirstFlag   = FALSE;

-  

+

   if (gFrontPagePrivate.LanguageToken == NULL) {

     while (*LangCode != 0) {

       GetNextLanguage (&LangCode, Lang);

@@ -877,7 +877,7 @@ ShowProgress (
   }

 

   DEBUG ((EFI_D_INFO, "\n\nStart showing progress bar... Press any key to stop it! ...Zzz....\n"));

-  

+

   SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);

   SetMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);

   SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);

@@ -893,7 +893,7 @@ ShowProgress (
   TimeoutRemain = TimeoutDefault;

   while (TimeoutRemain != 0) {

     DEBUG ((EFI_D_INFO, "Showing progress bar...Remaining %d second!\n", TimeoutRemain));

-    

+

     Status = WaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);

     if (Status != EFI_TIMEOUT) {

       break;

@@ -961,7 +961,7 @@ PlatformBdsEnterFrontPage (
 {

   EFI_STATUS                    Status;

 

-  PERF_START (0, "BdsTimeOut", "BDS", 0);

+  PERF_START (NULL, "BdsTimeOut", "BDS", 0);

   //

   // Indicate if we need connect all in the platform setup

   //

@@ -1072,5 +1072,5 @@ Exit:
   // Note: The following lines of code only execute when Auto boot

   // takes affect

   //

-  PERF_END (0, "BdsTimeOut", "BDS", 0);

+  PERF_END (NULL, "BdsTimeOut", "BDS", 0);

 }