Clean up the following module msa files, they are edkmodule package ftwlit, Crc32SectionExtract, NullMemoryTest, PeiMemoryTest, MonotonicCounter modules.

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

2 files changed, 12 insertions, 24 deletions

diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c
index 478729ea82..da76b55e45 100644
--- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c
+++ b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.c
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, Intel Corporation                                                         

 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        

@@ -256,13 +256,13 @@ Returns:
   // Read the last high part

   //

   BufferSize = sizeof (UINT32);

-  Status = gRT->GetVariable (

-                  mEfiMtcName,

-                  &mEfiMtcGuid,

-                  NULL,

-                  &BufferSize,

-                  &HighCount

-                  );

+  Status = EfiGetVariable (

+             mEfiMtcName,

+             &mEfiMtcGuid,

+             NULL,

+             &BufferSize,

+             &HighCount

+             );

   if (EFI_ERROR (Status)) {

     HighCount = 0;

   }

diff --git a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.msa b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.msa
index 375a9feb2d..291f2ea680 100644
--- a/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.msa
+++ b/EdkModulePkg/Universal/MonotonicCounter/RuntimeDxe/MonotonicCounter.msa
@@ -6,8 +6,8 @@
     <GuidValue>AD608272-D07F-4964-801E-7BD3B7888652</GuidValue>

     <Version>1.0</Version>

     <Abstract>Component description file for MonotonicCounter module.</Abstract>

-    <Description>This module Produced the Monotonic Counter Services as defined in the DXE CIS.</Description>

-    <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>

+    <Description>This module produces UEFI Monotonic Counter Boot and Runtime Services.</Description>

+    <Copyright>Copyright (c) 2006 - 2007, Intel Corporation</Copyright>

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

@@ -26,19 +26,14 @@
       <Keyword>BaseLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiRuntimeLib</Keyword>

     </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    <LibraryClass Usage="ALWAYS_CONSUMED" RecommendedInstanceGuid="bda39d3a-451b-4350-8266-81ab10fa0523">

       <Keyword>DebugLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>MemoryAllocationLib</Keyword>

+      <HelpText>Recommended libary Instance is PeiDxeDebugLibReportStatusCode instance in MdePkg.</HelpText>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

@@ -54,19 +49,12 @@
   </SourceFiles>

   <PackageDependencies>

     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-    <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

   <Protocols>

     <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiMonotonicCounterArchProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

-  <Variables>

-    <Variable Usage="PRIVATE">

-      <VariableName>0x004D 0x0054 0x0043</VariableName>

-      <GuidC_Name>gMTCGuid</GuidC_Name>

-    </Variable>

-  </Variables>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>