X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FConsole%2FConPlatformDxe%2FConPlatform.c;h=1a32cb301605d9d5f44b0ecfaf5b7ded7c84efdb;hp=d86ea4766fd9894a1d432dafb6358446fcd69dac;hb=ff37790d3d3805b232cecb19867d19f44860112c;hpb=95276127e373f2e2fb2a208ff77267422a197d9f

diff --git a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
index d86ea4766f..1a32cb3016 100644
--- a/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
+++ b/MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatform.c
@@ -17,40 +17,8 @@ Abstract:
 
 --*/
 
-#include <Uefi.h>
-
-#include "ConPlatform.h"
-
-
-//
-// The protocols, PPI and GUID defintions for this module
-//
-#include <Protocol/SimpleTextOut.h>
-#include <Guid/GlobalVariable.h>
-#include <Guid/ConsoleInDevice.h>
-#include <Protocol/DevicePath.h>
-#include <Protocol/SimpleTextIn.h>
-#include <Guid/HotPlugDevice.h>
-#include <Guid/StandardErrorDevice.h>
-#include <Guid/ConsoleOutDevice.h>
-//
-// The Library classes this module consumes
-//
-#include <Library/DebugLib.h>
-#include <Library/UefiDriverEntryPoint.h>
-#include <Library/UefiLib.h>
-#include <Library/BaseMemoryLib.h>
-#include <Library/UefiBootServicesTableLib.h>
-#include <Library/UefiRuntimeServicesTableLib.h>
-#include <Library/DevicePathLib.h>
-#include <Library/MemoryAllocationLib.h>
-//
-// Driver Binding Externs
-//
-extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;
-extern EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextOutDriverBinding;
-extern EFI_COMPONENT_NAME_PROTOCOL gConPlatformComponentName;
+#include <ConPlatform.h>
+
 
 EFI_DRIVER_BINDING_PROTOCOL gConPlatformTextInDriverBinding = {
   ConPlatformTextInDriverBindingSupported,
@@ -311,7 +279,7 @@ Returns:
     // Append the device path to the ConInDev environment variable
     //
     ConPlatformUpdateDeviceVariable (
-      VarConsoleInpDev,
+      L"ConInDev",
       DevicePath,
       APPEND
       );
@@ -321,7 +289,7 @@ Returns:
     // then install EfiConsoleInDeviceGuid onto ControllerHandle
     //
     Status = ConPlatformUpdateDeviceVariable (
-              VarConsoleInp,
+              L"ConIn",
               DevicePath,
               CHECK
               );
@@ -419,7 +387,7 @@ Returns:
     // Append the device path to the ConOutDev environment variable
     //
     ConPlatformUpdateDeviceVariable (
-      VarConsoleOutDev,
+      L"ConOutDev",
       DevicePath,
       APPEND
       );
@@ -427,7 +395,7 @@ Returns:
     // Append the device path to the StdErrDev environment variable
     //
     ConPlatformUpdateDeviceVariable (
-      VarErrorOutDev,
+      L"ErrOutDev",
       DevicePath,
       APPEND
       );
@@ -437,7 +405,7 @@ Returns:
     // then install EfiConsoleOutDeviceGuid onto ControllerHandle
     //
     Status = ConPlatformUpdateDeviceVariable (
-              VarConsoleOut,
+              L"ConOut",
               DevicePath,
               CHECK
               );
@@ -528,7 +496,7 @@ Returns:
       // Remove DevicePath from ConInDev
       //
       ConPlatformUpdateDeviceVariable (
-        VarConsoleInpDev,
+        L"ConInDev",
         DevicePath,
         DELETE
         );
@@ -601,12 +569,12 @@ Returns:
       // Remove DevicePath from ConOutDev, and StdErrDev
       //
       ConPlatformUpdateDeviceVariable (
-        VarConsoleOutDev,
+        L"ConOutDev",
         DevicePath,
         DELETE
         );
       ConPlatformUpdateDeviceVariable (
-        VarErrorOutDev,
+        L"ErrOutDev",
         DevicePath,
         DELETE
         );