Cleaned up EFI Console Variable usage

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3666 6f19259b-4bc3-4df7-8a09-765794883524

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
         );

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,