1 files changed, 24 insertions, 18 deletions
diff --git a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
index c00a95ce92..a4300e53f3 100644
--- a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
+++ b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
@@ -61,6 +61,15 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>
   </PackageDependencies>
   <Protocols>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>gEfiConsoleInDeviceGuid</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>gEfiConsoleOutDeviceGuid</ProtocolCName>
+    </Protocol>
+    <Protocol Usage="BY_START">
+      <ProtocolCName>gEfiStandardErrorDeviceGuid</ProtocolCName>
+    </Protocol>
     <Protocol Usage="TO_START">
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>
     </Protocol>
@@ -70,46 +79,43 @@
     <Protocol Usage="TO_START">
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>
     </Protocol>
+    <Protocol Usage="TO_START">
+      <ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>
+    </Protocol>
   </Protocols>
   <Variables>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gConInDevGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ConInDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E</VariableName>
-      <GuidC_Name>gConInGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ConIn" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gConOutDevGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ConOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074</VariableName>
-      <GuidC_Name>gConOutGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ConOut" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074 0x0044 0x0065 0x0076</VariableName>
-      <GuidC_Name>gErrOutDevGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ErrOutDev" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
     <Variable Usage="SOMETIMES_CONSUMED">
       <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074</VariableName>
-      <GuidC_Name>gErrOutGuid</GuidC_Name>
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>
+      <HelpText>L"ErrOut" global variable will be updated if the serial device is not a hot plug device.</HelpText>
     </Variable>
   </Variables>
   <Guids>
-    <GuidCNames Usage="SOMETIMES_PRODUCED">
-      <GuidCName>gEfiConsoleInDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_PRODUCED">
-      <GuidCName>gEfiConsoleOutDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_PRODUCED">
-      <GuidCName>gEfiStandardErrorDeviceGuid</GuidCName>
-    </GuidCNames>
-    <GuidCNames Usage="SOMETIMES_CONSUMED">
-      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>
-    </GuidCNames>
     <GuidCNames Usage="SOMETIMES_CONSUMED">
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>
     </GuidCNames>