Clean up PERF macro usage. The macros were being used with 0 as the first parameter...

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

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 188986a7c9e3e7ba30786041b982c50877d1ffe5..9042cc3428b624c0fa9a61c98ef1e94b5a5e50bd 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -77,7 +77,7 @@ BdsLibDoLegacyBoot (
 \r
   @retval TRUE      This boot option matches a valid EFI NV Boot####.\r
   @retval FALSE     If not.\r
 \r
   @retval TRUE      This boot option matches a valid EFI NV Boot####.\r
   @retval FALSE     If not.\r

-  \r
+\r

 **/\r
 BOOLEAN\r
 IsBootOptionValidNVVarialbe (\r
 **/\r
 BOOLEAN\r
 IsBootOptionValidNVVarialbe (\r


@@ -100,7 +100,7 @@ IsBootOptionValidNVVarialbe (
   }\r
 \r
   //\r
   }\r
 \r
   //\r

-  // If the Boot Option Number and Device Path matches, OptionToCheck matches a \r
+  // If the Boot Option Number and Device Path matches, OptionToCheck matches a\r

   // valid EFI NV Boot####.\r
   //\r
   if ((OptionToCheck->BootCurrent == BootOption->BootCurrent) &&\r
   // valid EFI NV Boot####.\r
   //\r
   if ((OptionToCheck->BootCurrent == BootOption->BootCurrent) &&\r


@@ -110,7 +110,7 @@ IsBootOptionValidNVVarialbe (
   }\r
 \r
   FreePool (BootOption);\r
   }\r
 \r
   FreePool (BootOption);\r

-    \r
+\r

   return Valid;\r
 }\r
 /**\r
   return Valid;\r
 }\r
 /**\r


@@ -150,7 +150,7 @@ BdsLibBootViaBootOption (
   //\r
   // Record the performance data for End of BDS\r
   //\r
   //\r
   // Record the performance data for End of BDS\r
   //\r

-  PERF_END (0, "BDS", NULL, 0);\r
+  PERF_END(NULL, "BDS", NULL, 0);\r

 \r
   *ExitDataSize = 0;\r
   *ExitData     = NULL;\r
 \r
   *ExitDataSize = 0;\r
   *ExitData     = NULL;\r


@@ -187,8 +187,8 @@ BdsLibBootViaBootOption (
   // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
   //\r
   EfiSignalEventReadyToBoot();\r
   // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
   //\r
   EfiSignalEventReadyToBoot();\r

-  \r
-  \r
+\r
+\r

   //\r
   // Set Boot Current\r
   //\r
   //\r
   // Set Boot Current\r
   //\r


@@ -233,11 +233,11 @@ BdsLibBootViaBootOption (
     //\r
     InitializeListHead (&TempBootLists);\r
     BdsLibRegisterNewOption (&TempBootLists, DevicePath, L"EFI Internal Shell", L"BootOrder");\r
     //\r
     InitializeListHead (&TempBootLists);\r
     BdsLibRegisterNewOption (&TempBootLists, DevicePath, L"EFI Internal Shell", L"BootOrder");\r

-    \r
+\r

     //\r
     // free the temporary device path created by BdsLibUpdateFvFileDevicePath()\r
     //\r
     //\r
     // free the temporary device path created by BdsLibUpdateFvFileDevicePath()\r
     //\r

-    FreePool (DevicePath); \r
+    FreePool (DevicePath);\r

     DevicePath = Option->DevicePath;\r
   }\r
 \r
     DevicePath = Option->DevicePath;\r
   }\r
 \r


@@ -394,7 +394,7 @@ BdsExpandPartitionPartialDevicePathToFull (
                       &mHdBootVariablePrivateGuid,\r
                       &CachedDevicePathSize\r
                       );\r
                       &mHdBootVariablePrivateGuid,\r
                       &CachedDevicePathSize\r
                       );\r

-                      \r
+\r

   if (CachedDevicePath != NULL) {\r
     TempNewDevicePath = CachedDevicePath;\r
     DeviceExist = FALSE;\r
   if (CachedDevicePath != NULL) {\r
     TempNewDevicePath = CachedDevicePath;\r
     DeviceExist = FALSE;\r


@@ -442,7 +442,7 @@ BdsExpandPartitionPartialDevicePathToFull (
         TempNewDevicePath = CachedDevicePath;\r
         CachedDevicePath  = BdsLibDelPartMatchInstance (CachedDevicePath, Instance );\r
         FreePool (TempNewDevicePath);\r
         TempNewDevicePath = CachedDevicePath;\r
         CachedDevicePath  = BdsLibDelPartMatchInstance (CachedDevicePath, Instance );\r
         FreePool (TempNewDevicePath);\r

-        \r
+\r

         //\r
         // Second, append the remaining path after the matched instance\r
         //\r
         //\r
         // Second, append the remaining path after the matched instance\r
         //\r


@@ -460,7 +460,7 @@ BdsExpandPartitionPartialDevicePathToFull (
                         CachedDevicePath\r
                         );\r
       }\r
                         CachedDevicePath\r
                         );\r
       }\r

-      \r
+\r

       FreePool (Instance);\r
       FreePool (CachedDevicePath);\r
       return FullDevicePath;\r
       FreePool (Instance);\r
       FreePool (CachedDevicePath);\r
       return FullDevicePath;\r


@@ -559,7 +559,7 @@ BdsExpandPartitionPartialDevicePathToFull (
       break;\r
     }\r
   }\r
       break;\r
     }\r
   }\r

-  \r
+\r

   FreePool (CachedDevicePath);\r
   if (BlockIoBuffer != NULL) {\r
     FreePool (BlockIoBuffer);\r
   FreePool (CachedDevicePath);\r
   if (BlockIoBuffer != NULL) {\r
     FreePool (BlockIoBuffer);\r


@@ -594,7 +594,7 @@ MatchPartitionDevicePathNode (
   if ((BlockIoDevicePath == NULL) || (HardDriveDevicePath == NULL)) {\r
     return FALSE;\r
   }\r
   if ((BlockIoDevicePath == NULL) || (HardDriveDevicePath == NULL)) {\r
     return FALSE;\r
   }\r

-  \r
+\r

   //\r
   // Make PreviousDevicePath == the device path node before the end node\r
   //\r
   //\r
   // Make PreviousDevicePath == the device path node before the end node\r
   //\r


@@ -623,7 +623,7 @@ MatchPartitionDevicePathNode (
   //\r
   TmpHdPath = (HARDDRIVE_DEVICE_PATH *) BlockIoHdDevicePathNode;\r
   Match = FALSE;\r
   //\r
   TmpHdPath = (HARDDRIVE_DEVICE_PATH *) BlockIoHdDevicePathNode;\r
   Match = FALSE;\r

-  \r
+\r

   //\r
   // Check for the match\r
   //\r
   //\r
   // Check for the match\r
   //\r


@@ -711,7 +711,7 @@ BdsLibDeleteOptionFromHandle (
                       &gEfiGlobalVariableGuid,\r
                       &BootOptionSize\r
                       );\r
                       &gEfiGlobalVariableGuid,\r
                       &BootOptionSize\r
                       );\r

-                      \r
+\r

     if (BootOptionVar == NULL) {\r
       FreePool (BootOrder);\r
       return EFI_OUT_OF_RESOURCES;\r
     if (BootOptionVar == NULL) {\r
       FreePool (BootOrder);\r
       return EFI_OUT_OF_RESOURCES;\r


@@ -872,40 +872,40 @@ BdsDeleteAllInvalidEfiBootOption (
 \r
 /**\r
   For EFI boot option, BDS separate them as six types:\r
 \r
 /**\r
   For EFI boot option, BDS separate them as six types:\r

-  1. Network - The boot option points to the SimpleNetworkProtocol device. \r
+  1. Network - The boot option points to the SimpleNetworkProtocol device.\r

                Bds will try to automatically create this type boot option when enumerate.\r
                Bds will try to automatically create this type boot option when enumerate.\r

-  2. Shell   - The boot option points to internal flash shell. \r
+  2. Shell   - The boot option points to internal flash shell.\r

                Bds will try to automatically create this type boot option when enumerate.\r
   3. Removable BlockIo      - The boot option only points to the removable media\r
                               device, like USB flash disk, DVD, Floppy etc.\r
                               These device should contain a *removable* blockIo\r
                               protocol in their device handle.\r
                Bds will try to automatically create this type boot option when enumerate.\r
   3. Removable BlockIo      - The boot option only points to the removable media\r
                               device, like USB flash disk, DVD, Floppy etc.\r
                               These device should contain a *removable* blockIo\r
                               protocol in their device handle.\r

-                              Bds will try to automatically create this type boot option \r
+                              Bds will try to automatically create this type boot option\r

                               when enumerate.\r
                               when enumerate.\r

-  4. Fixed BlockIo          - The boot option only points to a Fixed blockIo device, \r
+  4. Fixed BlockIo          - The boot option only points to a Fixed blockIo device,\r

                               like HardDisk.\r
                               These device should contain a *fixed* blockIo\r
                               protocol in their device handle.\r
                               BDS will skip fixed blockIo devices, and NOT\r
                               like HardDisk.\r
                               These device should contain a *fixed* blockIo\r
                               protocol in their device handle.\r
                               BDS will skip fixed blockIo devices, and NOT\r

-                              automatically create boot option for them. But BDS \r
-                              will help to delete those fixed blockIo boot option, \r
+                              automatically create boot option for them. But BDS\r
+                              will help to delete those fixed blockIo boot option,\r

                               whose description rule conflict with other auto-created\r
                               boot options.\r
                               whose description rule conflict with other auto-created\r
                               boot options.\r

-  5. Non-BlockIo Simplefile - The boot option points to a device whose handle \r
+  5. Non-BlockIo Simplefile - The boot option points to a device whose handle\r

                               has SimpleFileSystem Protocol, but has no blockio\r
                               protocol. These devices do not offer blockIo\r
                               has SimpleFileSystem Protocol, but has no blockio\r
                               protocol. These devices do not offer blockIo\r

-                              protocol, but BDS still can get the \r
+                              protocol, but BDS still can get the\r

                               \EFI\BOOT\boot{machinename}.EFI by SimpleFileSystem\r
                               Protocol.\r
                               \EFI\BOOT\boot{machinename}.EFI by SimpleFileSystem\r
                               Protocol.\r

-  6. File    - The boot option points to a file. These boot options are usually \r
+  6. File    - The boot option points to a file. These boot options are usually\r

                created by user manually or OS loader. BDS will not delete or modify\r
                created by user manually or OS loader. BDS will not delete or modify\r

-               these boot options.        \r
-    \r
+               these boot options.\r
+\r

   This function will enumerate all possible boot device in the system, and\r
   This function will enumerate all possible boot device in the system, and\r

-  automatically create boot options for Network, Shell, Removable BlockIo, \r
+  automatically create boot options for Network, Shell, Removable BlockIo,\r

   and Non-BlockIo Simplefile devices.\r
   It will only execute once of every boot.\r
   and Non-BlockIo Simplefile devices.\r
   It will only execute once of every boot.\r

-  \r
+\r

   @param  BdsBootOptionList      The header of the link list which indexed all\r
                                  current boot options\r
 \r
   @param  BdsBootOptionList      The header of the link list which indexed all\r
                                  current boot options\r
 \r


@@ -956,7 +956,7 @@ BdsLibEnumerateAllBootOption (
   MiscNumber    = 0;\r
   ScsiNumber    = 0;\r
   ZeroMem (Buffer, sizeof (Buffer));\r
   MiscNumber    = 0;\r
   ScsiNumber    = 0;\r
   ZeroMem (Buffer, sizeof (Buffer));\r

-  \r
+\r

   //\r
   // If the boot device enumerate happened, just get the boot\r
   // device from the boot order variable\r
   //\r
   // If the boot device enumerate happened, just get the boot\r
   // device from the boot order variable\r


@@ -965,7 +965,7 @@ BdsLibEnumerateAllBootOption (
     Status = BdsLibBuildOptionFromVar (BdsBootOptionList, L"BootOrder");\r
     return Status;\r
   }\r
     Status = BdsLibBuildOptionFromVar (BdsBootOptionList, L"BootOrder");\r
     return Status;\r
   }\r

-  \r
+\r

   //\r
   // Notes: this dirty code is to get the legacy boot option from the\r
   // BBS table and create to variable as the EFI boot option, it should\r
   //\r
   // Notes: this dirty code is to get the legacy boot option from the\r
   // BBS table and create to variable as the EFI boot option, it should\r


@@ -977,7 +977,7 @@ BdsLibEnumerateAllBootOption (
   // Delete invalid boot option\r
   //\r
   BdsDeleteAllInvalidEfiBootOption ();\r
   // Delete invalid boot option\r
   //\r
   BdsDeleteAllInvalidEfiBootOption ();\r

-  \r
+\r

   //\r
   // Parse removable media\r
   //\r
   //\r
   // Parse removable media\r
   //\r


@@ -988,7 +988,7 @@ BdsLibEnumerateAllBootOption (
         &NumberBlockIoHandles,\r
         &BlockIoHandles\r
         );\r
         &NumberBlockIoHandles,\r
         &BlockIoHandles\r
         );\r

-        \r
+\r

   for (Index = 0; Index < NumberBlockIoHandles; Index++) {\r
     Status = gBS->HandleProtocol (\r
                     BlockIoHandles[Index],\r
   for (Index = 0; Index < NumberBlockIoHandles; Index++) {\r
     Status = gBS->HandleProtocol (\r
                     BlockIoHandles[Index],\r


@@ -1008,11 +1008,11 @@ BdsLibEnumerateAllBootOption (
 \r
     switch (DevicePathType) {\r
     case BDS_EFI_ACPI_FLOPPY_BOOT:\r
 \r
     switch (DevicePathType) {\r
     case BDS_EFI_ACPI_FLOPPY_BOOT:\r

-      UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", FloppyNumber); \r
+      UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", FloppyNumber);\r

       BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r
       FloppyNumber++;\r
       break;\r
       BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r
       FloppyNumber++;\r
       break;\r

-    \r
+\r

     //\r
     // Assume a removable SATA device should be the DVD/CD device\r
     //\r
     //\r
     // Assume a removable SATA device should be the DVD/CD device\r
     //\r


@@ -1031,13 +1031,13 @@ BdsLibEnumerateAllBootOption (
 \r
     case BDS_EFI_MESSAGE_SCSI_BOOT:\r
       UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", ScsiNumber);\r
 \r
     case BDS_EFI_MESSAGE_SCSI_BOOT:\r
       UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", ScsiNumber);\r

-      BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);      \r
+      BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r

       ScsiNumber++;\r
       break;\r
 \r
     case BDS_EFI_MESSAGE_MISC_BOOT:\r
       UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", MiscNumber);\r
       ScsiNumber++;\r
       break;\r
 \r
     case BDS_EFI_MESSAGE_MISC_BOOT:\r
       UnicodeSPrint (Buffer, sizeof (Buffer), L"%d", MiscNumber);\r

-      BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);      \r
+      BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r

       MiscNumber++;\r
       break;\r
 \r
       MiscNumber++;\r
       break;\r
 \r


@@ -1198,7 +1198,7 @@ BdsLibBuildOptionFromHandle (
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
   )\r
 {\r
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r

-  \r
+\r

   DevicePath = DevicePathFromHandle (Handle);\r
 \r
   //\r
   DevicePath = DevicePathFromHandle (Handle);\r
 \r
   //\r


@@ -1333,7 +1333,7 @@ BdsLibGetBootableHandle (
   EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;\r
 \r
   UpdatedDevicePath = DevicePath;\r
   EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr;\r
 \r
   UpdatedDevicePath = DevicePath;\r

-  \r
+\r

   //\r
   // Check whether the device is connected\r
   //\r
   //\r
   // Check whether the device is connected\r
   //\r


@@ -1386,7 +1386,7 @@ BdsLibGetBootableHandle (
   //\r
   DupDevicePath = DuplicateDevicePath (DevicePath);\r
   ASSERT (DupDevicePath != NULL);\r
   //\r
   DupDevicePath = DuplicateDevicePath (DevicePath);\r
   ASSERT (DupDevicePath != NULL);\r

-  \r
+\r

   UpdatedDevicePath = DupDevicePath;\r
   Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &UpdatedDevicePath, &Handle);\r
   //\r
   UpdatedDevicePath = DupDevicePath;\r
   Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &UpdatedDevicePath, &Handle);\r
   //\r


@@ -1531,7 +1531,7 @@ BdsLibNetworkBootWithMediaPresent (
 \r
   @param  DevicePath                      The bootable device Path to check\r
 \r
 \r
   @param  DevicePath                      The bootable device Path to check\r
 \r

-  @retval BDS_EFI_MEDIA_HD_BOOT           If given device path contains MEDIA_DEVICE_PATH type device path node \r
+  @retval BDS_EFI_MEDIA_HD_BOOT           If given device path contains MEDIA_DEVICE_PATH type device path node\r

                                           which subtype is MEDIA_HARDDRIVE_DP\r
   @retval BDS_EFI_MEDIA_CDROM_BOOT        If given device path contains MEDIA_DEVICE_PATH type device path node\r
                                           which subtype is MEDIA_CDROM_DP\r
                                           which subtype is MEDIA_HARDDRIVE_DP\r
   @retval BDS_EFI_MEDIA_CDROM_BOOT        If given device path contains MEDIA_DEVICE_PATH type device path node\r
                                           which subtype is MEDIA_CDROM_DP\r


@@ -1546,7 +1546,7 @@ BdsLibNetworkBootWithMediaPresent (
   @retval BDS_EFI_MESSAGE_MISC_BOOT       If the device path not contains any media device path node,  and\r
                                           its last device path node point to a message device path node.\r
   @retval BDS_LEGACY_BBS_BOOT             If given device path contains BBS_DEVICE_PATH type device path node.\r
   @retval BDS_EFI_MESSAGE_MISC_BOOT       If the device path not contains any media device path node,  and\r
                                           its last device path node point to a message device path node.\r
   @retval BDS_LEGACY_BBS_BOOT             If given device path contains BBS_DEVICE_PATH type device path node.\r

-  @retval BDS_EFI_UNSUPPORT               An EFI Removable BlockIO device path not point to a media and message device,   \r
+  @retval BDS_EFI_UNSUPPORT               An EFI Removable BlockIO device path not point to a media and message device,\r

 \r
 **/\r
 UINT32\r
 \r
 **/\r
 UINT32\r


@@ -1575,7 +1575,7 @@ BdsGetBootTypeFromDevicePath (
           return BDS_EFI_MEDIA_HD_BOOT;\r
         } else if (DevicePathSubType (TempDevicePath) == MEDIA_CDROM_DP) {\r
           return BDS_EFI_MEDIA_CDROM_BOOT;\r
           return BDS_EFI_MEDIA_HD_BOOT;\r
         } else if (DevicePathSubType (TempDevicePath) == MEDIA_CDROM_DP) {\r
           return BDS_EFI_MEDIA_CDROM_BOOT;\r

-        } \r
+        }\r

         break;\r
       case ACPI_DEVICE_PATH:\r
         Acpi = (ACPI_HID_DEVICE_PATH *) TempDevicePath;\r
         break;\r
       case ACPI_DEVICE_PATH:\r
         Acpi = (ACPI_HID_DEVICE_PATH *) TempDevicePath;\r


@@ -1599,7 +1599,7 @@ BdsGetBootTypeFromDevicePath (
         // if the device path not only point to driver device, it is not a messaging device path,\r
         //\r
         if (!IsDevicePathEndType (LastDeviceNode)) {\r
         // if the device path not only point to driver device, it is not a messaging device path,\r
         //\r
         if (!IsDevicePathEndType (LastDeviceNode)) {\r

-          break;        \r
+          break;\r

         }\r
 \r
         if (DevicePathSubType(TempDevicePath) == MSG_ATAPI_DP) {\r
         }\r
 \r
         if (DevicePathSubType(TempDevicePath) == MSG_ATAPI_DP) {\r


@@ -1675,7 +1675,7 @@ BdsLibIsValidEFIBootOptDevicePathExt (
 \r
   TempDevicePath = DevPath;\r
   LastDeviceNode = DevPath;\r
 \r
   TempDevicePath = DevPath;\r
   LastDeviceNode = DevPath;\r

-  \r
+\r

   //\r
   // Check if it's a valid boot option for network boot device\r
   // Only check if there is SimpleNetworkProtocol installed. If yes, that means\r
   //\r
   // Check if it's a valid boot option for network boot device\r
   // Only check if there is SimpleNetworkProtocol installed. If yes, that means\r


@@ -1698,7 +1698,7 @@ BdsLibIsValidEFIBootOptDevicePathExt (
                     &Handle\r
                     );\r
   }\r
                     &Handle\r
                     );\r
   }\r

-  \r
+\r

   if (!EFI_ERROR (Status)) {\r
     if (CheckMedia) {\r
       //\r
   if (!EFI_ERROR (Status)) {\r
     if (CheckMedia) {\r
       //\r


@@ -1732,22 +1732,22 @@ BdsLibIsValidEFIBootOptDevicePathExt (
     //\r
     // If the boot option point to Internal FV shell, make sure it is valid\r
     //\r
     //\r
     // If the boot option point to Internal FV shell, make sure it is valid\r
     //\r

-    TempDevicePath = DevPath; \r
+    TempDevicePath = DevPath;\r

     Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, PcdGetPtr(PcdShellFile));\r
     if (Status == EFI_ALREADY_STARTED) {\r
       return TRUE;\r
     } else {\r
       if (Status == EFI_SUCCESS) {\r
     Status = BdsLibUpdateFvFileDevicePath (&TempDevicePath, PcdGetPtr(PcdShellFile));\r
     if (Status == EFI_ALREADY_STARTED) {\r
       return TRUE;\r
     } else {\r
       if (Status == EFI_SUCCESS) {\r

-        FreePool (TempDevicePath); \r
+        FreePool (TempDevicePath);\r

       }\r
       return FALSE;\r
     }\r
   }\r
       }\r
       return FALSE;\r
     }\r
   }\r

-  \r
+\r

   //\r
   // If the boot option point to a blockIO device:\r
   //    if it is a removable blockIo device, it is valid.\r
   //\r
   // If the boot option point to a blockIO device:\r
   //    if it is a removable blockIo device, it is valid.\r

-  //    if it is a fixed blockIo device, check its description confliction. \r
+  //    if it is a fixed blockIo device, check its description confliction.\r

   //\r
   TempDevicePath = DevPath;\r
   Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);\r
   //\r
   TempDevicePath = DevPath;\r
   Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);\r


@@ -1764,7 +1764,7 @@ BdsLibIsValidEFIBootOptDevicePathExt (
       Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);\r
     }\r
   }\r
       Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);\r
     }\r
   }\r

-  \r
+\r

   if (!EFI_ERROR (Status)) {\r
     Status = gBS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID **)&BlockIo);\r
     if (!EFI_ERROR (Status)) {\r
   if (!EFI_ERROR (Status)) {\r
     Status = gBS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID **)&BlockIo);\r
     if (!EFI_ERROR (Status)) {\r


@@ -1853,7 +1853,7 @@ BdsLibUpdateFvFileDevicePath (
   if (FileGuid == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
   if (FileGuid == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r

-  \r
+\r

   //\r
   // Check whether the device path point to the default the input Fv file\r
   //\r
   //\r
   // Check whether the device path point to the default the input Fv file\r
   //\r


@@ -1987,7 +1987,7 @@ BdsLibUpdateFvFileDevicePath (
     }\r
 \r
     if (FvHandleBuffer != NULL) {\r
     }\r
 \r
     if (FvHandleBuffer != NULL) {\r

-      FreePool (FvHandleBuffer);  \r
+      FreePool (FvHandleBuffer);\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index 25b5c63474c689bbf4b8ab2e5abcb46e0f6a449e..dcaa488894af9b94f8b0ca3aef6c0ea2949ee285 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -1,5 +1,5 @@
 /** @file\r
 /** @file\r

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

   When this module was dispatched by DxeCore, gEfiBdsArchProtocolGuid will be installed\r
   which contains interface of BdsEntry.\r
   After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will be invoked\r
   When this module was dispatched by DxeCore, gEfiBdsArchProtocolGuid will be installed\r
   which contains interface of BdsEntry.\r
   After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will be invoked\r


@@ -27,7 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 ///\r
 /// Note: Current BDS not directly get the BootMode, DefaultBoot,\r
 /// TimeoutDefault, MemoryTestLevel value from the BDS arch protocol.\r
 ///\r
 /// Note: Current BDS not directly get the BootMode, DefaultBoot,\r
 /// TimeoutDefault, MemoryTestLevel value from the BDS arch protocol.\r

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

 /// and PlatformBdsDiagnostics in BdsPlatform.c\r
 ///\r
 EFI_HANDLE  gBdsHandle = NULL;\r
 /// and PlatformBdsDiagnostics in BdsPlatform.c\r
 ///\r
 EFI_HANDLE  gBdsHandle = NULL;\r


@@ -136,14 +136,14 @@ BdsBootDeviceSelect (
     //\r
     UnicodeSPrint (Buffer, sizeof (Buffer), L"Boot%04x", *mBootNext);\r
     BootOption = BdsLibVariableToOption (&BootLists, Buffer);\r
     //\r
     UnicodeSPrint (Buffer, sizeof (Buffer), L"Boot%04x", *mBootNext);\r
     BootOption = BdsLibVariableToOption (&BootLists, Buffer);\r

-    \r
+\r

     //\r
     // If fail to get boot option from variable, just return and do nothing.\r
     //\r
     if (BootOption == NULL) {\r
       return;\r
     }\r
     //\r
     // If fail to get boot option from variable, just return and do nothing.\r
     //\r
     if (BootOption == NULL) {\r
       return;\r
     }\r

-    \r
+\r

     BootOption->BootCurrent = *mBootNext;\r
   }\r
   //\r
     BootOption->BootCurrent = *mBootNext;\r
   }\r
   //\r


@@ -231,7 +231,7 @@ BdsBootDeviceSelect (
       //\r
       // Call platform action to indicate the boot success\r
       //\r
       //\r
       // Call platform action to indicate the boot success\r
       //\r

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

       PlatformBdsBootSuccess (BootOption);\r
 \r
       //\r
       PlatformBdsBootSuccess (BootOption);\r
 \r
       //\r


@@ -286,8 +286,8 @@ BdsEntry (
   //\r
   // Insert the performance probe\r
   //\r
   //\r
   // Insert the performance probe\r
   //\r

-  PERF_END (0, "DXE", NULL, 0);\r
-  PERF_START (0, "BDS", NULL, 0);\r
+  PERF_END (NULL, "DXE", NULL, 0);\r
+  PERF_START (NULL, "BDS", NULL, 0);\r

 \r
   //\r
   // Initialize the global system boot option and driver option\r
 \r
   //\r
   // Initialize the global system boot option and driver option\r


@@ -316,11 +316,11 @@ BdsEntry (
   //\r
   // Do the platform init, can be customized by OEM/IBV\r
   //\r
   //\r
   // Do the platform init, can be customized by OEM/IBV\r
   //\r

-  PERF_START (0, "PlatformBds", "BDS", 0);\r
+  PERF_START (NULL, "PlatformBds", "BDS", 0);\r

   PlatformBdsInit ();\r
 \r
   InitializeHwErrRecSupport();\r
   PlatformBdsInit ();\r
 \r
   InitializeHwErrRecSupport();\r

-  \r
+\r

   //\r
   // bugbug: platform specific code\r
   // Initialize the platform specific string and language\r
   //\r
   // bugbug: platform specific code\r
   // Initialize the platform specific string and language\r


@@ -351,7 +351,7 @@ BdsEntry (
   // Setup some platform policy here\r
   //\r
   PlatformBdsPolicyBehavior (&DriverOptionList, &BootOptionList, ProcessCapsules, BdsMemoryTest);\r
   // Setup some platform policy here\r
   //\r
   PlatformBdsPolicyBehavior (&DriverOptionList, &BootOptionList, ProcessCapsules, BdsMemoryTest);\r

-  PERF_END (0, "PlatformBds", "BDS", 0);\r
+  PERF_END (NULL, "PlatformBds", "BDS", 0);\r

 \r
   //\r
   // BDS select the boot device to load OS\r
 \r
   //\r
   // BDS select the boot device to load OS\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index 2098602b2f729750e84eb436c2b70ab39d054bb2..9f25ebca6b154157c221a3bc6e672befaf3fdb34 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -56,7 +56,7 @@ HII_VENDOR_DEVICE_PATH  mFrontPageHiiVendorDevicePath = {
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r

-    { \r
+    {\r

       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
       (UINT8) (END_DEVICE_PATH_LENGTH),\r
       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r


@@ -205,7 +205,7 @@ FrontPageCallback (
     //\r
     Lang = AllocatePool (AsciiStrSize (LanguageString));\r
     ASSERT (Lang != NULL);\r
     //\r
     Lang = AllocatePool (AsciiStrSize (LanguageString));\r
     ASSERT (Lang != NULL);\r

-    \r
+\r

     Index = 0;\r
     LangCode = LanguageString;\r
     while (*LangCode != 0) {\r
     Index = 0;\r
     LangCode = LanguageString;\r
     while (*LangCode != 0) {\r


@@ -226,7 +226,7 @@ FrontPageCallback (
                                      );\r
       ASSERT (PlatformSupportedLanguages != NULL);\r
     }\r
                                      );\r
       ASSERT (PlatformSupportedLanguages != NULL);\r
     }\r

-    \r
+\r

     //\r
     // Select the best language in platform supported Language.\r
     //\r
     //\r
     // Select the best language in platform supported Language.\r
     //\r


@@ -437,7 +437,7 @@ InitializeFrontPage (
   OptionCount = 0;\r
   LangCode    = LanguageString;\r
   FirstFlag   = FALSE;\r
   OptionCount = 0;\r
   LangCode    = LanguageString;\r
   FirstFlag   = FALSE;\r

-  \r
+\r

   if (gFrontPagePrivate.LanguageToken == NULL) {\r
     while (*LangCode != 0) {\r
       GetNextLanguage (&LangCode, Lang);\r
   if (gFrontPagePrivate.LanguageToken == NULL) {\r
     while (*LangCode != 0) {\r
       GetNextLanguage (&LangCode, Lang);\r


@@ -877,7 +877,7 @@ ShowProgress (
   }\r
 \r
   DEBUG ((EFI_D_INFO, "\n\nStart showing progress bar... Press any key to stop it! ...Zzz....\n"));\r
   }\r
 \r
   DEBUG ((EFI_D_INFO, "\n\nStart showing progress bar... Press any key to stop it! ...Zzz....\n"));\r

-  \r
+\r

   SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);\r
   SetMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);\r
   SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);\r
   SetMem (&Foreground, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);\r
   SetMem (&Background, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0x0);\r
   SetMem (&Color, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL), 0xff);\r


@@ -893,7 +893,7 @@ ShowProgress (
   TimeoutRemain = TimeoutDefault;\r
   while (TimeoutRemain != 0) {\r
     DEBUG ((EFI_D_INFO, "Showing progress bar...Remaining %d second!\n", TimeoutRemain));\r
   TimeoutRemain = TimeoutDefault;\r
   while (TimeoutRemain != 0) {\r
     DEBUG ((EFI_D_INFO, "Showing progress bar...Remaining %d second!\n", TimeoutRemain));\r

-    \r
+\r

     Status = WaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);\r
     if (Status != EFI_TIMEOUT) {\r
       break;\r
     Status = WaitForSingleEvent (gST->ConIn->WaitForKey, ONE_SECOND);\r
     if (Status != EFI_TIMEOUT) {\r
       break;\r


@@ -961,7 +961,7 @@ PlatformBdsEnterFrontPage (
 {\r
   EFI_STATUS                    Status;\r
 \r
 {\r
   EFI_STATUS                    Status;\r
 \r

-  PERF_START (0, "BdsTimeOut", "BDS", 0);\r
+  PERF_START (NULL, "BdsTimeOut", "BDS", 0);\r

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


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

-  PERF_END (0, "BdsTimeOut", "BDS", 0);\r
+  PERF_END (NULL, "BdsTimeOut", "BDS", 0);\r

 }\r
 }\r