Clean up the following module msa files, they are three networt and two PCD modules.

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

2 files changed, 12 insertions, 16 deletions

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
index 24c05a4f11..c3ec2043cc 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/SNP.msa
@@ -7,7 +7,7 @@
     <Version>1.0</Version>

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

     <Description>This module attachs the SNP interface to UNDI layer that it finds on the given handle!</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

@@ -22,8 +22,9 @@
     <OutputFileBasename>SNP</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>UefiDriverModelLib</Keyword>

@@ -69,7 +70,6 @@
   </SourceFiles>

   <PackageDependencies>

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

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

   </PackageDependencies>

   <Protocols>

     <Protocol Usage="BY_START">

@@ -81,11 +81,12 @@
     <Protocol Usage="TO_START">

       <ProtocolCName>gEfiDevicePathProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="SOMETIMES_CONSUMED">

+    <Protocol Usage="TO_START">

       <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="TO_START">

       <ProtocolCName>gEfiNetworkInterfaceIdentifierProtocolGuid_31</ProtocolCName>

+      <HelpText>This module first look for 3.1 undi, if it is not there then look for 3.0 undi.</HelpText>

     </Protocol>

   </Protocols>

   <Externs>

diff --git a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
index 4b6cda9b1e..a32812a01a 100644
--- a/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
+++ b/EdkModulePkg/Universal/Network/Snp32_64/Dxe/snp.c
@@ -1,5 +1,5 @@
 /*++

-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

@@ -1081,14 +1081,9 @@ Returns:
     return EFI_INVALID_PARAMETER;

   }

 

-  Status = gBS->AllocatePool (

-                  EfiBootServicesData,

-                  sizeof (struct s_v2p),

-                  (VOID **) v2p

-                  );

-

-  if (Status != EFI_SUCCESS) {

-    return Status;

+  *v2p = AllocatePool (sizeof (struct s_v2p));

+  if (*v2p != NULL) {

+    return EFI_OUT_OF_RESOURCES;

   }

 

   Status = mPciIoFncs->Map (

@@ -1100,7 +1095,7 @@ Returns:
                         &(*v2p)->unmap

                         );

   if (Status != EFI_SUCCESS) {

-    gBS->FreePool (*v2p);

+    FreePool (*v2p);

     return Status;

   }

   (*v2p)->vaddr = vaddr;

@@ -1189,7 +1184,7 @@ Returns:
 

     Status  = mPciIoFncs->Unmap (mPciIoFncs, v->unmap);

 

-    gBS->FreePool (v);

+    FreePool (v);

 

     if (Status) {

       DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));

@@ -1201,7 +1196,7 @@ Returns:
     if ((t = v->next)->vaddr == vaddr) {

       v->next = t->next;

       Status  = mPciIoFncs->Unmap (mPciIoFncs, t->unmap);

-      gBS->FreePool (t);

+      FreePool (t);

 

       if (Status) {

         DEBUG ((EFI_D_ERROR, "Unmap failed with status = %x\n", Status));