From ff37790d3d3805b232cecb19867d19f44860112c Mon Sep 17 00:00:00 2001
From: AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 16 Aug 2007 23:32:10 +0000
Subject: [PATCH 1/1] Cleaned up EFI Console Variable usage

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3666 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Console/ConPlatformDxe/ConPlatform.c         | 16 ++++++++--------
 .../Console/ConPlatformDxe/ConPlatform.h         |  6 ------
 .../Universal/Console/TerminalDxe/Terminal.c     | 12 ++++++------
 .../Universal/Console/TerminalDxe/Terminal.h     |  4 ----
 4 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
index 178be23ca5..1a32cb3016 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
@@ -279,7 +279,7 @@ Returns:
     // Append the device path to the ConInDev environment variable
     //
     ConPlatformUpdateDeviceVariable (
-      VarConsoleInpDev,
+      L"ConInDev",
       DevicePath,
       APPEND
       );
@@ -289,7 +289,7 @@ Returns:
     // then install EfiConsoleInDeviceGuid onto ControllerHandle
     //
     Status = ConPlatformUpdateDeviceVariable (
-              VarConsoleInp,
+              L"ConIn",
               DevicePath,
               CHECK
               );
@@ -387,7 +387,7 @@ Returns:
     // Append the device path to the ConOutDev environment variable
     //
     ConPlatformUpdateDeviceVariable (
-      VarConsoleOutDev,
+      L"ConOutDev",
       DevicePath,
       APPEND
       );
@@ -395,7 +395,7 @@ Returns:
     // Append the device path to the StdErrDev environment variable
     //
     ConPlatformUpdateDeviceVariable (
-      VarErrorOutDev,
+      L"ErrOutDev",
       DevicePath,
       APPEND
       );
@@ -405,7 +405,7 @@ Returns:
     // then install EfiConsoleOutDeviceGuid onto ControllerHandle
     //
     Status = ConPlatformUpdateDeviceVariable (
-              VarConsoleOut,
+              L"ConOut",
               DevicePath,
               CHECK
               );
@@ -496,7 +496,7 @@ Returns:
       // Remove DevicePath from ConInDev
       //
       ConPlatformUpdateDeviceVariable (
-        VarConsoleInpDev,
+        L"ConInDev",
         DevicePath,
         DELETE
         );
@@ -569,12 +569,12 @@ Returns:
       // Remove DevicePath from ConOutDev, and StdErrDev
       //
       ConPlatformUpdateDeviceVariable (
-        VarConsoleOutDev,
+        L"ConOutDev",
         DevicePath,
         DELETE
         );
       ConPlatformUpdateDeviceVariable (
-        VarErrorOutDev,
+        L"ErrOutDev",
         DevicePath,
         DELETE
         );
diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
index f408ede7a4..2d79f02a2e 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.h
@@ -46,12 +46,6 @@ extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;
 extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding;
 extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;
 
-#define VarConsoleInpDev  L"ConInDev"
-#define VarConsoleInp     L"ConIn"
-#define VarConsoleOutDev  L"ConOutDev"
-#define VarConsoleOut     L"ConOut"
-#define VarErrorOutDev    L"ErrOutDev"
-#define VarErrorOut       L"ErrOut"
 
 typedef enum {
   CHECK,
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
index 5b8cb8da0b..e9096a3db9 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.c
@@ -306,9 +306,9 @@ TerminalDriverBindingStart (
                       EFI_OPEN_PROTOCOL_TEST_PROTOCOL
                       );
       if (EFI_ERROR (Status)) {
-        TerminalUpdateConsoleDevVariable ((CHAR16 *)VarConsoleInpDev, ParentDevicePath);
-        TerminalUpdateConsoleDevVariable ((CHAR16 *)VarConsoleOutDev, ParentDevicePath);
-        TerminalUpdateConsoleDevVariable ((CHAR16 *)VarErrorOutDev, ParentDevicePath);
+        TerminalUpdateConsoleDevVariable (L"ConInDev", ParentDevicePath);
+        TerminalUpdateConsoleDevVariable ((L"ConOutDev", ParentDevicePath);
+        TerminalUpdateConsoleDevVariable (L"ErrOutDev", ParentDevicePath);
       }
     }
   }
@@ -707,9 +707,9 @@ TerminalDriverBindingStop (
       // Remove Parent Device Path from
       // the Console Device Environment Variables
       //
-      TerminalRemoveConsoleDevVariable ((CHAR16 *)VarConsoleInpDev, ParentDevicePath);
-      TerminalRemoveConsoleDevVariable ((CHAR16 *)VarConsoleOutDev, ParentDevicePath);
-      TerminalRemoveConsoleDevVariable ((CHAR16 *)VarErrorOutDev, ParentDevicePath);
+      TerminalRemoveConsoleDevVariable (L"ConInDev", ParentDevicePath);
+      TerminalRemoveConsoleDevVariable (L"ConOutDev", ParentDevicePath);
+      TerminalRemoveConsoleDevVariable (L"ErrOutDev", ParentDevicePath);
 
       //
       // Uninstall the Terminal Driver's GUID Tag from the Serial controller
diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
index c4f5ac19f3..7fa16d7d38 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/Terminal.h
@@ -146,10 +146,6 @@ typedef struct {
   CHAR8   Ascii;
 } UNICODE_TO_CHAR;
 
-#define VarConsoleInpDev  L"ConInDev"
-#define VarConsoleOutDev  L"ConOutDev"
-#define VarErrorOutDev    L"ErrOutDev"
-
 //
 // Global Variables
 //
-- 
2.39.2