Align the overrider with EDK2 trunk.

Align the overrider with EDK2 trunk.(The override fixed default console text color)
This override will be removed after core fixing. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Shifei Lu <shifeix.a.lu@intel.com>
Reviewed-by: David Wei <david.wei@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16671 6f19259b-4bc3-4df7-8a09-765794883524

4 files changed, 44 insertions, 21 deletions

diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 79e6153985..82f790c34d 100644
--- a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
+++ b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
@@ -16,7 +16,7 @@
   never removed. Such design ensures sytem function well during none console

   device situation.

 

-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>

 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

@@ -4557,7 +4557,7 @@ ConSplitterTextOutSetAttribute (
   //

   // Check whether param Attribute is valid.

   //

-  if ( (Attribute > (UINTN)(((UINT32)-1)>>1)) ) {

+  if ((Attribute | 0x7F) != 0x7F) {

     return EFI_UNSUPPORTED;

   }

 

diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index 4885dc7fe9..ff10a50b50 100644
--- a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
+++ b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
@@ -7,10 +7,10 @@
 # table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSupport). It always

 # consumes Graphics Output protocol which is produced by display device, and consumes UGA Draw

 # protocol which is produced by display device according to PcdUgaConsumeSupport value.

-# Note: If only UGA Draw protocol is installed in system table, PcdUgaConsumeSupport

-# should be set to TRUE.

+# Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be

+# set to TRUE.

 #

-# Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

+# Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

@@ -25,6 +25,7 @@
 [Defines]

   INF_VERSION                    = 0x00010005

   BASE_NAME                      = ConSplitterDxe

+  MODULE_UNI_FILE                = ConSplitterDxe.uni

   FILE_GUID                      = 408edcec-cf6d-477c-a5a8-b4844e3de281

   MODULE_TYPE                    = UEFI_DRIVER

   VERSION_STRING                 = 1.0

@@ -70,27 +71,49 @@
   PcdLib

 

 [Guids]

-  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES

-  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES

-  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES

-  gConnectConInEventGuid                        ## ALWAYS_CONSUMES

+  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle

+  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle

+  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle

+  ## SOMETIMES_PRODUCES ## Event

+  ## SOMETIMES_CONSUMES ## Event

+  gConnectConInEventGuid

 

 [Protocols]

-  gEfiSimplePointerProtocolGuid                 ## BY_START

-  gEfiAbsolutePointerProtocolGuid               ## BY_START

-  gEfiSimpleTextInProtocolGuid                  ## BY_START

-  gEfiSimpleTextInputExProtocolGuid             ## BY_START

-  gEfiSimpleTextOutProtocolGuid                 ## BY_START

-  gEfiGraphicsOutputProtocolGuid                ## BY_START

-  gEfiUgaDrawProtocolGuid                       ## BY_START

-

+  ## PRODUCES

+  ## TO_START

+  gEfiSimplePointerProtocolGuid

+  ## PRODUCES

+  ## TO_START

+  gEfiAbsolutePointerProtocolGuid

+  ## PRODUCES

+  ## TO_START

+  gEfiSimpleTextInProtocolGuid

+  ## PRODUCES

+  ## TO_START

+  gEfiSimpleTextInputExProtocolGuid

+  ## PRODUCES

+  ## TO_START 

+  gEfiSimpleTextOutProtocolGuid

+  ## SOMETIMES_PRODUCES

+  ## SOMETIMES_CONSUMES

+  gEfiGraphicsOutputProtocolGuid

+  ## SOMETIMES_PRODUCES

+  ## SOMETIMES_CONSUMES

+  gEfiUgaDrawProtocolGuid

 

 [FeaturePcd]

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport

-  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport   ## CONSUMES

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport   ## CONSUMES

+  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport        ## CONSUMES

 

 [Pcd]

+  ## SOMETIMES_PRODUCES

+  ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow

+  ## SOMETIMES_PRODUCES

+  ## SOMETIMES_CONSUMES

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand

+  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand  ## SOMETIMES_CONSUMES

+

+[UserExtensions.TianoCore."ExtraFiles"]

+  ConSplitterDxeExtra.uni

diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
new file mode 100644
index 0000000000..cb8037d71b
--- /dev/null
+++ b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
new file mode 100644
index 0000000000..86515ff49d
--- /dev/null
+++ b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni