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
This commit is contained in:
Shifei Lu 2015-01-27 08:47:14 +00:00 committed by zwei4
parent 952ba83c47
commit 2bbbdc85a3
4 changed files with 44 additions and 21 deletions

View File

@ -16,7 +16,7 @@
never removed. Such design ensures sytem function well during none console never removed. Such design ensures sytem function well during none console
device situation. 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 This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 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. // Check whether param Attribute is valid.
// //
if ( (Attribute > (UINTN)(((UINT32)-1)>>1)) ) { if ((Attribute | 0x7F) != 0x7F) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }

View File

@ -7,10 +7,10 @@
# table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSupport). It always # table according PCD settings(PcdConOutGopSupport, and PcdConOutUgaSupport). It always
# consumes Graphics Output protocol which is produced by display device, and consumes UGA Draw # 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. # protocol which is produced by display device according to PcdUgaConsumeSupport value.
# Note: If only UGA Draw protocol is installed in system table, PcdUgaConsumeSupport # Note: If only UGA Draw protocol is installed in system, PcdUgaConsumeSupport should be
# should be set to TRUE. # 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 # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -25,6 +25,7 @@
[Defines] [Defines]
INF_VERSION = 0x00010005 INF_VERSION = 0x00010005
BASE_NAME = ConSplitterDxe BASE_NAME = ConSplitterDxe
MODULE_UNI_FILE = ConSplitterDxe.uni
FILE_GUID = 408edcec-cf6d-477c-a5a8-b4844e3de281 FILE_GUID = 408edcec-cf6d-477c-a5a8-b4844e3de281
MODULE_TYPE = UEFI_DRIVER MODULE_TYPE = UEFI_DRIVER
VERSION_STRING = 1.0 VERSION_STRING = 1.0
@ -70,27 +71,49 @@
PcdLib PcdLib
[Guids] [Guids]
gEfiConsoleInDeviceGuid ## SOMETIMES_CONSUMES gEfiConsoleInDeviceGuid ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle
gEfiStandardErrorDeviceGuid ## SOMETIMES_CONSUMES gEfiStandardErrorDeviceGuid ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle
gEfiConsoleOutDeviceGuid ## SOMETIMES_CONSUMES gEfiConsoleOutDeviceGuid ## SOMETIMES_CONSUMES ## UNDEFINED # protocol GUID installed on device handle
gConnectConInEventGuid ## ALWAYS_CONSUMES ## SOMETIMES_PRODUCES ## Event
## SOMETIMES_CONSUMES ## Event
gConnectConInEventGuid
[Protocols] [Protocols]
gEfiSimplePointerProtocolGuid ## BY_START ## PRODUCES
gEfiAbsolutePointerProtocolGuid ## BY_START ## TO_START
gEfiSimpleTextInProtocolGuid ## BY_START gEfiSimplePointerProtocolGuid
gEfiSimpleTextInputExProtocolGuid ## BY_START ## PRODUCES
gEfiSimpleTextOutProtocolGuid ## BY_START ## TO_START
gEfiGraphicsOutputProtocolGuid ## BY_START gEfiAbsolutePointerProtocolGuid
gEfiUgaDrawProtocolGuid ## BY_START ## PRODUCES
## TO_START
gEfiSimpleTextInProtocolGuid
## PRODUCES
## TO_START
gEfiSimpleTextInputExProtocolGuid
## PRODUCES
## TO_START
gEfiSimpleTextOutProtocolGuid
## SOMETIMES_PRODUCES
## SOMETIMES_CONSUMES
gEfiGraphicsOutputProtocolGuid
## SOMETIMES_PRODUCES
## SOMETIMES_CONSUMES
gEfiUgaDrawProtocolGuid
[FeaturePcd] [FeaturePcd]
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport ## CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport ## CONSUMES
gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport ## CONSUMES
[Pcd] [Pcd]
## SOMETIMES_PRODUCES
## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow
## SOMETIMES_PRODUCES
## SOMETIMES_CONSUMES
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn
gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand ## SOMETIMES_CONSUMES
[UserExtensions.TianoCore."ExtraFiles"]
ConSplitterDxeExtra.uni