From f9876ecf8a296a8e0d4ad8d22ed5ff12ecc11f65 Mon Sep 17 00:00:00 2001
From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 27 Jan 2010 04:00:58 +0000
Subject: 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
---
 MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c       | 4 ++--
 MdeModulePkg/Universal/Console/TerminalDxe/TerminalConIn.c  | 8 ++++----
 MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c | 8 ++++----
 MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf  | 6 +-----
 MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.c     | 4 ++--
 MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.h     | 1 -
 MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf   | 6 +-----
 7 files changed, 14 insertions(+), 23 deletions(-)

(limited to 'MdeModulePkg/Universal')

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index b68d45f7a4..b6a191f7ce 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 a3104ddc5a..c6d4ecd081 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 a303dcac07..6efd352bb3 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 ca50e42e62..d5fa0449ba 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 e43acbf221..5a98215825 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 bd76081aec..e80af9736c 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 2eb24e3992..720fd54e6a 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
   
-- 
cgit v1.2.3