Merger trackers #7807 and #8372.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4153 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 21 insertions, 21 deletions

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index 7154b53cdf..0078da2b91 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -1,13 +1,13 @@
 /*++

 

-Copyright (c) 2006, 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        

-http://opensource.org/licenses/bsd-license.php                                            

+Copyright (c) 2006, 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

+http://opensource.org/licenses/bsd-license.php

                                                                                           

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 Module Name:

 

@@ -27,7 +27,6 @@ Abstract:
 #include <PiDxe.h>

 #include <Protocol/LoadedImage.h>

 #include <Protocol/Runtime.h>

-#include <Protocol/UgaIo.h>

 #include <Library/BaseLib.h>

 #include <Library/UefiDriverEntryPoint.h>

 #include <Library/DebugLib.h>

@@ -65,7 +64,7 @@ Arguments:
 Returns:

 

   EFI_SUCCESS           - The CRC32 for target data is calculated successfully.

-  EFI_INVALID_PARAMETER - Some parameter is not valid, so the CRC32 is not 

+  EFI_INVALID_PARAMETER - Some parameter is not valid, so the CRC32 is not

                           calculated.

 

 --*/

@@ -84,7 +83,7 @@ Routine Description:
   Determines the new virtual address that is to be used on subsequent memory accesses.

 

 Arguments:

-  

+

   DebugDisposition    - Supplies type information for the pointer being converted.

   ConvertAddress      - A pointer to a pointer that is to be fixed to be the value needed

                         for the new virtual address mappings being applied.

@@ -114,7 +113,7 @@ Routine Description:
   Changes the runtime addressing mode of EFI firmware from physical to virtual.

 

 Arguments:

-  

+

   MemoryMapSize     - The size in bytes of VirtualMap.

   DescriptorSize    - The size in bytes of an entry in the VirtualMap.

   DescriptorVersion - The version of the structure entries in VirtualMap.

@@ -166,11 +165,11 @@ RuntimeDriverInitialize (
 

 Routine Description:

 

-  Install Runtime AP. This code includes the EfiRuntimeLib, but it only 

-  functions at RT in physical mode. 

+  Install Runtime AP. This code includes the EfiRuntimeLib, but it only

+  functions at RT in physical mode.

 

 Arguments:

-  

+

   ImageHandle   - Image handle of this driver.

   SystemTable   - Pointer to the EFI System Table.

 

diff --git a/MdeModulePkg/Include/Protocol/ConsoleControl.h b/MdeModulePkg/Include/Protocol/ConsoleControl.h
index c894302c66..75de391a40 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: