Remove reference to PCDs of status code value. Use macros introduced in PI1.2 instead.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / DxeMain / DxeMain.c

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 6e535b5d93d1255700363737dd82446dd1acd3f6..52f9437b9e47194eb44b3e286a004864deb82d1e 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -1,7 +1,7 @@
 /** @file\r
   DXE Core Main Entry Point\r
 \r
-Copyright (c) 2006 - 2008, Intel Corporation. <BR>\r
+Copyright (c) 2006 - 2010, Intel Corporation. <BR>\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -258,8 +258,8 @@ DxeMain (
   // Call constructor for all libraries\r
   //\r
   ProcessLibraryConstructorList (gDxeCoreImageHandle, gDxeCoreST);\r
-  PERF_END   (0,"PEI", NULL, 0) ;\r
-  PERF_START (0,"DXE", NULL, 0) ;\r
+  PERF_END   (NULL,"PEI", NULL, 0) ;\r
+  PERF_START (NULL,"DXE", NULL, 0) ;\r
 \r
   //\r
   // Initialize the Global Coherency Domain Services\r
@@ -290,7 +290,7 @@ DxeMain (
   //\r
   REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32(PcdStatusCodeValueDxeCoreEntry)\r
+    (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_ENTRY_POINT)\r
     );\r
 \r
   //\r
@@ -307,6 +307,26 @@ DxeMain (
 \r
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "HOBLIST address in DXE = 0x%p\n", HobStart));\r
 \r
+  DEBUG_CODE_BEGIN ();\r
+    EFI_PEI_HOB_POINTERS               Hob;\r
+\r
+    for (Hob.Raw = HobStart; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_MEMORY_ALLOCATION) {\r
+        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Memory Allocation %08x %0lx - %0lx\n", \\r
+          Hob.MemoryAllocation->AllocDescriptor.MemoryType,                      \\r
+          Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress,               \\r
+          Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress + Hob.MemoryAllocation->AllocDescriptor.MemoryLength - 1));\r
+      }\r
+    }\r
+    for (Hob.Raw = HobStart; !END_OF_HOB_LIST(Hob); Hob.Raw = GET_NEXT_HOB(Hob)) {\r
+      if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV2) {\r
+        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "FV2 Hob           %08x %0lx - %0lx\n", Hob.FirmwareVolume2->BaseAddress, Hob.FirmwareVolume2->BaseAddress + Hob.FirmwareVolume2->Length - 1, Hob.ResourceDescriptor->ResourceType));\r
+      } else if (GET_HOB_TYPE (Hob) == EFI_HOB_TYPE_FV) {\r
+        DEBUG ((DEBUG_INFO | DEBUG_LOAD, "FV Hob            %08x %0lx - %0lx\n", Hob.FirmwareVolume->BaseAddress, Hob.FirmwareVolume->BaseAddress + Hob.FirmwareVolume2->Length - 1, Hob.ResourceDescriptor->ResourceType));\r
+      }\r
+    }\r
+  DEBUG_CODE_END ();\r
+\r
   //\r
   // Initialize the Event Services\r
   //\r
@@ -360,16 +380,16 @@ DxeMain (
   //\r
   // Initialize the DXE Dispatcher\r
   //\r
-  PERF_START (0,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
+  PERF_START (NULL,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
   CoreInitializeDispatcher ();\r
-  PERF_END (0,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
+  PERF_END (NULL,"CoreInitializeDispatcher", "DxeMain", 0) ;\r
 \r
   //\r
   // Invoke the DXE Dispatcher\r
   //\r
-  PERF_START (0, "CoreDispatcher", "DxeMain", 0);\r
+  PERF_START (NULL, "CoreDispatcher", "DxeMain", 0);\r
   CoreDispatcher ();\r
-  PERF_END (0, "CoreDispatcher", "DxeMain", 0);\r
+  PERF_END (NULL, "CoreDispatcher", "DxeMain", 0);\r
 \r
   //\r
   // Display Architectural protocols that were not loaded if this is DEBUG build\r
@@ -396,7 +416,7 @@ DxeMain (
   //\r
   REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueDxeCoreHandoffToBds)\r
+    (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT)\r
     );\r
 \r
   //\r
@@ -650,7 +670,7 @@ CoreExitBootServices (
   //\r
   REPORT_STATUS_CODE (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueBootServiceExit)\r
+    (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)\r
     );\r
 \r
   //\r