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

5 files changed, 21 insertions, 42 deletions

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
index 7e196d6453..de9ba8372f 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.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        

@@ -18,8 +18,7 @@ Abstract:
   Implements GUIDed section extraction protocol interface with 

   a specific GUID: CRC32.

 

-  Please refer to the Tiano File Image Format Specification, 

-  FV spec 0.3.6

+  Please refer to the Framewokr Firmware Volume Specification 0.9.

 

 --*/

 

@@ -68,7 +67,7 @@ Returns:
             );

   if (EFI_ERROR (Status)) {

     if (Crc32GuidedSep != NULL) {

-      gBS->FreePool (Crc32GuidedSep);

+      FreePool (Crc32GuidedSep);

     }

 

     return Status;

@@ -84,7 +83,7 @@ Returns:
                   Crc32GuidedSep

                   );

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Crc32GuidedSep);

+    FreePool (Crc32GuidedSep);

     return EFI_LOAD_ERROR;

   }

 

@@ -199,8 +198,8 @@ Crc32ExtractSection (
   Image = (UINT8 *) InputSection + (UINT32) (GuidedSectionHeader->DataOffset);

   *OutputSize = GetSectionLength ((EFI_COMMON_SECTION_HEADER *) InputSection) - (UINT32) GuidedSectionHeader->DataOffset;

 

-  Status = gBS->AllocatePool (EfiBootServicesData, *OutputSize, OutputBuffer);

-  if (EFI_ERROR (Status)) {

+  *OutputBuffer = AllocatePool (*OutputSize);

+  if (*OutputBuffer == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

   //

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
index 387e637cd0..979c41de94 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.h
@@ -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        

@@ -16,8 +16,7 @@ Module Name:
 Abstract:

 

   Header file for Crc32SectionExtract.c

-  Please refer to Tiano File Image Format specification 

-  FV spec 0.3.6

+  Please refer to the Framewokr Firmware Volume Specification 0.9.

 

 --*/

 

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
index e12ca140bc..c12474f58b 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.msa
@@ -6,8 +6,8 @@
     <GuidValue>51C9F40C-5243-4473-B265-B3C8FFAFF9FA</GuidValue>

     <Version>1.0</Version>

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

-    <Description>This driver implements GUIDed section extraction protocol interface with a specific GUID: CRC32.</Description>

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

+    <Description>This driver implements CRC32 GUIDed section extraction protocol interface.</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

@@ -22,24 +22,22 @@
     <OutputFileBasename>Crc32SectionExtract</OutputFileBasename>

   </ModuleDefinitions>

   <LibraryClassDefinitions>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

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

       <Keyword>DebugLib</Keyword>

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

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiDriverEntryPoint</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>UefiLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

-      <Keyword>BaseLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>UefiBootServicesTableLib</Keyword>

     </LibraryClass>

+    <LibraryClass Usage="ALWAYS_CONSUMED">

+      <Keyword>MemoryAllocationLib</Keyword>

+    </LibraryClass>

   </LibraryClassDefinitions>

   <SourceFiles>

     <Filename>Crc32SectionExtract.c</Filename>

@@ -50,10 +48,9 @@
   </SourceFiles>

   <PackageDependencies>

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

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

   </PackageDependencies>

   <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiSecurityPolicyProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_PRODUCED">

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.c b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.c
index f6af017f77..87605cc055 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.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        

@@ -20,17 +20,9 @@ Abstract:
   extraction protocol. GUID specific implementation of each

   GUIDed section extraction protocol can be found in other

   files under the same directory.

-  

-  Please refer to the Tiano File Image Format Specification, 

-  FV spec 0.3.6

-  

-  Acronyms used       Meaning

-

     

 --*/

 

-

-#include "Common/FirmwareFileSystem.h"

 #include "GuidedSection.h"

 

 EFI_STATUS

@@ -58,15 +50,8 @@ Returns:
 // TODO:    ExtractSection - add argument and description to function comment

 // TODO:    EFI_OUT_OF_RESOURCES - add return value to function comment

 {

-  EFI_STATUS  Status;

-

-  *GuidedSep = NULL;

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  sizeof (EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL),

-                  (VOID **) GuidedSep

-                  );

-  if (EFI_ERROR (Status)) {

+  *GuidedSep = AllocatePool (sizeof (EFI_GUIDED_SECTION_EXTRACTION_PROTOCOL));

+  if (*GuidedSep == NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.h b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.h
index 1399edf4f6..885b05a013 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.h
+++ b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/GuidedSection.h
@@ -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        

@@ -16,8 +16,7 @@ Module Name:
 Abstract:

 

   Header file for GuidedSection.c

-  Please refer to Tiano File Image Format specification 

-  FV spec 0.3.6

+  Please refer to the Framewokr Firmware Volume Specification 0.9.

   

 --*/