]> git.proxmox.com Git - mirror_edk2.git/commitdiff
projects / mirror_edk2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2706108)
Perfect the msa of the following console, datahub and DebugPort modules.
authorlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 9 Mar 2007 12:35:51 +0000 (12:35 +0000)
committerlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Fri, 9 Mar 2007 12:35:51 +0000 (12:35 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2435 6f19259b-4bc3-4df7-8a09-765794883524

EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa patch | blob | blame | history
EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa patch | blob | blame | history
EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa patch | blob | blame | history
EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa patch | blob | blame | history
EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa patch | blob | blame | history
EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa patch | blob | blame | history

diff --git a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
index f688a1945855eb11ebc05f16da518fa36329a774..afc35028ead3519a1e077f1570ee2d4b67488b4c 100644 (file)
--- a/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
+++ b/EdkModulePkg/Universal/Console/ConSplitter/Dxe/ConSplitter.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\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
+    <Copyright>Copyright (c) 2006 - 2007, 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
@@ -22,8 +22,9 @@
     <OutputFileBasename>ConSplitter</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
       <Keyword>DebugLib</Keyword>\r
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
@@ -58,19 +59,21 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiUgaDrawProtocolGuid</ProtocolCName>\r
+      <HelpText>UGA Draw protocol is only installed in EFI mode.</HelpText>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiGraphicsOutputProtocolGuid</ProtocolCName>\r
+      <HelpText>Graphics Output Protocol is only installed in UEFI mode.</HelpText>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r
       <ProtocolCName>gEfiSimplePointerProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_PRODUCED">\r
diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
index 3e9af8001baa2612373c9c3d86952b86c8be6681..187cc9b4ec84ed1f9caf406c2cd7238e95b56e61 100644 (file)
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
     <ModuleName>GraphicsConsole</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for GraphicsConsole module</Abstract>\r
     <Description>This is the main routine for initializing the Graphics Console support routines.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, 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
@@ -22,8 +22,9 @@
     <OutputFileBasename>GraphicsConsole</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
       <Keyword>DebugLib</Keyword>\r
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
@@ -31,9 +32,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
@@ -73,10 +71,16 @@
     <Protocol Usage="BY_START">\r
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>\r
     </Protocol>\r
-    <Protocol Usage="TO_START">\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
+  <HiiPackages>\r
+    <HiiPackage Usage="ALWAYS_PRODUCED">\r
+      <HiiCName>FontPack</HiiCName>\r
+      <HelpText>Register UsStdNarrow Fonts into the global database.</HelpText>\r
+    </HiiPackage>\r
+  </HiiPackages>\r
   <Externs>\r
     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
diff --git a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
index 977a9b355e15f87806204ecc972dc44a7c9d2b8b..3403b35b75c26c91667bc01ad8325b446b3871e8 100644 (file)
--- a/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
+++ b/EdkModulePkg/Universal/Console/Terminal/Dxe/Terminal.msa
@@ -6,8 +6,8 @@
     <GuidValue>9E863906-A40F-4875-977F-5B93FF237FC6</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for Terminal module.</Abstract>\r
-    <Description>This drivre installs Simple Text In/Out protocol for terminal devices.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>This driver installs Simple Text In/Out protocol for terminal devices.</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, 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
@@ -22,8 +22,9 @@
     <OutputFileBasename>Terminal</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
       <Keyword>DebugLib</Keyword>\r
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
@@ -83,15 +84,18 @@
   <Variables>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>\r
-      <GuidC_Name>gConInDevGuid</GuidC_Name>\r
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>\r
+      <HelpText>L"ConInDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>\r
     </Variable>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>\r
-      <GuidC_Name>gConOutDevGuid</GuidC_Name>\r
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>\r
+      <HelpText>L"ConOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>\r
     </Variable>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>\r
-      <GuidC_Name>gErrOutDevGuid</GuidC_Name>\r
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>\r
+      <HelpText>L"ErrOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>\r
     </Variable>\r
   </Variables>\r
   <Guids>\r
diff --git a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa
index ffe09f95529c5a9a74bf49f5cac2f1ac3e60e1c0..043cd1d657b5c1cac725043838ca2598d6410d27 100644 (file)
--- a/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa
+++ b/EdkModulePkg/Universal/DataHub/DataHub/Dxe/DataHub.msa
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
     <ModuleName>DataHub</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
     <GuidValue>53BCC14F-C24F-434C-B294-8ED2D4CC1860</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DataHub module.</Abstract>\r
-    <Description>This driver preloads the data hub with status information copied in from PEI HOBs and produces the Data Hub protocol.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>This driver initializes and installs the Data Hub protocol.</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, 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
@@ -22,8 +22,9 @@
     <OutputFileBasename>DataHub</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
       <Keyword>DebugLib</Keyword>\r
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
@@ -54,7 +55,6 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="ALWAYS_PRODUCED">\r
diff --git a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa
index 0a8108301dd1bad11c01a507070cb7b884089255..1c934c6f2e71a995c8d41f82a8b1f375a8e1752c 100644 (file)
--- a/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa
+++ b/EdkModulePkg/Universal/DataHub/DataHubStdErr/Dxe/DataHubStdErr.msa
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
     <ModuleName>DataHubStdErr</ModuleName>\r
     <ModuleType>DXE_DRIVER</ModuleType>\r
@@ -7,7 +7,7 @@
     <Version>1.0</Version>\r
     <Abstract>Component description file for Data Hub filter driver.</Abstract>\r
     <Description>This driver takes DEBUG () info from Data Hub and writes it to StdErr if it exists.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Copyright>Copyright (c) 2006 - 2007, 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
@@ -22,8 +22,9 @@
     <OutputFileBasename>DataHubStdErr</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
       <Keyword>DebugLib</Keyword>\r
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverEntryPoint</Keyword>\r
@@ -48,6 +49,12 @@
       <ProtocolCName>gEfiDataHubProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
+  <DataHubs>\r
+    <DataHubRecord Usage="SOMETIMES_CONSUMED">\r
+      <DataHubCName>DATA_HUB_STATUS_CODE_DATA_RECORD</DataHubCName>\r
+      <HelpText>DEBUG() data that is recorded in status code data hub will be sent to Standard Error.</HelpText>\r
+    </DataHubRecord>\r
+  </DataHubs>\r
   <Guids>\r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiStatusCodeGuid</GuidCName>\r
diff --git a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
index f2c09b9c9dcfc36c6a577368e6d48ec98a6b5fb4..3e4ef3ceeb37dd002e6e343534f1919719971e15 100644 (file)
--- a/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
+++ b/EdkModulePkg/Universal/Debugger/Debugport/Dxe/DebugPort.msa
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0">\r
+<ModuleSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">\r
   <MsaHeader>\r
     <ModuleName>DebugPort</ModuleName>\r
     <ModuleType>UEFI_DRIVER</ModuleType>\r
     <GuidValue>73E9457A-CEA1-4917-9A9C-9F1F0F0FD322</GuidValue>\r
     <Version>1.0</Version>\r
     <Abstract>Component description file for DebugPort module.</Abstract>\r
-    <Description>This driver produces DebugPort Protocol based on SerialIo.</Description>\r
-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>\r
+    <Description>This driver binds exclusively to serial io on the controller handle, \r
+      and initializes serial Io interface, publishs DebugPort and device path Protocol.</Description>\r
+    <Copyright>Copyright (c) 2006 - 2007, 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
@@ -22,8 +23,9 @@
     <OutputFileBasename>DebugPort</OutputFileBasename>\r
   </ModuleDefinitions>\r
   <LibraryClassDefinitions>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">\r
       <Keyword>DebugLib</Keyword>\r
+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>\r
     </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiDriverModelLib</Keyword>\r
@@ -34,9 +36,6 @@
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>UefiLib</Keyword>\r
     </LibraryClass>\r
-    <LibraryClass Usage="ALWAYS_CONSUMED">\r
-      <Keyword>BaseLib</Keyword>\r
-    </LibraryClass>\r
     <LibraryClass Usage="ALWAYS_CONSUMED">\r
       <Keyword>BaseMemoryLib</Keyword>\r
     </LibraryClass>\r
@@ -61,11 +60,13 @@
   </SourceFiles>\r
   <PackageDependencies>\r
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>\r
-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Protocol Usage="BY_START">\r
       <ProtocolCName>gEfiDebugPortProtocolGuid</ProtocolCName>\r
+      <HelpText>gEfiDebugPortVariableGuid, gEfiDebugPortDevicePathGuid are \r
+        both the alias of gEfiDebugPortProtocolGuid. They are not separate guid variables,\r
+        which are not required to be described in the followin Guids section.</HelpText>\r
     </Protocol>\r
     <Protocol Usage="BY_START">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
@@ -73,11 +74,20 @@
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiSerialIoProtocolGuid</ProtocolCName>\r
     </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiComponentNameProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="ALWAYS_CONSUMED">\r
+      <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>\r
+    </Protocol>\r
   </Protocols>\r
   <Variables>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0044 0x0045 0x0042 0x0055 0x0047 0x0050 0x004F 0x0052 0x0054</VariableName>\r
-      <GuidC_Name>gDEBUGPORTGuid</GuidC_Name>\r
+      <GuidC_Name>gEfiDebugPortProtocolGuid</GuidC_Name>\r
+      <HelpText>L"DEBUGPORT" variable is specified. gEfiDebugPortVariableGuid is\r
+       one virtual guid, which can't be described in this section. \r
+       So gEfiDebugPortProtocolGuid name is instead of it.</HelpText>\r
     </Variable>\r
   </Variables>\r
   <Externs>\r
EFI Development Kit II mirror for PVE