Retire NetLibQueueDpc() and NetLibDispatchDpc() and use QueueDpc() and DispatchDpc() from the DpcLib instead.

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

5 files changed, 10 insertions, 10 deletions

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index bd9946d..121fb17 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -70,7 +70,7 @@
   UefiRuntimeServicesTableLib

   DebugLib

   NetLib

-

+  DpcLib

 

 [Protocols]

   gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED

@@ -80,4 +80,3 @@
   gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED

   gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED

   gEfiArpProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED

-

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index dd2674d..24727b0 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -871,7 +871,7 @@ Ip4OnArpResolved (
   //

   // Request Ip4OnArpResolvedDpc as a DPC at TPL_CALLBACK

   //

-  NetLibQueueDpc (TPL_CALLBACK, Ip4OnArpResolvedDpc, Context);

+  QueueDpc (TPL_CALLBACK, Ip4OnArpResolvedDpc, Context);

 }

 

 

@@ -924,7 +924,7 @@ Ip4OnFrameSent (
   //

   // Request Ip4OnFrameSentDpc as a DPC at TPL_CALLBACK

   //

-  NetLibQueueDpc (TPL_CALLBACK, Ip4OnFrameSentDpc, Context);

+  QueueDpc (TPL_CALLBACK, Ip4OnFrameSentDpc, Context);

 }

 

 

@@ -1187,7 +1187,7 @@ Ip4OnFrameReceived (
   //

   // Request Ip4OnFrameReceivedDpc as a DPC at TPL_CALLBACK

   //

-  NetLibQueueDpc (TPL_CALLBACK, Ip4OnFrameReceivedDpc, Context);

+  QueueDpc (TPL_CALLBACK, Ip4OnFrameReceivedDpc, Context);

 }

 

 

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 84a3965..714f3d9 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -703,7 +703,7 @@ Ip4AutoConfigCallBack (
   //

   // Request Ip4AutoConfigCallBackDpc as a DPC at TPL_CALLBACK

   //

-  NetLibQueueDpc (TPL_CALLBACK, Ip4AutoConfigCallBackDpc, Context);

+  QueueDpc (TPL_CALLBACK, Ip4AutoConfigCallBackDpc, Context);

 }

 

 

@@ -1780,7 +1780,7 @@ Ip4FreeTxToken (
     //

     // Dispatch the DPC queued by the NotifyFunction of Token->Event.

     //

-    NetLibDispatchDpc ();

+    DispatchDpc ();

   }

 

   gBS->FreePool (Wrap);

@@ -2110,7 +2110,7 @@ EfiIp4Receive (
   // Dispatch the DPC queued by the NotifyFunction of this instane's receive

   // event.

   //

-  NetLibDispatchDpc ();

+  DispatchDpc ();

 

 ON_EXIT:

   gBS->RestoreTPL (OldTpl);

@@ -2266,7 +2266,7 @@ Ip4Cancel (
   // Dispatch the DPCs queued by the NotifyFunction of the canceled rx token's

   // events.

   //

-  NetLibDispatchDpc ();

+  DispatchDpc ();

   if (EFI_ERROR (Status)) {

     if ((Token != NULL) && (Status == EFI_ABORTED)) {

       return EFI_SUCCESS;

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index 9de326f..615e5ae 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
@@ -31,6 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/NetLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/MemoryAllocationLib.h>

+#include <Library/DpcLib.h>

 

 #include "Ip4Common.h"

 #include "Ip4Driver.h"

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 964fb96..b495e75 100644
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -592,7 +592,7 @@ Ip4AccpetFrame (
   // Dispatch the DPCs queued by the NotifyFunction of the rx token's events

   // which are signaled with received data.

   //

-  NetLibDispatchDpc ();

+  DispatchDpc ();

 

 RESTART:

   Ip4ReceiveFrame (IpSb->DefaultInterface, NULL, Ip4AccpetFrame, IpSb);