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

11 files changed, 20 insertions, 36 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)

     );

 

   //

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index d48a0a0866..fda8dcb766 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -5,7 +5,7 @@
 #  PPI to discover and dispatch the DXE Foundation and components that are

 #  needed to run the DXE Foundation.

 #

-#  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

@@ -92,9 +92,6 @@
 [FeaturePcd.common]

   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress

 

-[FixedPcd.common]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiHandoffToDxe

-

 [Depex]

   gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid

 

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 442e4d6cae..4a0c9ddb67 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -2,7 +2,7 @@
   Last PEIM.

   Responsibility of this module is to load the DXE Core from a Firmware Volume.

 

-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

@@ -271,7 +271,7 @@ DxeLoadCore (
   //

   // Report Status Code EFI_SW_PEI_PC_HANDOFF_TO_NEXT

   //

-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValuePeiHandoffToDxe));

+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_PEI_CORE | EFI_SW_PEI_CORE_PC_HANDOFF_TO_NEXT));

 

   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DXE CORE at 0x%11p EntryPoint=0x%11p\n", (VOID *)(UINTN)DxeCoreAddress, FUNCTION_ENTRY_POINT (DxeCoreEntryPoint)));

 

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 6883bc300f..7e27ae7723 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -420,7 +420,7 @@ PeiDispatcher (
 

               REPORT_STATUS_CODE_WITH_EXTENDED_DATA (

                 EFI_PROGRESS_CODE,

-                PcdGet32(PcdStatusCodeValuePeimDispatch),

+                (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),

                 (VOID *)(&ExtendedData),

                 sizeof (ExtendedData)

                 );

@@ -445,7 +445,7 @@ PeiDispatcher (
 

               REPORT_STATUS_CODE_WITH_EXTENDED_DATA (

                 EFI_PROGRESS_CODE,

-                PcdGet32(PcdStatusCodeValuePeimDispatch),

+                (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),

                 (VOID *)(&ExtendedData),

                 sizeof (ExtendedData)

                 );

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index be13b1df59..b2747bbd7c 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -90,9 +90,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported      ## CONSUMES

 

 [Pcd]  

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch                    ## CONSUMES

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry                    ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize                   ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst   ## CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport            ## CONSUMES

-  
\ No newline at end of file
+  

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 3eb9b7f543..6969ce3ffe 100644
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -184,7 +184,7 @@ PeiCore (
     //

     REPORT_STATUS_CODE (

       EFI_PROGRESS_CODE,

-      PcdGet32 (PcdStatusCodeValuePeiCoreEntry)

+      (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT)

       );

       

     PERF_START (NULL, "SEC", NULL, 1);

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index 2f2a3a7602..89731e0cd8 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
@@ -35,7 +35,7 @@ Revision History:
   Table now contains an item named CalculateCrc32.

 

 

-Copyright (c) 2006 - 2008, 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

@@ -277,7 +277,7 @@ RuntimeDriverSetVirtualAddressMap (
   //

   // ReporstStatusCodeLib will check and make sure this service can be called in runtime mode.

   //

-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValueSetVirtualAddressMap));

+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_EFI_RUNTIME_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP));

 

   //

   // Signal all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE events.

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index d477a747d4..770f9b4ba0 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -3,7 +3,7 @@
 

   This code is used to produce the EFI runtime architectural protocol.

 

-Copyright (c) 2006, 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

@@ -29,7 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiLib.h>

 #include <Library/CacheMaintenanceLib.h>

 #include <Library/PeCoffLib.h>

-#include <Library/PcdLib.h>

 

 

 //

diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
index 2d583518af..a2b4a4699f 100644
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
@@ -5,7 +5,7 @@
 #  CalculateCrc32 boot services table, SetVirtualAddressMap & ConvertPointer

 #  runtime services table.

 #

-#  Copyright (c) 2006 - 2008, Intel Corporation

+#  Copyright (c) 2006 - 2010, Intel Corporation

 #

 #  All rights reserved. This program and the accompanying materials

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

@@ -56,9 +56,6 @@
 [Protocols]

   gEfiRuntimeArchProtocolGuid                   ## PRODUCES

   gEfiLoadedImageProtocolGuid                   ## CONSUMES

-

-[FixedPcd.common]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap

-  

+ 

 [depex]

   TRUE  
\ No newline at end of file