Perfected MSA files.

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

8 files changed, 48 insertions, 42 deletions

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index 85298640bf..b7b946e1fa 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -64,6 +64,9 @@
   </Protocols>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

+      <GuidCName>gEfiCapsuleGuid</GuidCName>

+    </GuidCNames>

+    <GuidCNames Usage="SOMETIMES_CONSUMED">

       <GuidCName>gEfiCapsuleVendorGuid</GuidCName>

     </GuidCNames>

   </Guids>

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
index 50de4c6c9d..0e7a9d496e 100644
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
@@ -21,9 +21,7 @@ Abstract:
 

 #include "CapsuleService.h"

 

-

-STATIC EFI_GUID mEfiCapsuleHeaderGuid = EFI_CAPSULE_GUID;

-

+extern EFI_GUID gEfiCapsuleGuid;

 

 EFI_STATUS

 EFIAPI

@@ -78,7 +76,7 @@ Returns:
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {

       return EFI_INVALID_PARAMETER;

     }

-    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {

+    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiCapsuleGuid)) {

       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {

         return EFI_UNSUPPORTED;

       }

@@ -206,7 +204,7 @@ Returns:
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {

       return EFI_INVALID_PARAMETER;

     }

-    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &mEfiCapsuleHeaderGuid)) {

+    if (!CompareGuid (&CapsuleHeader->CapsuleGuid, &gEfiCapsuleGuid)) {

       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {

         return EFI_UNSUPPORTED;

       }

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>

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index 1fbf8da410..6e769aa280 100644
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
@@ -58,10 +58,10 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

+    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">

       <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">

+    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">

       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.c b/EdkModulePkg/Universal/Variable/Pei/Variable.c
index 0660419547..a2ea1d6584 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.c
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.c
@@ -1,13 +1,13 @@
 /*++

 

 Copyright (c) 2006 - 2007 Intel Corporation. <BR>

-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.             

+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.

 Module Name:

 

   Variable.c

@@ -34,7 +34,7 @@ static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
   &mVariablePpi

 };

 

-EFI_GUID gEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;

+EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;

 

 EFI_STATUS

 EFIAPI

@@ -265,9 +265,9 @@ Returns:
   //

   MaxIndex = 0;

 

-  GuidHob = GetFirstGuidHob (&gEfiVariableIndexTableGuid);

+  GuidHob = GetFirstGuidHob (&mEfiVariableIndexTableGuid);

   if (GuidHob == NULL) {

-    IndexTable = BuildGuidHob (&gEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE));

+    IndexTable = BuildGuidHob (&mEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE));

     IndexTable->Length      = 0;

     IndexTable->StartPtr    = NULL;

     IndexTable->EndPtr      = NULL;

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.h b/EdkModulePkg/Universal/Variable/Pei/Variable.h
index 519fcf9c22..5cebff818c 100644
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.h
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.h
@@ -61,7 +61,6 @@ typedef struct {
   UINT16          Index[VARIABLE_INDEX_TABLE_VOLUME];

 } VARIABLE_INDEX_TABLE;

 

-extern EFI_GUID gEfiVariableIndexTableGuid;

 

 //

 // Functions

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 3607bc4f7f..56f19b0437 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
@@ -69,16 +69,16 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
index 564fc61e6e..741689ff33 100644
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
@@ -72,10 +72,10 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">