diff options
| author | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-10-17 06:55:15 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2007-10-17 06:55:15 +0000 |
| commit | 62409219a151c88d2e9be05533c018d7b824c566 (patch) | |
| tree | 5bc52da014d53c0f3453b96bcd6d06ba97bf050f /MdeModulePkg/Include/Protocol/ConsoleControl.h | |
| parent | 6e98e263266df31993c266d91438da46ac575a2f (diff) | |
| download | edk2-62409219a151c88d2e9be05533c018d7b824c566.zip edk2-62409219a151c88d2e9be05533c018d7b824c566.tar.gz edk2-62409219a151c88d2e9be05533c018d7b824c566.tar.bz2 | |
Merger trackers #7807 and #8372.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4153 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Include/Protocol/ConsoleControl.h')
| -rw-r--r-- | MdeModulePkg/Include/Protocol/ConsoleControl.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/MdeModulePkg/Include/Protocol/ConsoleControl.h b/MdeModulePkg/Include/Protocol/ConsoleControl.h index c894302..75de391 100644 --- a/MdeModulePkg/Include/Protocol/ConsoleControl.h +++ b/MdeModulePkg/Include/Protocol/ConsoleControl.h @@ -1,6 +1,6 @@ /*++
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, Intel Corporation
All rights reserved. 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
@@ -15,7 +15,7 @@ Module Name: Abstract:
- Abstraction of a Text mode or UGA screen
+ Abstraction of a Text mode or GOP/UGA screen
--*/
@@ -40,20 +40,21 @@ EFI_STATUS (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) (
IN EFI_CONSOLE_CONTROL_PROTOCOL *This,
OUT EFI_CONSOLE_CONTROL_SCREEN_MODE *Mode,
- OUT BOOLEAN *UgaExists, OPTIONAL
- OUT BOOLEAN *StdInLocked OPTIONAL
+ OUT BOOLEAN *GopUgaExists, OPTIONAL
+ OUT BOOLEAN *StdInLocked OPTIONAL
)
/*++
Routine Description:
Return the current video mode information. Also returns info about existence
- of UGA Draw devices in system, and if the Std In device is locked. All the
- arguments are optional and only returned if a non NULL pointer is passed in.
+ of Graphics Output devices or UGA Draw devices in system, and if the Std In
+ device is locked. All the arguments are optional and only returned if a non
+ NULL pointer is passed in.
Arguments:
This - Protocol instance pointer.
Mode - Are we in text of grahics mode.
- UgaExists - TRUE if UGA Spliter has found a UGA device
+ GopUgaExists - TRUE if Console Spliter has found a GOP or UGA device
StdInLocked - TRUE if StdIn device is keyboard locked
Returns:
|