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

27 files changed, 60 insertions, 114 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index d4b5f38..0716830 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
@@ -2,7 +2,7 @@
   USB Keyboard Driver that manages USB keyboard and produces Simple Text Input

   Protocol and Simple Text Input Ex Protocol.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 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

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

@@ -193,7 +193,7 @@ USBKeyboardDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardEnable),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_ENABLE),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -202,7 +202,7 @@ USBKeyboardDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -473,7 +473,7 @@ USBKeyboardDriverBindingStop (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardDisable),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_DISABLE),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -658,7 +658,7 @@ USBKeyboardReset (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardReset),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_RESET),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -669,7 +669,7 @@ USBKeyboardReset (
   if (!ExtendedVerification) {

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_PROGRESS_CODE,

-      FixedPcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),

+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_CLEAR_BUFFER),

       UsbKeyboardDevice->DevicePath

       );

     //

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index a231bd6..c7b48b2 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -1,7 +1,7 @@
 /** @file

   Helper functions for USB Keyboard Driver.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 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

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

@@ -811,7 +811,7 @@ InitUSBKeyboard (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueKeyboardSelfTest),

+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST),

     UsbKeyboardDevice->DevicePath

     );

 

@@ -846,7 +846,7 @@ InitUSBKeyboard (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueKeyboardInterfaceError),

+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INTERFACE_ERROR),

       UsbKeyboardDevice->DevicePath

       );

 

@@ -1012,7 +1012,7 @@ KeyboardHandler (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueKeyboardInputError),

+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INPUT_ERROR),

       UsbKeyboardDevice->DevicePath

       );

 

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 25c457d..c583eac 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -13,7 +13,7 @@
 # 2. Universal Serial Bus HID Usage Tables, ver 1.12

 # 3. UEFI Specification, v2.1

 #

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

@@ -87,18 +87,7 @@
   gEfiHiiDatabaseProtocolGuid                   ## SOMETIMES_CONSUMES (Default value is used if it's absent.)

   

 [FeaturePcd.common]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## SOMETIME_CONSUMES (Checked when no layout is provided by HII.)

-  

-[FixedPcd]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardEnable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardPresenceDetect

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardDisable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardReset

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardClearBuffer

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardSelfTest

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInterfaceError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInputError

-  

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## SOMETIME_CONSUMES (Checked when no layout is provided by HII.) 

 

 # [Event]

 #   ##

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
index 5c39f49..8c1cf77 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
@@ -1,7 +1,7 @@
 /** @file

   USB Mouse Driver that manages USB mouse and produces Absolute Pointer Protocol.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 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

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

@@ -232,7 +232,7 @@ USBMouseAbsolutePointerDriverBindingStart (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR),

       UsbMouseAbsolutePointerDevice->DevicePath

       );

 

@@ -275,7 +275,7 @@ USBMouseAbsolutePointerDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE),

     UsbMouseAbsolutePointerDevice->DevicePath

     );

 

@@ -401,7 +401,7 @@ USBMouseAbsolutePointerDriverBindingStop (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE),

     UsbMouseAbsolutePointerDevice->DevicePath

     );

 

@@ -682,7 +682,7 @@ OnMouseInterruptComplete (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR),

       UsbMouseAbsolutePointerDevice->DevicePath

       );

 

@@ -833,7 +833,7 @@ UsbMouseAbsolutePointerReset (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseReset),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET),

     UsbMouseAbsolutePointerDevice->DevicePath

     );

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 2fa0864..2faddd7 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
@@ -28,7 +28,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiLib.h>

 #include <Library/MemoryAllocationLib.h>

-#include <Library/PcdLib.h>

 #include <Library/UefiUsbLib.h>

 #include <Library/DebugLib.h>

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
index 343f9a4..56b93d2 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
@@ -9,7 +9,7 @@
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11

 # 2. UEFI Specification, v2.1

 #

-# 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,7 +56,6 @@
   UefiDriverEntryPoint

   BaseMemoryLib

   ReportStatusCodeLib

-  PcdLib

   UefiUsbLib

 

 [Protocols]

@@ -64,13 +63,6 @@
   gEfiDevicePathProtocolGuid                    ## TO_START

   gEfiAbsolutePointerProtocolGuid               ## BY_START

 

-[FixedPcd]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset

-

 # [Event]

 #   ##

 #   # Periodic timer event for delayed recovery, which deals with device error.

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index 667dd2f..8713a95 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -1,7 +1,7 @@
 /** @file

   USB Mouse Driver that manages USB mouse and produces Simple Pointer Protocol.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 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

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

@@ -232,7 +232,7 @@ USBMouseDriverBindingStart (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR),

       UsbMouseDevice->DevicePath

       );

 

@@ -275,7 +275,7 @@ USBMouseDriverBindingStart (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE),

     UsbMouseDevice->DevicePath

     );

 

@@ -401,7 +401,7 @@ USBMouseDriverBindingStop (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE),

     UsbMouseDevice->DevicePath

     );

 

@@ -688,7 +688,7 @@ OnMouseInterruptComplete (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),

+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR),

       UsbMouseDevice->DevicePath

       );

 

@@ -838,7 +838,7 @@ UsbMouseReset (
 

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    FixedPcdGet32 (PcdStatusCodeValueMouseReset),

+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET),

     UsbMouseDevice->DevicePath

     );

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 36d337e..3af139d 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
@@ -28,7 +28,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiLib.h>

 #include <Library/MemoryAllocationLib.h>

-#include <Library/PcdLib.h>

 #include <Library/UefiUsbLib.h>

 #include <Library/DebugLib.h>

 

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
index 3466435..7097520 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
@@ -9,7 +9,7 @@
 # 1. Universal Serial Bus HID Firmware Specification, ver 1.11

 # 2. UEFI Specification, v2.1

 #

-# 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,7 +56,6 @@
   UefiDriverEntryPoint

   BaseMemoryLib

   ReportStatusCodeLib

-  PcdLib

   UefiUsbLib

 

 [Protocols]

@@ -64,13 +63,6 @@
   gEfiDevicePathProtocolGuid                    ## TO_START

   gEfiSimplePointerProtocolGuid                 ## BY_START

 

-[FixedPcd]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset

-

 # [Event]

 #   ##

 #   # Periodic timer event for delayed recovery, which deals with device error.

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 5fbb2d4..d12cb8e 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 d94e864..a5b90cf 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 b1cb5a1..52f9437 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 d48a0a0..fda8dcb 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 442e4d6..4a0c9dd 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 6883bc3..7e27ae7 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 be13b1d..b2747bb 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 3eb9b7f..6969ce3 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 2f2a3a7..89731e0 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 d477a747..770f9b4 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 2d58351..a2b4a46 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
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index b68d45f..b6a191f 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -2,7 +2,7 @@
   Produces Simple Text Input Protocol, Simple Text Input Extended Protocol and

   Simple Text Output Protocol upon Serial IO Protocol.

 

-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

@@ -670,7 +670,7 @@ ReportError:
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_ERROR_CODE | EFI_ERROR_MINOR,

-    PcdGet32 (PcdStatusCodeValueRemoteConsoleError),

+    (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR),

     DevicePath

     );

 

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index a3104dd..c6d4ecd 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -1,7 +1,7 @@
 /** @file

   Implementation for EFI_SIMPLE_TEXT_INPUT_PROTOCOL protocol.

 

-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

@@ -113,7 +113,7 @@ TerminalConInReset (
   //

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_PROGRESS_CODE,

-    PcdGet32 (PcdStatusCodeValueRemoteConsoleReset),

+    (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET),

     TerminalDevice->DevicePath

     );

 

@@ -129,7 +129,7 @@ TerminalConInReset (
   if (EFI_ERROR (Status)) {

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_ERROR_CODE | EFI_ERROR_MINOR,

-      PcdGet32 (PcdStatusCodeValueRemoteConsoleError),

+      (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR),

       TerminalDevice->DevicePath

       );

   }

@@ -636,7 +636,7 @@ TerminalConInCheckForKey (
       if (Status == EFI_DEVICE_ERROR) {

         REPORT_STATUS_CODE_WITH_DEVICE_PATH (

           EFI_ERROR_CODE | EFI_ERROR_MINOR,

-          PcdGet32 (PcdStatusCodeValueRemoteConsoleInputError),

+          (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR),

           TerminalDevice->DevicePath

           );

       }

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index a303dca..6efd352 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -1,7 +1,7 @@
 /** @file

   Implementation for EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL protocol.

 

-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

@@ -124,7 +124,7 @@ TerminalConOutReset (
     //

     REPORT_STATUS_CODE_WITH_DEVICE_PATH (

       EFI_PROGRESS_CODE,

-      PcdGet32 (PcdStatusCodeValueRemoteConsoleReset),

+      (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET),

       TerminalDevice->DevicePath

       );

 

@@ -135,7 +135,7 @@ TerminalConOutReset (
       //

       REPORT_STATUS_CODE_WITH_DEVICE_PATH (

         EFI_ERROR_CODE | EFI_ERROR_MINOR,

-        PcdGet32 (PcdStatusCodeValueRemoteConsoleError),

+        (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR),

         TerminalDevice->DevicePath

         );

 

@@ -328,7 +328,7 @@ TerminalConOutOutputString (
 OutputError:

   REPORT_STATUS_CODE_WITH_DEVICE_PATH (

     EFI_ERROR_CODE | EFI_ERROR_MINOR,

-    PcdGet32 (PcdStatusCodeValueRemoteConsoleOutputError),

+    (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR),

     TerminalDevice->DevicePath

     );

 

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index ca50e42..d5fa044 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -4,7 +4,7 @@
 #

 #  This driver installs Simple Text In/Out protocol for terminal devices (serial devices or hotplug devices).

 #

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

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

@@ -73,10 +73,6 @@
   gEfiSimpleTextOutProtocolGuid                 ## BY_START

 

 [Pcd]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleReset

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError

   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType

 

 # [Event]

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index e43acbf..5a98215 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
@@ -1,7 +1,7 @@
 /** @file

   Implementation of Watchdog Timer Architectural Protocol using UEFI APIs.

   

-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

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

@@ -66,7 +66,7 @@ WatchdogTimerDriverExpires (
   IN VOID         *Context

   )

 {

-  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, FixedPcdGet32 (PcdStatusCodeValueEfiWatchDogTimerExpired));

+  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED));

 

   //

   // If a notification function has been registered, then call it

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
index bd76081..e80af97 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
@@ -23,7 +23,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/ReportStatusCodeLib.h>

 #include <Library/UefiBootServicesTableLib.h>

 #include <Library/UefiRuntimeServicesTableLib.h>

-#include <Library/PcdLib.h>

 #include <Protocol/WatchdogTimer.h>

 

 

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
index 2eb24e3..720fd54 100644
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
@@ -1,7 +1,7 @@
 #/** @file

 # Generic watchdog timer driver produceing Watchdog Timer Architectural Protocol using UEFI APIs.

 #

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

@@ -40,14 +40,10 @@
   ReportStatusCodeLib

   UefiDriverEntryPoint

   DebugLib

-  PcdLib

 

 [Protocols]

   gEfiWatchdogTimerArchProtocolGuid             ## PRODUCES

 

-[FixedPcd.common]

-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired

-

 [depex]

   gEfiTimerArchProtocolGuid