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

10 files changed, 79 insertions, 115 deletions

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.c b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.c
index f4c7e91..a120c7f 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.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        

@@ -236,7 +236,7 @@ Returns:
                                             Ptr

                                             );

       if (EFI_ERROR (Status)) {

-        gBS->FreePool (MyBuffer);

+        FreePool (MyBuffer);

         return EFI_ABORTED;

       }

 

@@ -256,7 +256,7 @@ Returns:
       MyLength  = FtwLiteDevice->SizeOfSpareBlock;

       Status    = Fvb->Read (Fvb, Lba + Index, 0, &MyLength, Ptr);

       if (EFI_ERROR (Status)) {

-        gBS->FreePool (MyBuffer);

+        FreePool (MyBuffer);

         return EFI_ABORTED;

       }

 

@@ -276,7 +276,7 @@ Returns:
   SpareBufferSize = FtwLiteDevice->SpareAreaLength;

   SpareBuffer     = AllocatePool (SpareBufferSize);

   if (SpareBuffer == NULL) {

-    gBS->FreePool (MyBuffer);

+    FreePool (MyBuffer);

     return EFI_OUT_OF_RESOURCES;

   }

 

@@ -291,8 +291,8 @@ Returns:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (MyBuffer);

-      gBS->FreePool (SpareBuffer);

+      FreePool (MyBuffer);

+      FreePool (SpareBuffer);

       return EFI_ABORTED;

     }

 

@@ -314,8 +314,8 @@ Returns:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (MyBuffer);

-      gBS->FreePool (SpareBuffer);

+      FreePool (MyBuffer);

+      FreePool (SpareBuffer);

       return EFI_ABORTED;

     }

 

@@ -324,7 +324,7 @@ Returns:
   //

   // Free MyBuffer

   //

-  gBS->FreePool (MyBuffer);

+  FreePool (MyBuffer);

 

   //

   // Set the SpareCompleteD in the FTW record,

@@ -337,7 +337,7 @@ Returns:
             SPARE_COMPLETED

             );

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (SpareBuffer);

+    FreePool (SpareBuffer);

     return EFI_ABORTED;

   }

 

@@ -349,7 +349,7 @@ Returns:
   //

   Status = FtwWriteRecord (FtwLiteDevice, Fvb);

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (SpareBuffer);

+    FreePool (SpareBuffer);

     return EFI_ABORTED;

   }

 

@@ -371,7 +371,7 @@ Returns:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (SpareBuffer);

+      FreePool (SpareBuffer);

       return EFI_ABORTED;

     }

 

@@ -380,7 +380,7 @@ Returns:
   //

   // All success.

   //

-  gBS->FreePool (SpareBuffer);

+  FreePool (SpareBuffer);

 

   DEBUG (

     (EFI_D_FTW_LITE,

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
index 4e6dd26..e2419a4 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwLite.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

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

     <Description>This driver provides fault tolerant write capability for block devices.</Description>

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

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

@@ -24,23 +24,15 @@
   <LibraryClassDefinitions>

     <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>PcdLib</Keyword>

-    </LibraryClass>  

-    <LibraryClass Usage="ALWAYS_CONSUMED">

+    </LibraryClass>

+    <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>HobLib</Keyword>

-    </LibraryClass>

-    <LibraryClass Usage="ALWAYS_CONSUMED">

       <Keyword>BaseMemoryLib</Keyword>

     </LibraryClass>

     <LibraryClass Usage="ALWAYS_CONSUMED">

@@ -69,7 +61,7 @@
     <Protocol Usage="ALWAYS_PRODUCED">

       <ProtocolCName>gEfiFaultTolerantWriteLiteProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">

+    <Protocol Usage="ALWAYS_CONSUMED" SupArchList="IA32 EBC">

       <ProtocolCName>gEfiPciRootBridgeIoProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

@@ -78,9 +70,6 @@
   </Protocols>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>gEfiFlashMapHobGuid</GuidCName>

-    </GuidCNames>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiSystemNvDataFvGuid</GuidCName>

     </GuidCNames>

   </Guids>

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwMisc.c b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwMisc.c
index 025ec33..eb334ea 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwMisc.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwMisc.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        

@@ -229,7 +229,7 @@ Returns:
     }

   }

 

-  gBS->FreePool (HandleBuffer);

+  FreePool (HandleBuffer);

   return Status;

 }

 

@@ -329,7 +329,7 @@ Returns:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (Buffer);

+      FreePool (Buffer);

       return Status;

     }

 

@@ -340,7 +340,7 @@ Returns:
   //

   Status = FtwEraseBlock (FtwLiteDevice, FvBlock, Lba);

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Buffer);

+    FreePool (Buffer);

     return EFI_ABORTED;

   }

   //

@@ -352,14 +352,14 @@ Returns:
     Status  = FvBlock->Write (FvBlock, Lba + Index, 0, &Count, Ptr);

     if (EFI_ERROR (Status)) {

       DEBUG ((EFI_D_FTW_LITE, "FtwLite: FVB Write block - %r\n", Status));

-      gBS->FreePool (Buffer);

+      FreePool (Buffer);

       return Status;

     }

 

     Ptr += Count;

   }

 

-  gBS->FreePool (Buffer);

+  FreePool (Buffer);

 

   return Status;

 }

@@ -433,7 +433,7 @@ Notes:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (Buffer);

+      FreePool (Buffer);

       return Status;

     }

 

@@ -463,7 +463,7 @@ Notes:
             WORKING_BLOCK_INVALID

             );

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Buffer);

+    FreePool (Buffer);

     return EFI_ABORTED;

   }

 

@@ -478,7 +478,7 @@ Notes:
             FtwLiteDevice->FtwWorkBlockLba

             );

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Buffer);

+    FreePool (Buffer);

     return EFI_ABORTED;

   }

   //

@@ -496,7 +496,7 @@ Notes:
                                           );

     if (EFI_ERROR (Status)) {

       DEBUG ((EFI_D_FTW_LITE, "FtwLite: FVB Write block - %r\n", Status));

-      gBS->FreePool (Buffer);

+      FreePool (Buffer);

       return Status;

     }

 

@@ -505,7 +505,7 @@ Notes:
   //

   // Since the memory buffer will not be used, free memory Buffer.

   //

-  gBS->FreePool (Buffer);

+  FreePool (Buffer);

 

   //

   // Update the VALID of the working block

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwWorkSpace.c b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwWorkSpace.c
index 40e56ad..00d7d8e 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwWorkSpace.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/FtwWorkSpace.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        

@@ -417,17 +417,11 @@ Returns:
   // Read all original data from working block to a memory buffer

   //

   TempBufferSize = FtwLiteDevice->SpareAreaLength;

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  TempBufferSize,

-                  (VOID **) &TempBuffer

-                  );

-  if (EFI_ERROR (Status)) {

+  TempBuffer     = AllocateZeroPool (TempBufferSize);

+  if (TempBuffer != NULL) {

     return EFI_OUT_OF_RESOURCES;

   }

 

-  ZeroMem (TempBuffer, TempBufferSize);

-

   Ptr = TempBuffer;

   for (Index = 0; Index < FtwLiteDevice->NumberOfSpareBlock; Index += 1) {

     Length = FtwLiteDevice->SizeOfSpareBlock;

@@ -439,7 +433,7 @@ Returns:
                                           Ptr

                                           );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (TempBuffer);

+      FreePool (TempBuffer);

       return EFI_ABORTED;

     }

 

@@ -450,8 +444,8 @@ Returns:
   //

   Ptr = TempBuffer +

     ((UINTN) (FtwLiteDevice->FtwWorkSpaceLba - FtwLiteDevice->FtwWorkBlockLba)) *

-    FtwLiteDevice->SizeOfSpareBlock +

-    FtwLiteDevice->FtwWorkSpaceBase;

+    FtwLiteDevice->SizeOfSpareBlock + FtwLiteDevice->FtwWorkSpaceBase;

+

   Status = CleanupWorkSpace (

             FtwLiteDevice,

             Ptr,

@@ -480,7 +474,7 @@ Returns:
   SpareBufferSize = FtwLiteDevice->SpareAreaLength;

   SpareBuffer     = AllocatePool (SpareBufferSize);

   if (SpareBuffer == NULL) {

-    gBS->FreePool (TempBuffer);

+    FreePool (TempBuffer);

     return EFI_OUT_OF_RESOURCES;

   }

 

@@ -495,8 +489,8 @@ Returns:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (TempBuffer);

-      gBS->FreePool (SpareBuffer);

+      FreePool (TempBuffer);

+      FreePool (SpareBuffer);

       return EFI_ABORTED;

     }

 

@@ -517,8 +511,8 @@ Returns:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (TempBuffer);

-      gBS->FreePool (SpareBuffer);

+      FreePool (TempBuffer);

+      FreePool (SpareBuffer);

       return EFI_ABORTED;

     }

 

@@ -527,14 +521,14 @@ Returns:
   //

   // Free TempBuffer

   //

-  gBS->FreePool (TempBuffer);

+  FreePool (TempBuffer);

 

   //

   // Write the spare block to working block

   //

   Status = FlushSpareBlockToWorkingBlock (FtwLiteDevice);

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (SpareBuffer);

+    FreePool (SpareBuffer);

     return Status;

   }

   //

@@ -552,14 +546,14 @@ Returns:
                                             Ptr

                                             );

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (SpareBuffer);

+      FreePool (SpareBuffer);

       return EFI_ABORTED;

     }

 

     Ptr += Length;

   }

 

-  gBS->FreePool (SpareBuffer);

+  FreePool (SpareBuffer);

 

   DEBUG ((EFI_D_FTW_LITE, "FtwLite: reclaim work space success\n"));

 

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/Ia32/Ia32FtwMisc.c b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/Ia32/Ia32FtwMisc.c
index 85fa60e..6425f29 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/Ia32/Ia32FtwMisc.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/Ia32/Ia32FtwMisc.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        

@@ -76,10 +76,12 @@ Returns:
   Status = PciRootBridgeIo->Pci.Read (

                                   PciRootBridgeIo,

                                   EfiPciWidthUint32,

-                                  EFI_PCI_ADDRESS (LPC_BUS_NUMBER,

-    LPC_DEVICE_NUMBER,

-    LPC_IF,

-    Offset),

+                                  EFI_PCI_ADDRESS (

+                                    LPC_BUS_NUMBER,

+                                    LPC_DEVICE_NUMBER,

+                                    LPC_IF,

+                                    Offset

+                                    ),

                                   1,

                                   &Value

                                   );

@@ -295,7 +297,7 @@ Notes:
   Status = GetSwapState (FtwLiteDevice, &TopSwap);

   if (EFI_ERROR (Status)) {

     DEBUG ((EFI_D_ERROR, "FtwLite: Get Top Swapped status - %r\n", Status));

-    gBS->FreePool (Buffer);

+    FreePool (Buffer);

     return EFI_ABORTED;

   }

 

@@ -305,7 +307,7 @@ Notes:
     //

     Status = GetFvbByAddress (FtwLiteDevice->SpareAreaAddress + FTW_BLOCK_SIZE, &BootFvb);

     if (EFI_ERROR (Status)) {

-      gBS->FreePool (Buffer);

+      FreePool (Buffer);

       return Status;

     }

     //

@@ -323,7 +325,7 @@ Notes:
                           Ptr

                           );

       if (EFI_ERROR (Status)) {

-        gBS->FreePool (Buffer);

+        FreePool (Buffer);

         return Status;

       }

 

@@ -345,7 +347,7 @@ Notes:
                                               Ptr

                                               );

       if (EFI_ERROR (Status)) {

-        gBS->FreePool (Buffer);

+        FreePool (Buffer);

         return Status;

       }

 

@@ -363,7 +365,7 @@ Notes:
   //

   Status = FtwEraseSpareBlock (FtwLiteDevice);

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (Buffer);

+    FreePool (Buffer);

     return EFI_ABORTED;

   }

   //

@@ -381,14 +383,14 @@ Notes:
                                             );

     if (EFI_ERROR (Status)) {

       DEBUG ((EFI_D_FTW_LITE, "FtwLite: FVB Write boot block - %r\n", Status));

-      gBS->FreePool (Buffer);

+      FreePool (Buffer);

       return Status;

     }

 

     Ptr += Count;

   }

 

-  gBS->FreePool (Buffer);

+  FreePool (Buffer);

 

   //

   // Clear TopSwap bit

diff --git a/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c b/EdkModulePkg/Universal/FirmwareVolume/GuidedSectionExtraction/Crc32SectionExtract/Dxe/Crc32SectionExtract.c
index 7e196d6..de9ba83 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 387e637..979c41d 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 e12ca14..c12474f 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 f6af017..87605cc 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 1399edf..885b05a 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.

   

 --*/