Update network drivers to use FreePool() instead of gBS->FreePool().

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

6 files changed, 17 insertions, 17 deletions

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
index 63dcc6c..8ceb248 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Driver.c
@@ -180,7 +180,7 @@ Mtftp4CreateService (
                   );

 

   if (EFI_ERROR (Status)) {

-    gBS->FreePool (MtftpSb);

+    FreePool (MtftpSb);

     return Status;

   }

 

@@ -197,7 +197,7 @@ Mtftp4CreateService (
                   );

   if (EFI_ERROR (Status)) {

     gBS->CloseEvent (MtftpSb->Timer);

-    gBS->FreePool (MtftpSb);

+    FreePool (MtftpSb);

     return Status;

   }

 

@@ -212,7 +212,7 @@ Mtftp4CreateService (
   if (MtftpSb->ConnectUdp == NULL) {

     gBS->CloseEvent (MtftpSb->TimerToGetMap);

     gBS->CloseEvent (MtftpSb->Timer);

-    gBS->FreePool (MtftpSb);

+    FreePool (MtftpSb);

     return EFI_DEVICE_ERROR;

   }

 

@@ -311,7 +311,7 @@ Mtftp4DriverBindingStart (
 

 ON_ERROR:

   Mtftp4CleanService (MtftpSb);

-  gBS->FreePool (MtftpSb);

+  FreePool (MtftpSb);

 

   return Status;

 }

@@ -390,7 +390,7 @@ Mtftp4DriverBindingStop (
 

     Mtftp4CleanService (MtftpSb);

 

-    gBS->FreePool (MtftpSb);

+    FreePool (MtftpSb);

   } else {

 

     while (!IsListEmpty (&MtftpSb->Children)) {

@@ -482,7 +482,7 @@ Mtftp4ServiceBindingCreateChild (
                             );

 

   if (Instance->UnicastPort == NULL) {

-    gBS->FreePool (Instance);

+    FreePool (Instance);

     return EFI_OUT_OF_RESOURCES;

   }

 

@@ -538,7 +538,7 @@ ON_ERROR:
 

   if (EFI_ERROR (Status)) {

     UdpIoFreeIo (Instance->UnicastPort);

-    gBS->FreePool (Instance);

+    FreePool (Instance);

   }

 

   return Status;

@@ -637,6 +637,6 @@ Mtftp4ServiceBindingDestroyChild (
 

   gBS->RestoreTPL (OldTpl);

 

-  gBS->FreePool (Instance);

+  FreePool (Instance);

   return EFI_SUCCESS;

 }

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 229a355..3d92ba3 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -65,7 +65,7 @@ Mtftp4CleanOperation (
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Instance->Blocks) {

     Block = NET_LIST_USER_STRUCT (Entry, MTFTP4_BLOCK_RANGE, Link);

     RemoveEntryList (Entry);

-    gBS->FreePool (Block);

+    FreePool (Block);

   }

 

   ZeroMem (&Instance->RequestOption, sizeof (MTFTP4_OPTION));

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
index 19157a7..93e548e 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Option.c
@@ -1,7 +1,7 @@
 /** @file

   Routines to process MTFTP4 options.

   

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

+Copyright (c) 2006 - 2009, Intel Corporation<BR>

 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

@@ -528,6 +528,6 @@ Mtftp4ParseOptionOack (
 

   Status = Mtftp4ParseOption (OptionList, Count, FALSE, MtftpOption);

 

-  gBS->FreePool (OptionList);

+  FreePool (OptionList);

   return Status;

 }

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
index 524db8f..4a15aeb 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Rrq.c
@@ -743,7 +743,7 @@ ON_EXIT:
   // receive, otherwise end the session.

   //

   if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {

-    gBS->FreePool (Packet);

+    FreePool (Packet);

   }

 

   if (UdpPacket != NULL) {

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
index a758f4b..0e7f98e 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Support.c
@@ -139,7 +139,7 @@ Mtftp4SetLastBlockNum (
 

     if (Range->Start > Last) {

       RemoveEntryList (&Range->Link);

-      gBS->FreePool (Range);

+      FreePool (Range);

       continue;

     }

 

@@ -209,7 +209,7 @@ Mtftp4RemoveBlockNum (
 

       if (Range->Start > Range->End) {

         RemoveEntryList (&Range->Link);

-        gBS->FreePool (Range);

+        FreePool (Range);

       }

 

       return EFI_SUCCESS;

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 87ec0c1..00309f4 100644
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -91,7 +91,7 @@ Mtftp4WrqSendBlock (
 

     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {

       if (DataBuf != NULL) {

-        gBS->FreePool (DataBuf);

+        FreePool (DataBuf);

       }

 

       Mtftp4SendError (

@@ -111,7 +111,7 @@ Mtftp4WrqSendBlock (
     if (DataLen > 0) {

       NetbufAllocSpace (UdpPacket, DataLen, FALSE);

       CopyMem (Packet->Data.Data, DataBuf, DataLen);

-      gBS->FreePool (DataBuf);

+      FreePool (DataBuf);

     }

   }

 

@@ -462,7 +462,7 @@ ON_EXIT:
   // restart the receive, otherwise end the session.

   //

   if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {

-    gBS->FreePool (Packet);

+    FreePool (Packet);

   }

 

   if (UdpPacket != NULL) {