Perfected MSA files.

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

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
index 85298640bff6a21cd8f33325d63bfc7ede73d551..b7b946e1fa87f6c4f6875c6a43a5b3a9a442a2cb 100644 (file)
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa
@@ -64,6 +64,9 @@
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r
   </Protocols>\r
   <Guids>\r
     <GuidCNames Usage="ALWAYS_CONSUMED">\r

+      <GuidCName>gEfiCapsuleGuid</GuidCName>\r
+    </GuidCNames>\r
+    <GuidCNames Usage="SOMETIMES_CONSUMED">\r

       <GuidCName>gEfiCapsuleVendorGuid</GuidCName>\r
     </GuidCNames>\r
   </Guids>\r
       <GuidCName>gEfiCapsuleVendorGuid</GuidCName>\r
     </GuidCNames>\r
   </Guids>\r

diff --git a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
index 50de4c6c9d2a0c25a000c64d29bb03fc6920eb6b..0e7a9d496ee2c95dea8f5a73ed6f7b8e18dfdfee 100644 (file)
--- a/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
+++ b/EdkModulePkg/Universal/Capsule/RuntimeDxe/CapsuleService.c
@@ -21,9 +21,7 @@ Abstract:
 \r
 #include "CapsuleService.h"\r
 \r
 \r
 #include "CapsuleService.h"\r
 \r

-\r
-STATIC EFI_GUID mEfiCapsuleHeaderGuid = EFI_CAPSULE_GUID;\r
-\r
+extern EFI_GUID gEfiCapsuleGuid;\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -78,7 +76,7 @@ Returns:
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

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

       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
         return EFI_UNSUPPORTED;\r
       }\r
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
         return EFI_UNSUPPORTED;\r
       }\r


@@ -206,7 +204,7 @@ Returns:
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r
     if ((CapsuleHeader->Flags & (CAPSULE_FLAGS_PERSIST_ACROSS_RESET | CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE)) == CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) {\r
       return EFI_INVALID_PARAMETER;\r
     }\r

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

       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
         return EFI_UNSUPPORTED;\r
       }\r
       if ((CapsuleHeader->Flags & CAPSULE_FLAGS_POPULATE_SYSTEM_TABLE) == 0) {\r
         return EFI_UNSUPPORTED;\r
       }\r

diff --git a/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa b/EdkModulePkg/Universal/ConPlatform/Dxe/ConPlatform.msa
index c00a95ce92a157e229e0f0392e8e20921beb86fd..a4300e53f3e186a5adda71f22e789ee554a37b04 100644 (file)
--- 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"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r

+    <Protocol Usage="BY_START">\r
+      <ProtocolCName>gEfiConsoleInDeviceGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="BY_START">\r
+      <ProtocolCName>gEfiConsoleOutDeviceGuid</ProtocolCName>\r
+    </Protocol>\r
+    <Protocol Usage="BY_START">\r
+      <ProtocolCName>gEfiStandardErrorDeviceGuid</ProtocolCName>\r
+    </Protocol>\r

     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>\r
     </Protocol>\r


@@ -70,46 +79,43 @@
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="TO_START">\r
       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>\r
     </Protocol>\r

+    <Protocol Usage="TO_START">\r
+      <ProtocolCName>gEfiHotPlugDeviceGuid</ProtocolCName>\r
+    </Protocol>\r

   </Protocols>\r
   <Variables>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E 0x0044 0x0065 0x0076</VariableName>\r
   </Protocols>\r
   <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 0x0049 0x006E</VariableName>\r
     </Variable>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0043 0x006F 0x006E 0x0049 0x006E</VariableName>\r

-      <GuidC_Name>gConInGuid</GuidC_Name>\r
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>\r
+      <HelpText>L"ConIn" 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
     </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>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074</VariableName>\r
     </Variable>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0043 0x006F 0x006E 0x004F 0x0075 0x0074</VariableName>\r

-      <GuidC_Name>gConOutGuid</GuidC_Name>\r
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>\r
+      <HelpText>L"ConOut" 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
     </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
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074</VariableName>\r
     </Variable>\r
     <Variable Usage="SOMETIMES_CONSUMED">\r
       <VariableName>0x0045 0x0072 0x0072 0x004F 0x0075 0x0074</VariableName>\r

-      <GuidC_Name>gErrOutGuid</GuidC_Name>\r
+      <GuidC_Name>gEfiGlobalVariableGuid</GuidC_Name>\r
+      <HelpText>L"ErrOut" global variable will be updated if the serial device is not a hot plug device.</HelpText>\r

     </Variable>\r
   </Variables>\r
   <Guids>\r
     </Variable>\r
   </Variables>\r
   <Guids>\r

-    <GuidCNames Usage="SOMETIMES_PRODUCED">\r
-      <GuidCName>gEfiConsoleInDeviceGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="SOMETIMES_PRODUCED">\r
-      <GuidCName>gEfiConsoleOutDeviceGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="SOMETIMES_PRODUCED">\r
-      <GuidCName>gEfiStandardErrorDeviceGuid</GuidCName>\r
-    </GuidCNames>\r
-    <GuidCNames Usage="SOMETIMES_CONSUMED">\r
-      <GuidCName>gEfiHotPlugDeviceGuid</GuidCName>\r
-    </GuidCNames>\r

     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
     </GuidCNames>\r
     <GuidCNames Usage="SOMETIMES_CONSUMED">\r
       <GuidCName>gEfiGlobalVariableGuid</GuidCName>\r
     </GuidCNames>\r

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariable.msa
index 1fbf8da410e44d6ec371169f2d35bee33b7331be..6e769aa2801ea750e9632c335a7f69e15a02dab5 100644 (file)
--- 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"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r

-    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r
+    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">\r

       <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 X64">\r
+    <Protocol Usage="ALWAYS_PRODUCED" SupArchList="IA32 X64">\r

       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.c b/EdkModulePkg/Universal/Variable/Pei/Variable.c
index 06604195478b1ad29480d0b9754117815f6cccd9..a2ea1d6584bd2e9e3c943b19c61d62cb5b620703 100644 (file)
--- a/EdkModulePkg/Universal/Variable/Pei/Variable.c
+++ b/EdkModulePkg/Universal/Variable/Pei/Variable.c
@@ -1,13 +1,13 @@
 /*++\r
 \r
 Copyright (c) 2006 - 2007 Intel Corporation. <BR>\r
 /*++\r
 \r
 Copyright (c) 2006 - 2007 Intel Corporation. <BR>\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
+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

 Module Name:\r
 \r
   Variable.c\r
 Module Name:\r
 \r
   Variable.c\r


@@ -34,7 +34,7 @@ static EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
   &mVariablePpi\r
 };\r
 \r
   &mVariablePpi\r
 };\r
 \r

-EFI_GUID gEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;\r
+EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;\r

 \r
 EFI_STATUS\r
 EFIAPI\r
 \r
 EFI_STATUS\r
 EFIAPI\r


@@ -265,9 +265,9 @@ Returns:
   //\r
   MaxIndex = 0;\r
 \r
   //\r
   MaxIndex = 0;\r
 \r

-  GuidHob = GetFirstGuidHob (&gEfiVariableIndexTableGuid);\r
+  GuidHob = GetFirstGuidHob (&mEfiVariableIndexTableGuid);\r

   if (GuidHob == NULL) {\r
   if (GuidHob == NULL) {\r

-    IndexTable = BuildGuidHob (&gEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE));\r
+    IndexTable = BuildGuidHob (&mEfiVariableIndexTableGuid, sizeof (VARIABLE_INDEX_TABLE));\r

     IndexTable->Length      = 0;\r
     IndexTable->StartPtr    = NULL;\r
     IndexTable->EndPtr      = NULL;\r
     IndexTable->Length      = 0;\r
     IndexTable->StartPtr    = NULL;\r
     IndexTable->EndPtr      = NULL;\r

diff --git a/EdkModulePkg/Universal/Variable/Pei/Variable.h b/EdkModulePkg/Universal/Variable/Pei/Variable.h
index 519fcf9c22335eb7f7e07114c31d3babd8a89517..5cebff818c0d1bfaff41ac8fd86fa9f96b7e04cb 100644 (file)
--- 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];\r
 } VARIABLE_INDEX_TABLE;\r
 \r
   UINT16          Index[VARIABLE_INDEX_TABLE_VOLUME];\r
 } VARIABLE_INDEX_TABLE;\r
 \r

-extern EFI_GUID gEfiVariableIndexTableGuid;\r

 \r
 //\r
 // Functions\r
 \r
 //\r
 // Functions\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.msa
index 3607bc4f7f7083408eb203b386fdc5151be33b33..56f19b0437e093e241505c5a921446a2ab90bc8c 100644 (file)
--- 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"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiVariableArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="ALWAYS_PRODUCED">\r

       <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiVariableWriteArchProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
   </Protocols>\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa b/EdkModulePkg/Universal/Variable/RuntimeDxe/VariableIpf.msa
index 564fc61e6e9d0b85263f7a7e1cc6c6362f6c1467..741689ff3329cdd5d88a4f5fbb6b96e3ebbc4aa3 100644 (file)
--- 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"/>\r
   </PackageDependencies>\r
   <Protocols>\r
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>\r
   </PackageDependencies>\r
   <Protocols>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>\r
     </Protocol>\r
       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>\r
     </Protocol>\r

-    <Protocol Usage="ALWAYS_CONSUMED">\r
+    <Protocol Usage="SOMETIMES_CONSUMED">\r

       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r
       <ProtocolCName>gEfiFirmwareVolumeBlockProtocolGuid</ProtocolCName>\r
     </Protocol>\r
     <Protocol Usage="ALWAYS_CONSUMED">\r