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

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/EfiKey.c
index d4b5f38e020662a3889b1786faf54f6e31bb65c8..0716830989fe5f4506c9e1df2513e111bb9dafbc 100644 (file)
--- 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\r
   Protocol and Simple Text Input Ex Protocol.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation\r
+Copyright (c) 2004 - 2010, Intel Corporation\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
@@ -193,7 +193,7 @@ USBKeyboardDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueKeyboardEnable),\r
+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_ENABLE),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -202,7 +202,7 @@ USBKeyboardDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueKeyboardPresenceDetect),\r
+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -473,7 +473,7 @@ USBKeyboardDriverBindingStop (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueKeyboardDisable),\r
+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_DISABLE),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -658,7 +658,7 @@ USBKeyboardReset (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueKeyboardReset),\r
+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_RESET),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -669,7 +669,7 @@ USBKeyboardReset (
   if (!ExtendedVerification) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_PROGRESS_CODE,\r
-      FixedPcdGet32 (PcdStatusCodeValueKeyboardClearBuffer),\r
+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_CLEAR_BUFFER),\r
       UsbKeyboardDevice->DevicePath\r
       );\r
     //\r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
index a231bd6e3eff4d80b4bb238266f6eacf20fe7bf1..c7b48b2a87ce4ef8a104c32046e4920079ab09cc 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/KeyBoard.c
@@ -1,7 +1,7 @@
 /** @file\r
   Helper functions for USB Keyboard Driver.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation\r
+Copyright (c) 2004 - 2010, Intel Corporation\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
@@ -811,7 +811,7 @@ InitUSBKeyboard (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueKeyboardSelfTest),\r
+    (EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST),\r
     UsbKeyboardDevice->DevicePath\r
     );\r
 \r
@@ -846,7 +846,7 @@ InitUSBKeyboard (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      FixedPcdGet32 (PcdStatusCodeValueKeyboardInterfaceError),\r
+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INTERFACE_ERROR),\r
       UsbKeyboardDevice->DevicePath\r
       );\r
 \r
@@ -1012,7 +1012,7 @@ KeyboardHandler (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      FixedPcdGet32 (PcdStatusCodeValueKeyboardInputError),\r
+      (EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INPUT_ERROR),\r
       UsbKeyboardDevice->DevicePath\r
       );\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index 25c457dec2296872dfa9106425b575c7a0703b90..c583eac7b52c34d55cfbb13f190a4fd9d605a91d 100644 (file)
--- 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\r
 # 3. UEFI Specification, v2.1\r
 #\r
-# Copyright (c) 2006 - 2008, Intel Corporation. \r
+# Copyright (c) 2006 - 2010, Intel Corporation. \r
 #\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
@@ -87,18 +87,7 @@
   gEfiHiiDatabaseProtocolGuid                   ## SOMETIMES_CONSUMES (Default value is used if it's absent.)\r
   \r
 [FeaturePcd.common]\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## SOMETIME_CONSUMES (Checked when no layout is provided by HII.)\r
-  \r
-[FixedPcd]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardEnable\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardPresenceDetect\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardDisable\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardReset\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardClearBuffer\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardSelfTest\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInterfaceError\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInputError\r
-  \r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdDisableDefaultKeyboardLayoutInUsbKbDriver ## SOMETIME_CONSUMES (Checked when no layout is provided by HII.) \r
 \r
 # [Event]\r
 #   ##\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
index 5c39f49dd29607fe3d3d6f433211f710c7e55549..8c1cf772c8de1ff7a2dab23325cebf56f27c60d4 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.c
@@ -1,7 +1,7 @@
 /** @file\r
   USB Mouse Driver that manages USB mouse and produces Absolute Pointer Protocol.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation\r
+Copyright (c) 2004 - 2010, Intel Corporation\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
@@ -232,7 +232,7 @@ USBMouseAbsolutePointerDriverBindingStart (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),\r
+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR),\r
       UsbMouseAbsolutePointerDevice->DevicePath\r
       );\r
 \r
@@ -275,7 +275,7 @@ USBMouseAbsolutePointerDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),\r
+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE),\r
     UsbMouseAbsolutePointerDevice->DevicePath\r
     );\r
 \r
@@ -401,7 +401,7 @@ USBMouseAbsolutePointerDriverBindingStop (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),\r
+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE),\r
     UsbMouseAbsolutePointerDevice->DevicePath\r
     );\r
 \r
@@ -682,7 +682,7 @@ OnMouseInterruptComplete (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),\r
+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR),\r
       UsbMouseAbsolutePointerDevice->DevicePath\r
       );\r
 \r
@@ -833,7 +833,7 @@ UsbMouseAbsolutePointerReset (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueMouseReset),\r
+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET),\r
     UsbMouseAbsolutePointerDevice->DevicePath\r
     );\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointer.h
index 2fa0864b4012aad10fe0da46501a8b3e2844f558..2faddd73d9b44743029ba523ff7a8aba7108ef5b 100644 (file)
--- 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>\r
 #include <Library/UefiLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
-#include <Library/PcdLib.h>\r
 #include <Library/UefiUsbLib.h>\r
 #include <Library/DebugLib.h>\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseAbsolutePointerDxe/UsbMouseAbsolutePointerDxe.inf
index 343f9a4482c3755767c2af5ce6f0f5a84c411678..56b93d2452767dd3cbc6f59774d4311fcc599e2d 100644 (file)
--- 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\r
 # 2. UEFI Specification, v2.1\r
 #\r
-# Copyright (c) 2006 - 2008, Intel Corporation. \r
+# Copyright (c) 2006 - 2010, Intel Corporation. \r
 #\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
@@ -56,7 +56,6 @@
   UefiDriverEntryPoint\r
   BaseMemoryLib\r
   ReportStatusCodeLib\r
-  PcdLib\r
   UefiUsbLib\r
 \r
 [Protocols]\r
@@ -64,13 +63,6 @@
   gEfiDevicePathProtocolGuid                    ## TO_START\r
   gEfiAbsolutePointerProtocolGuid               ## BY_START\r
 \r
-[FixedPcd]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset\r
-\r
 # [Event]\r
 #   ##\r
 #   # Periodic timer event for delayed recovery, which deals with device error.\r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
index 667dd2f902eb7e51e8cbc410220c4e432766013d..8713a9540a567d1f832604e6b6cbc970cb8c78a0 100644 (file)
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.c
@@ -1,7 +1,7 @@
 /** @file\r
   USB Mouse Driver that manages USB mouse and produces Simple Pointer Protocol.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation\r
+Copyright (c) 2004 - 2010, Intel Corporation\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
@@ -232,7 +232,7 @@ USBMouseDriverBindingStart (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      FixedPcdGet32 (PcdStatusCodeValueMouseInterfaceError),\r
+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR),\r
       UsbMouseDevice->DevicePath\r
       );\r
 \r
@@ -275,7 +275,7 @@ USBMouseDriverBindingStart (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueMouseEnable),\r
+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE),\r
     UsbMouseDevice->DevicePath\r
     );\r
 \r
@@ -401,7 +401,7 @@ USBMouseDriverBindingStop (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueMouseDisable),\r
+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE),\r
     UsbMouseDevice->DevicePath\r
     );\r
 \r
@@ -688,7 +688,7 @@ OnMouseInterruptComplete (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      FixedPcdGet32 (PcdStatusCodeValueMouseInputError),\r
+      (EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR),\r
       UsbMouseDevice->DevicePath\r
       );\r
 \r
@@ -838,7 +838,7 @@ UsbMouseReset (
 \r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    FixedPcdGet32 (PcdStatusCodeValueMouseReset),\r
+    (EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET),\r
     UsbMouseDevice->DevicePath\r
     );\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouse.h
index 36d337eccdd03768ec9a0f5e34cc612bb58bcb82..3af139d25c97b5fe0bd544884979ff2974305ab5 100644 (file)
--- 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>\r
 #include <Library/UefiLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
-#include <Library/PcdLib.h>\r
 #include <Library/UefiUsbLib.h>\r
 #include <Library/DebugLib.h>\r
 \r

diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
index 3466435e5c79486980064508b6b86ef3d9dd42a9..7097520e81c098099c5a06b95f174199741ebed0 100644 (file)
--- 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\r
 # 2. UEFI Specification, v2.1\r
 #\r
-# Copyright (c) 2006 - 2008, Intel Corporation. \r
+# Copyright (c) 2006 - 2010, Intel Corporation. \r
 #\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
@@ -56,7 +56,6 @@
   UefiDriverEntryPoint\r
   BaseMemoryLib\r
   ReportStatusCodeLib\r
-  PcdLib\r
   UefiUsbLib\r
 \r
 [Protocols]\r
@@ -64,13 +63,6 @@
   gEfiDevicePathProtocolGuid                    ## TO_START\r
   gEfiSimplePointerProtocolGuid                 ## BY_START\r
 \r
-[FixedPcd]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset\r
-\r
 # [Event]\r
 #   ##\r
 #   # Periodic timer event for delayed recovery, which deals with device error.\r

diff --git a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
index 5fbb2d442d2d4d2406ce55aa98ba7bc8c5c5e686..d12cb8e42d37f7104df9a2416d0f9f3f3a70f2a4 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Dxe/Dispatcher/Dispatcher.c
@@ -26,7 +26,7 @@
   Depex - Dependency Expresion.\r
   SOR   - Schedule On Request - Don't schedule if this bit is set.\r
 \r
-Copyright (c) 2006 - 2009, 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
@@ -527,7 +527,7 @@ CoreDispatcher (
  \r
       REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
         EFI_PROGRESS_CODE,\r
-        FixedPcdGet32(PcdStatusCodeValueDxeDriverBegin),\r
+        (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_BEGIN),\r
         &DriverEntry->ImageHandle,\r
         sizeof (DriverEntry->ImageHandle)\r
         );\r
@@ -536,7 +536,7 @@ CoreDispatcher (
 \r
       REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
         EFI_PROGRESS_CODE,\r
-        FixedPcdGet32(PcdStatusCodeValueDxeDriverEnd),\r
+        (EFI_SOFTWARE_DXE_CORE | EFI_SW_PC_INIT_END),\r
         &DriverEntry->ImageHandle,\r
         sizeof (DriverEntry->ImageHandle)\r
         );\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index d94e864b40ae7e899b17d11a873647626f7e3df7..a5b90cf1dd732e2d3bd1d36837feee10f6f74985 100644 (file)
--- 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\r
 #  compliant with DXE CIS.  \r
 #  \r
-#  Copyright (c) 2006 - 2009, 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
@@ -136,12 +136,5 @@
   gEfiEbcProtocolGuid                           ## SOMETIMES_CONSUMES\r
   gEfiLoadedImageDevicePathProtocolGuid         ## PRODUCES\r
 \r
-[FixedPcd.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreEntry\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeCoreHandoffToBds\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueBootServiceExit\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverBegin\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueDxeDriverEnd\r
-\r
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport         ## CONSUMES\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index b1cb5a1f7f1d536089164c90a11dda1450e764ac..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 - 2009, 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
@@ -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
@@ -416,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
@@ -670,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

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index d48a0a08666aae0a56703cbba38626ef8ae7caf0..fda8dcb7661b1c792a428603185a3ebb6704539c 100644 (file)
--- 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\r
 #  needed to run the DXE Foundation.\r
 #\r
-#  Copyright (c) 2006 - 2009, 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
@@ -92,9 +92,6 @@
 [FeaturePcd.common]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportUefiDecompress\r
 \r
-[FixedPcd.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiHandoffToDxe\r
-\r
 [Depex]\r
   gEfiPeiMemoryDiscoveredPpiGuid AND gEfiPeiLoadFilePpiGuid\r
 \r

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 442e4d6caeb0d4b4ba7d60dea2e0d58cfc09c442..4a0c9ddb67cb1332375bd427b3fc61eee187c3c0 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -2,7 +2,7 @@
   Last PEIM.\r
   Responsibility of this module is to load the DXE Core from a Firmware Volume.\r
 \r
-Copyright (c) 2006 - 2009, 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
@@ -271,7 +271,7 @@ DxeLoadCore (
   //\r
   // Report Status Code EFI_SW_PEI_PC_HANDOFF_TO_NEXT\r
   //\r
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValuePeiHandoffToDxe));\r
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_PEI_CORE | EFI_SW_PEI_CORE_PC_HANDOFF_TO_NEXT));\r
 \r
   DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Loading DXE CORE at 0x%11p EntryPoint=0x%11p\n", (VOID *)(UINTN)DxeCoreAddress, FUNCTION_ENTRY_POINT (DxeCoreEntryPoint)));\r
 \r

diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 6883bc300f1f35ecaeb110cb92501d751b889cb6..7e27ae772346263158e93b728fd7e36c030278a1 100644 (file)
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -420,7 +420,7 @@ PeiDispatcher (
 \r
               REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
                 EFI_PROGRESS_CODE,\r
-                PcdGet32(PcdStatusCodeValuePeimDispatch),\r
+                (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
                 (VOID *)(&ExtendedData),\r
                 sizeof (ExtendedData)\r
                 );\r
@@ -445,7 +445,7 @@ PeiDispatcher (
 \r
               REPORT_STATUS_CODE_WITH_EXTENDED_DATA (\r
                 EFI_PROGRESS_CODE,\r
-                PcdGet32(PcdStatusCodeValuePeimDispatch),\r
+                (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT_BEGIN),\r
                 (VOID *)(&ExtendedData),\r
                 sizeof (ExtendedData)\r
                 );\r

diff --git a/MdeModulePkg/Core/Pei/PeiMain.inf b/MdeModulePkg/Core/Pei/PeiMain.inf
index be13b1df598cf4a9e766c94abe64b636489bc79c..b2747bbd7ca93028eb7f6e14d3d8330646f605ce 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.inf
+++ b/MdeModulePkg/Core/Pei/PeiMain.inf
@@ -90,9 +90,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPpiSupported      ## CONSUMES\r
 \r
 [Pcd]  \r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeimDispatch                    ## CONSUMES\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValuePeiCoreEntry                    ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreMaxPeiStackSize                   ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdPeiCoreImageLoaderSearchTeSectionFirst   ## CONSUMES\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport            ## CONSUMES\r
-  
\ No newline at end of file
+  \r

diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
index 3eb9b7f543fa6850929f1c4615c9a6f082f2ea69..6969ce3ffe9fd8ee588e9285d03f5c4cca5bf147 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
+++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
@@ -184,7 +184,7 @@ PeiCore (
     //\r
     REPORT_STATUS_CODE (\r
       EFI_PROGRESS_CODE,\r
-      PcdGet32 (PcdStatusCodeValuePeiCoreEntry)\r
+      (EFI_SOFTWARE_PEI_CORE | EFI_SW_PC_INIT)\r
       );\r
       \r
     PERF_START (NULL, "SEC", NULL, 1);\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index 2f2a3a760290ff7c694ac3be7be2fc8d57eb8329..89731e0cd8731f0e49ce00197b73828709ede75f 100644 (file)
--- 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.\r
 \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
@@ -277,7 +277,7 @@ RuntimeDriverSetVirtualAddressMap (
   //\r
   // ReporstStatusCodeLib will check and make sure this service can be called in runtime mode.\r
   //\r
-  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, FixedPcdGet32 (PcdStatusCodeValueSetVirtualAddressMap));\r
+  REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_EFI_RUNTIME_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP));\r
 \r
   //\r
   // Signal all the EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE events.\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index d477a747d433a0e0e1b9bd7f64a85a8768e2f0bb..770f9b4ba0dd0c6ac85eda9767d49077d09c44fa 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -3,7 +3,7 @@
 \r
   This code is used to produce the EFI runtime architectural protocol.\r
 \r
-Copyright (c) 2006, 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
@@ -29,7 +29,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiLib.h>\r
 #include <Library/CacheMaintenanceLib.h>\r
 #include <Library/PeCoffLib.h>\r
-#include <Library/PcdLib.h>\r
 \r
 \r
 //\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
index 2d583518af544e8f95c7df9ad36e3056bc43fa52..a2b4a4699fe34d507a3c364acf7a8996212ade53 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
@@ -5,7 +5,7 @@
 #  CalculateCrc32 boot services table, SetVirtualAddressMap & ConvertPointer\r
 #  runtime services table.\r
 #\r
-#  Copyright (c) 2006 - 2008, Intel Corporation\r
+#  Copyright (c) 2006 - 2010, Intel Corporation\r
 #\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
@@ -56,9 +56,6 @@
 [Protocols]\r
   gEfiRuntimeArchProtocolGuid                   ## PRODUCES\r
   gEfiLoadedImageProtocolGuid                   ## CONSUMES\r
-\r
-[FixedPcd.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap\r
-  \r
+ \r
 [depex]\r
   TRUE  
\ No newline at end of file

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index b68d45f7a4c659f665d45f13727fb714a17a87c0..b6a191f7ce5dea549d895ff02abc62553737506f 100644 (file)
--- 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\r
   Simple Text Output Protocol upon Serial IO Protocol.\r
 \r
-Copyright (c) 2006 - 2009, 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
@@ -670,7 +670,7 @@ ReportError:
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-    PcdGet32 (PcdStatusCodeValueRemoteConsoleError),\r
+    (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR),\r
     DevicePath\r
     );\r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
index a3104ddc5a508254f6085a291c0155213e8c8bd9..c6d4ecd0818dd683bb28426597ff27c50686b1f1 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation for EFI_SIMPLE_TEXT_INPUT_PROTOCOL protocol.\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
@@ -113,7 +113,7 @@ TerminalConInReset (
   //\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_PROGRESS_CODE,\r
-    PcdGet32 (PcdStatusCodeValueRemoteConsoleReset),\r
+    (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET),\r
     TerminalDevice->DevicePath\r
     );\r
 \r
@@ -129,7 +129,7 @@ TerminalConInReset (
   if (EFI_ERROR (Status)) {\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-      PcdGet32 (PcdStatusCodeValueRemoteConsoleError),\r
+      (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR),\r
       TerminalDevice->DevicePath\r
       );\r
   }\r
@@ -636,7 +636,7 @@ TerminalConInCheckForKey (
       if (Status == EFI_DEVICE_ERROR) {\r
         REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
           EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-          PcdGet32 (PcdStatusCodeValueRemoteConsoleInputError),\r
+          (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR),\r
           TerminalDevice->DevicePath\r
           );\r
       }\r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
index a303dcac072534b865f382bb01f502ff85815da5..6efd352bb3bc9b3e8235d60f8a1123c00330cf3a 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation for EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL protocol.\r
 \r
-Copyright (c) 2006 - 2009, 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
@@ -124,7 +124,7 @@ TerminalConOutReset (
     //\r
     REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
       EFI_PROGRESS_CODE,\r
-      PcdGet32 (PcdStatusCodeValueRemoteConsoleReset),\r
+      (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET),\r
       TerminalDevice->DevicePath\r
       );\r
 \r
@@ -135,7 +135,7 @@ TerminalConOutReset (
       //\r
       REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
         EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-        PcdGet32 (PcdStatusCodeValueRemoteConsoleError),\r
+        (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR),\r
         TerminalDevice->DevicePath\r
         );\r
 \r
@@ -328,7 +328,7 @@ TerminalConOutOutputString (
 OutputError:\r
   REPORT_STATUS_CODE_WITH_DEVICE_PATH (\r
     EFI_ERROR_CODE | EFI_ERROR_MINOR,\r
-    PcdGet32 (PcdStatusCodeValueRemoteConsoleOutputError),\r
+    (EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR),\r
     TerminalDevice->DevicePath\r
     );\r
 \r

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index ca50e42e627d0f9704e0622dd67aa48d17a3a738..d5fa0449bae8cd4e7709c72a163fb5e79f3e95d5 100644 (file)
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -4,7 +4,7 @@
 #\r
 #  This driver installs Simple Text In/Out protocol for terminal devices (serial devices or hotplug devices).\r
 #\r
-#  Copyright (c) 2006 - 2008, Intel Corporation\r
+#  Copyright (c) 2006 - 2010, Intel Corporation\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
@@ -73,10 +73,6 @@
   gEfiSimpleTextOutProtocolGuid                 ## BY_START\r
 \r
 [Pcd]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleReset\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError\r
   gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType\r
 \r
 # [Event]\r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
index e43acbf221cec9e0b114a27ee7e071598574d01a..5a9821582507e6fa5844c609c6505c4d82b193c2 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c
@@ -1,7 +1,7 @@
 /** @file\r
   Implementation of Watchdog Timer Architectural Protocol using UEFI APIs.\r
   \r
-Copyright (c) 2006 - 2008, Intel Corporation\r
+Copyright (c) 2006 - 2010, Intel Corporation\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
@@ -66,7 +66,7 @@ WatchdogTimerDriverExpires (
   IN VOID         *Context\r
   )\r
 {\r
-  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, FixedPcdGet32 (PcdStatusCodeValueEfiWatchDogTimerExpired));\r
+  REPORT_STATUS_CODE (EFI_ERROR_CODE | EFI_ERROR_MINOR, (EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED));\r
 \r
   //\r
   // If a notification function has been registered, then call it\r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h
index bd76081aec1133bdb72410d0f6407137af85f5e9..e80af9736c1f2744674614c2a3865f47b95f1372 100644 (file)
--- 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>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiRuntimeServicesTableLib.h>\r
-#include <Library/PcdLib.h>\r
 #include <Protocol/WatchdogTimer.h>\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
index 2eb24e3992b8e896df32da635530d9b27eac72e9..720fd54e6a45d92b69ebdf57dabd2c95cb822206 100644 (file)
--- a/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
+++ b/MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf
@@ -1,7 +1,7 @@
 #/** @file\r
 # Generic watchdog timer driver produceing Watchdog Timer Architectural Protocol using UEFI APIs.\r
 #\r
-# Copyright (c) 2006 - 2008, Intel Corporation\r
+# Copyright (c) 2006 - 2010, Intel Corporation\r
 #\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
@@ -40,14 +40,10 @@
   ReportStatusCodeLib\r
   UefiDriverEntryPoint\r
   DebugLib\r
-  PcdLib\r
 \r
 [Protocols]\r
   gEfiWatchdogTimerArchProtocolGuid             ## PRODUCES\r
 \r
-[FixedPcd.common]\r
-  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired\r
-\r
 [depex]\r
   gEfiTimerArchProtocolGuid\r
   \r