Revision: 16671
http://sourceforge.net/p/edk2/code/16671
Author: zwei4
Date: 2015-01-27 08:47:14 +0000 (Tue, 27 Jan 2015)
Log Message:
-----------
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 <[email protected]>
Reviewed-by: David Wei <[email protected]>
Modified Paths:
--------------
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
Added Paths:
-----------
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
Modified:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
===================================================================
---
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
2015-01-27 08:44:10 UTC (rev 16670)
+++
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitter.c
2015-01-27 08:47:14 UTC (rev 16671)
@@ -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 @@
//
// Check whether param Attribute is valid.
//
- if ( (Attribute > (UINTN)(((UINT32)-1)>>1)) ) {
+ if ((Attribute | 0x7F) != 0x7F) {
return EFI_UNSUPPORTED;
}
Modified:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
===================================================================
---
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
2015-01-27 08:44:10 UTC (rev 16670)
+++
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf
2015-01-27 08:47:14 UTC (rev 16671)
@@ -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
Added:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
===================================================================
(Binary files differ)
Index:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
===================================================================
---
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
2015-01-27 08:44:10 UTC (rev 16670)
+++
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
2015-01-27 08:47:14 UTC (rev 16671)
Property changes on:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.uni
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
===================================================================
(Binary files differ)
Index:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
===================================================================
---
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
2015-01-27 08:44:10 UTC (rev 16670)
+++
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
2015-01-27 08:47:14 UTC (rev 16671)
Property changes on:
trunk/edk2/Vlv2TbltDevicePkg/Override/MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxeExtra.uni
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
------------------------------------------------------------------------------
Dive into the World of Parallel Programming. The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
