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

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

3 files changed, 8 insertions, 15 deletions

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 5fbb2d442d..d12cb8e42d 100644
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -26,7 +26,7 @@
   Depex - Dependency Expresion.

   SOR   - Schedule On Request - Don't schedule if this bit is set.

 

-Copyright (c) 2006 - 2009, Intel Corporation. <BR>

+Copyright (c) 2006 - 2010, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -527,7 +527,7 @@ CoreDispatcher (
  

       REPORT_STATUS_CODE_WITH_EXTENDED_DATA (

         EFI_PROGRESS_CODE,

-        FixedPcdGet32(PcdStatusCodeValueDxeDriverBegin),

+        (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_BEGIN),

         &DriverEntry->ImageHandle,

         sizeof (DriverEntry->ImageHandle)

         );

@@ -536,7 +536,7 @@ CoreDispatcher (
 

       REPORT_STATUS_CODE_WITH_EXTENDED_DATA (

         EFI_PROGRESS_CODE,

-        FixedPcdGet32(PcdStatusCodeValueDxeDriverEnd),

+        (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_END),

         &DriverEntry->ImageHandle,

         sizeof (DriverEntry->ImageHandle)

         );

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index d94e864b40..a5b90cf1dd 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -2,7 +2,7 @@
 #  This is core module in DXE phase. It provides an implementation of DXE Core that is

 #  compliant with DXE CIS.  

 #  

-#  Copyright (c) 2006 - 2009, Intel Corporation. <BR>

+#  Copyright (c) 2006 - 2010, Intel Corporation. <BR>

 #  All rights reserved. This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -136,12 +136,5 @@
   gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES

   gEfiLoadedImageDevicePathProtocolGuid         ## PRODUCES

 

-[FixedPcd.common]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreEntry

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreHandoffToBds

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueBootServiceExit

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverBegin

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverEnd

-

 [FeaturePcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport	   ## CONSUMES

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index b1cb5a1f7f..52f9437b9e 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -1,7 +1,7 @@
 /** @file

   DXE Core Main Entry Point

 

-Copyright (c) 2006 - 2009, Intel Corporation. <BR>

+Copyright (c) 2006 - 2010, Intel Corporation. <BR>

 All rights reserved. This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -290,7 +290,7 @@ DxeMain (
   //

   REPORT_STATUS_CODE (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32(PcdStatusCodeValueDxeCoreEntry)

+    (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_ENTRY_POINT)

     );

 

   //

@@ -416,7 +416,7 @@ DxeMain (
   //

   REPORT_STATUS_CODE (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueDxeCoreHandoffToBds)

+    (EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_CORE_PC_HANDOFF_TO_NEXT)

     );

 

   //

@@ -670,7 +670,7 @@ CoreExitBootServices (
   //

   REPORT_STATUS_CODE (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueBootServiceExit)

+    (EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES)

     );

 

   //