Merger trackers #7807 and #8372.

[mirror_edk2.git] / MdeModulePkg / Include / Protocol / ConsoleControl.h

diff --git a/MdeModulePkg/Include/Protocol/ConsoleControl.h b/MdeModulePkg/Include/Protocol/ConsoleControl.h
index c894302c66cf264ae5a414b0fb474133de2d8264..75de391a40d78578a46e028b5d44fd221083dc7c 100644 (file)
--- a/MdeModulePkg/Include/Protocol/ConsoleControl.h
+++ b/MdeModulePkg/Include/Protocol/ConsoleControl.h
@@ -1,6 +1,6 @@
 /*++ \r
 \r
-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r
 All rights reserved. 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
@@ -15,7 +15,7 @@ Module Name:
 \r
 Abstract:\r
 \r
-  Abstraction of a Text mode or UGA screen\r
+  Abstraction of a Text mode or GOP/UGA screen\r
 \r
 --*/\r
 \r
@@ -40,20 +40,21 @@ EFI_STATUS
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   *Mode,\r
-  OUT BOOLEAN                           *UgaExists,   OPTIONAL  \r
-  OUT BOOLEAN                           *StdInLocked  OPTIONAL\r
+  OUT BOOLEAN                           *GopUgaExists,  OPTIONAL  \r
+  OUT BOOLEAN                           *StdInLocked    OPTIONAL\r
   )\r
 /*++\r
 \r
   Routine Description:\r
     Return the current video mode information. Also returns info about existence\r
-    of UGA Draw devices in system, and if the Std In device is locked. All the\r
-    arguments are optional and only returned if a non NULL pointer is passed in.\r
+    of Graphics Output devices or UGA Draw devices in system, and if the Std In\r
+    device is locked. All the arguments are optional and only returned if a non\r
+    NULL pointer is passed in.\r
 \r
   Arguments:\r
     This - Protocol instance pointer.\r
     Mode        - Are we in text of grahics mode.\r
-    UgaExists   - TRUE if UGA Spliter has found a UGA device\r
+    GopUgaExists - TRUE if Console Spliter has found a GOP or UGA device\r
     StdInLocked - TRUE if StdIn device is keyboard locked\r
 \r
   Returns:\r