Merge GOP related code from r8->r9.

[mirror_edk2.git] / EdkModulePkg / Universal / Console / ConSplitter / Dxe / ConSplitter.msa

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
index e00ac589b0e693adf36e111e6bbc52bcc2e96b85..f688a1945855eb11ebc05f16da518fa36329a774 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--Copyright (c) 2006, 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
-http://opensource.org/licenses/bsd-license.php\r
-\r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->\r
-<ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
   <MsaHeader>\r
     <ModuleName>ConSplitter</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>408edcec-cf6d-477c-a5a8-b4844e3de281</GuidValue>\r
     <Version>1.0</Version>\r
-    <Abstract>Component description file for DiskIo module.</Abstract>\r
-    <Description>FIX ME!</Description>\r
-    <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>\r
+    <Abstract>Component description file for ConSplitter module.</Abstract>\r
+    <Description>Any Handle that attatched EFI_CONSOLE_IDENTIFIER_PROTOCOL can be bound by this driver.</Description>\r
+    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
     <License>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
@@ -63,43 +55,46 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="B6EC423C-21D2-490D-85C6-DD5864EAA674"/>\r
+    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>UgaDraw</ProtocolCName>\r
+      <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>SimpleTextOut</ProtocolCName>\r
+      <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>SimpleTextIn</ProtocolCName>\r
+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
-      <ProtocolCName>SimplePointer</ProtocolCName>\r
+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_PRODUCED">\r
-      <ProtocolCName>ConsoleControl</ProtocolCName>\r
+      <ProtocolCName>gEfiConsoleControlProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_PRODUCED">\r
-      <GuidCName>PrimaryStandardErrorDevice</GuidCName>\r
+      <GuidCName>gEfiPrimaryStandardErrorDeviceGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_PRODUCED">\r
-      <GuidCName>PrimaryConsoleInDevice</GuidCName>\r
+      <GuidCName>gEfiPrimaryConsoleInDeviceGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_PRODUCED">\r
-      <GuidCName>PrimaryConsoleOutDevice</GuidCName>\r
+      <GuidCName>gEfiPrimaryConsoleOutDeviceGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>ConsoleOutDevice</GuidCName>\r
+      <GuidCName>gEfiConsoleOutDeviceGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>StandardErrorDevice</GuidCName>\r
+      <GuidCName>gEfiStandardErrorDeviceGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
-      <GuidCName>ConsoleInDevice</GuidCName>\r
+      <GuidCName>gEfiConsoleInDeviceGuid</GuidCName>\r
     </GuidCNames>\r
   </Guids>\r
   <Externs>\r
@@ -110,26 +105,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Extern>\r
     <Extern>\r
       <DriverBinding>gConSplitterConInDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
       <ComponentName>gConSplitterConInComponentName</ComponentName>\r
     </Extern>\r
     <Extern>\r
       <DriverBinding>gConSplitterSimplePointerDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
       <ComponentName>gConSplitterSimplePointerComponentName</ComponentName>\r
     </Extern>\r
     <Extern>\r
       <DriverBinding>gConSplitterConOutDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
       <ComponentName>gConSplitterConOutComponentName</ComponentName>\r
     </Extern>\r
     <Extern>\r
       <DriverBinding>gConSplitterStdErrDriverBinding</DriverBinding>\r
-    </Extern>\r
-    <Extern>\r
       <ComponentName>gConSplitterStdErrComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r