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

diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
index 79e6153985602202794a35efda770f82f16a853c..82f790c34dae1e3f19e1855a7fc39a031979fdd2 100644 (file)
--- 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\r
   device situation.\r
 \r
   never removed. Such design ensures sytem function well during none console\r
   device situation.\r
 \r

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

 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r


@@ -4557,7 +4557,7 @@ ConSplitterTextOutSetAttribute (
   //\r
   // Check whether param Attribute is valid.\r
   //\r
   //\r
   // Check whether param Attribute is valid.\r
   //\r

-  if ( (Attribute > (UINTN)(((UINT32)-1)>>1)) ) {\r
+  if ((Attribute | 0x7F) != 0x7F) {\r

     return EFI_UNSUPPORTED;\r
   }\r
 \r
     return EFI_UNSUPPORTED;\r
   }\r
 \r

diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
index 4885dc7fe92134edb611044b0cc07bb868bf7370..ff10a50b50177a808683a43bcea837199a3c4c3f 100644 (file)
--- 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\r
 # consumes Graphics Output protocol which is produced by display device, and consumes UGA Draw\r
 # protocol which is produced by display device according to PcdUgaConsumeSupport value.\r
 # table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSupport). It always\r
 # consumes Graphics Output protocol which is produced by display device, and consumes UGA Draw\r
 # protocol which is produced by display device according to PcdUgaConsumeSupport value.\r

-# Note: If only UGA Draw protocol is installed in system table, PcdUgaConsumeSupport\r
-# should be set to TRUE.\r
+# Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be\r
+# set to TRUE.\r

 #\r
 #\r

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

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -25,6 +25,7 @@
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ConSplitterDxe\r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ConSplitterDxe\r

+  MODULE_UNI_FILE                = ConSplitterDxe.uni\r

   FILE_GUID                      = 408edcec-cf6d-477c-a5a8-b4844e3de281\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r
   FILE_GUID                      = 408edcec-cf6d-477c-a5a8-b4844e3de281\r
   MODULE_TYPE                    = UEFI_DRIVER\r
   VERSION_STRING                 = 1.0\r


@@ -70,27 +71,49 @@
   PcdLib\r
 \r
 [Guids]\r
   PcdLib\r
 \r
 [Guids]\r

-  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES\r
-  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES\r
-  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES\r
-  gConnectConInEventGuid                        ## ALWAYS_CONSUMES\r
+  gEfiConsoleInDeviceGuid                       ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle\r
+  gEfiStandardErrorDeviceGuid                   ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle\r
+  gEfiConsoleOutDeviceGuid                      ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle\r
+  ## SOMETIMES_PRODUCES ## Event\r
+  ## SOMETIMES_CONSUMES ## Event\r
+  gConnectConInEventGuid\r

 \r
 [Protocols]\r
 \r
 [Protocols]\r

-  gEfiSimplePointerProtocolGuid                 ## BY_START\r
-  gEfiAbsolutePointerProtocolGuid               ## BY_START\r
-  gEfiSimpleTextInProtocolGuid                  ## BY_START\r
-  gEfiSimpleTextInputExProtocolGuid             ## BY_START\r
-  gEfiSimpleTextOutProtocolGuid                 ## BY_START\r
-  gEfiGraphicsOutputProtocolGuid                ## BY_START\r
-  gEfiUgaDrawProtocolGuid                       ## BY_START\r
-\r
+  ## PRODUCES\r
+  ## TO_START\r
+  gEfiSimplePointerProtocolGuid\r
+  ## PRODUCES\r
+  ## TO_START\r
+  gEfiAbsolutePointerProtocolGuid\r
+  ## PRODUCES\r
+  ## TO_START\r
+  gEfiSimpleTextInProtocolGuid\r
+  ## PRODUCES\r
+  ## TO_START\r
+  gEfiSimpleTextInputExProtocolGuid\r
+  ## PRODUCES\r
+  ## TO_START \r
+  gEfiSimpleTextOutProtocolGuid\r
+  ## SOMETIMES_PRODUCES\r
+  ## SOMETIMES_CONSUMES\r
+  gEfiGraphicsOutputProtocolGuid\r
+  ## SOMETIMES_PRODUCES\r
+  ## SOMETIMES_CONSUMES\r
+  gEfiUgaDrawProtocolGuid\r

 \r
 [FeaturePcd]\r
 \r
 [FeaturePcd]\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport\r
-  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport   ## CONSUMES\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport   ## CONSUMES\r
+  gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport        ## CONSUMES\r

 \r
 [Pcd]\r
 \r
 [Pcd]\r

+  ## SOMETIMES_PRODUCES\r
+  ## SOMETIMES_CONSUMES\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow\r

+  ## SOMETIMES_PRODUCES\r
+  ## SOMETIMES_CONSUMES\r

   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn\r

-  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand  ## SOMETIMES_CONSUMES\r
+\r
+[UserExtensions.TianoCore."ExtraFiles"]\r
+  ConSplitterDxeExtra.uni\r

diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
new file mode 100644 (file)
index 0000000..cb8037d
Binary files /dev/null and b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni differ

diff --git a/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
new file mode 100644 (file)
index 0000000..86515ff
Binary files /dev/null and b/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni differ