Retire NetLibQueueDpc() and NetLibDispatchDpc() and use QueueDpc() and DispatchDpc...

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

diff --git a/MdeModulePkg/Include/Library/NetLib.h b/MdeModulePkg/Include/Library/NetLib.h
index c1519fea23e8f1d6c55c63151fd5fe615e55d7c0..7addeeef79d8dc67d456866e0c9ff4f6d53f2209 100644 (file)
--- a/MdeModulePkg/Include/Library/NetLib.h
+++ b/MdeModulePkg/Include/Library/NetLib.h
@@ -16,8 +16,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _NET_LIB_H_\r
 #define _NET_LIB_H_\r
 \r
 #ifndef _NET_LIB_H_\r
 #define _NET_LIB_H_\r
 \r

-#include <Protocol/Dpc.h>\r
-\r

 typedef UINT32          IP4_ADDR;\r
 typedef UINT32          TCP_SEQNO;\r
 typedef UINT16          TCP_PORTNO;\r
 typedef UINT32          IP4_ADDR;\r
 typedef UINT32          TCP_SEQNO;\r
 typedef UINT16          TCP_PORTNO;\r


@@ -820,45 +818,6 @@ NetLibGetNicHandle (
   IN EFI_GUID               *ProtocolGuid\r
   );\r
 \r
   IN EFI_GUID               *ProtocolGuid\r
   );\r
 \r

-/**\r
-  Add a Deferred Procedure Call to the end of the DPC queue.\r
-\r
-  @param[in]  DpcTpl           The EFI_TPL that the DPC should be invoked.\r
-  @param[in]  DpcProcedure     Pointer to the DPC's function.\r
-  @param[in]  DpcContext       Pointer to the DPC's context.  Passed to DpcProcedure\r
-                               when DpcProcedure is invoked.\r
-\r
-  @retval  EFI_SUCCESS              The DPC was queued.\r
-  @retval  EFI_INVALID_PARAMETER    DpcTpl is not a valid EFI_TPL, or DpcProcedure\r
-                                    is NULL.\r
-  @retval  EFI_OUT_OF_RESOURCES     There are not enough resources available to\r
-                                    add the DPC to the queue.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-NetLibQueueDpc (\r
-  IN EFI_TPL            DpcTpl,\r
-  IN EFI_DPC_PROCEDURE  DpcProcedure,\r
-  IN VOID               *DpcContext    OPTIONAL\r
-  );\r
-\r
-/**\r
-  Dispatch the queue of DPCs. ALL DPCs that have been queued with a DpcTpl\r
-  value greater than or equal to the current TPL are invoked in the order that\r
-  they were queued.  DPCs with higher DpcTpl values are invoked before DPCs with\r
-  lower DpcTpl values.\r
-\r
-  @retval  EFI_SUCCESS              One or more DPCs were invoked.\r
-  @retval  EFI_NOT_FOUND            No DPCs were invoked.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-NetLibDispatchDpc (\r
-  VOID\r
-  );\r
-\r

 /**\r
   This is the default unload handle for all the network drivers.\r
 \r
 /**\r
   This is the default unload handle for all the network drivers.\r
 \r

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index c3dc515c45a0ceeac7c9a96da279254651513cda..0843173a64548b5caede71d3e3caecb8b73fa27f 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 \r
 LIST_ENTRY  mActiveIpIoList = {\r
 \r
 \r
 LIST_ENTRY  mActiveIpIoList = {\r


@@ -564,7 +565,7 @@ IpIoTransmitHandler (
   //\r
   // Request IpIoTransmitHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request IpIoTransmitHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, IpIoTransmitHandlerDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, IpIoTransmitHandlerDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -618,7 +619,7 @@ IpIoDummyHandler (
   //\r
   // Request IpIoDummyHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request IpIoDummyHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, IpIoDummyHandlerDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, IpIoDummyHandlerDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -738,7 +739,7 @@ IpIoListenHandler (
   //\r
   // Request IpIoListenHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request IpIoListenHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, IpIoListenHandlerDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, IpIoListenHandlerDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
index 1e812c8f83e90b2d817cb79a3a40965e84bbf8c0..1e83b67df77f4373aae1af9ddaebe55cc1cc6f61 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
@@ -45,3 +45,4 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
   BaseMemoryLib\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
   BaseMemoryLib\r

+  DpcLib\r

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
index 32c81c17b77008126c461d7efa82ebc93ea73c0c..f18aa41e34a10e15d1f73535763787382ba7ed51 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.c
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiConfigRouting.h>\r
 #include <Protocol/ComponentName.h>\r
 #include <Protocol/ComponentName2.h>\r
 #include <Protocol/HiiConfigRouting.h>\r
 #include <Protocol/ComponentName.h>\r
 #include <Protocol/ComponentName2.h>\r

-#include <Protocol/Dpc.h>\r

 \r
 #include <Guid/NicIp4ConfigNvData.h>\r
 \r
 \r
 #include <Guid/NicIp4ConfigNvData.h>\r
 \r


@@ -34,8 +33,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/HiiLib.h>\r
 #include <Library/PrintLib.h>\r
 \r
 #include <Library/HiiLib.h>\r
 #include <Library/PrintLib.h>\r
 \r

-EFI_DPC_PROTOCOL *mDpc = NULL;\r
-\r

 GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mNetLibHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};\r
 \r
 #define NIC_ITEM_CONFIG_SIZE   sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE\r
 GLOBAL_REMOVE_IF_UNREFERENCED CONST CHAR8 mNetLibHexStr[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'};\r
 \r
 #define NIC_ITEM_CONFIG_SIZE   sizeof (NIC_IP4_CONFIG_INFO) + sizeof (EFI_IP4_ROUTE_TABLE) * MAX_IP4_CONFIG_IN_VARIABLE\r


@@ -1458,76 +1455,3 @@ NetLibGetNicHandle (
   gBS->FreePool (OpenBuffer);\r
   return Handle;\r
 }\r
   gBS->FreePool (OpenBuffer);\r
   return Handle;\r
 }\r

-\r
-/**\r
-  Add a Deferred Procedure Call to the end of the DPC queue.\r
-\r
-  @param[in]  DpcTpl           The EFI_TPL that the DPC should be invoked.\r
-  @param[in]  DpcProcedure     Pointer to the DPC's function.\r
-  @param[in]  DpcContext       Pointer to the DPC's context.  Passed to DpcProcedure\r
-                               when DpcProcedure is invoked.\r
-\r
-  @retval  EFI_SUCCESS              The DPC was queued.\r
-  @retval  EFI_INVALID_PARAMETER    DpcTpl is not a valid EFI_TPL, or DpcProcedure\r
-                                    is NULL.\r
-  @retval  EFI_OUT_OF_RESOURCES     There are not enough resources available to\r
-                                    add the DPC to the queue.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-NetLibQueueDpc (\r
-  IN EFI_TPL            DpcTpl,\r
-  IN EFI_DPC_PROCEDURE  DpcProcedure,\r
-  IN VOID               *DpcContext    OPTIONAL\r
-  )\r
-{\r
-  return mDpc->QueueDpc (mDpc, DpcTpl, DpcProcedure, DpcContext);\r
-}\r
-\r
-/**\r
-  Dispatch the queue of DPCs. ALL DPCs that have been queued with a DpcTpl\r
-  value greater than or equal to the current TPL are invoked in the order that\r
-  they were queued.  DPCs with higher DpcTpl values are invoked before DPCs with\r
-  lower DpcTpl values.\r
-\r
-  @retval  EFI_SUCCESS              One or more DPCs were invoked.\r
-  @retval  EFI_NOT_FOUND            No DPCs were invoked.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-NetLibDispatchDpc (\r
-  VOID\r
-  )\r
-{\r
-  return mDpc->DispatchDpc(mDpc);\r
-}\r
-\r
-/**\r
-  The constructor function caches the pointer to DPC protocol.\r
-\r
-  The constructor function locates DPC protocol from protocol database.\r
-  It will ASSERT() if that operation fails and it will always return EFI_SUCCESS.\r
-\r
-  @param[in]  ImageHandle   The firmware allocated handle for the EFI image.\r
-  @param[in]  SystemTable   A pointer to the EFI System Table.\r
-\r
-  @retval EFI_SUCCESS   The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-NetLibConstructor (\r
-  IN EFI_HANDLE                ImageHandle,\r
-  IN EFI_SYSTEM_TABLE          *SystemTable\r
-  )\r
-{\r
-  EFI_STATUS  Status;\r
-\r
-  Status = gBS->LocateProtocol (&gEfiDpcProtocolGuid, NULL, (VOID**) &mDpc);\r
-  ASSERT_EFI_ERROR (Status);\r
-  ASSERT (mDpc != NULL);\r
-\r
-  return Status;\r
-}\r

diff --git a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
index 2f2b2d095fdd54752dd30186a37e9bb3d6985b9d..05d68d70e0eef2d2740947fff6a65611590b9630 100644 (file)
--- a/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
+++ b/MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
@@ -21,8 +21,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = NetLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r
 \r
   VERSION_STRING                 = 1.0\r
   LIBRARY_CLASS                  = NetLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER\r
 \r

-  CONSTRUCTOR                    = NetLibConstructor\r
-\r

 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r
 #\r
 # The following information is for reference only and not required by the build tools.\r
 #\r


@@ -52,15 +50,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   PrintLib\r
 \r
 [Guids]  \r
   PrintLib\r
 \r
 [Guids]  \r

-  gEfiNicIp4ConfigVariableGuid                  \r
+  gEfiNicIp4ConfigVariableGuid\r

 \r
 [Protocols]\r
   gEfiSimpleNetworkProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiSimpleNetworkProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED\r

-  gEfiDpcProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r

   gEfiComponentNameProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED\r
   gEfiComponentName2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED\r
   gEfiComponentNameProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED\r
   gEfiComponentName2ProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiHiiConfigRoutingProtocolGuid              # PROTOCOL ALWAYS_CONSUMED\r

-\r
-[Depex]\r
-  gEfiDpcProtocolGuid\r
-  
\ No newline at end of file

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index 3e95393221aa6c5e5b9a3ad3fc0d87296df3aa22..91e211a9bdca379fa36d6719918c08da6fa5616a 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -21,6 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/BaseMemoryLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -96,7 +97,7 @@ UdpIoOnDgramSent (
   //\r
   // Request UdpIoOnDgramSentDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request UdpIoOnDgramSentDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, UdpIoOnDgramSentDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, UdpIoOnDgramSentDpc, Context);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -214,7 +215,7 @@ UdpIoOnDgramRcvd (
   //\r
   // Request UdpIoOnDgramRcvdDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request UdpIoOnDgramRcvdDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, UdpIoOnDgramRcvdDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, UdpIoOnDgramRcvdDpc, Context);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
index 27e1bbd1d30b6c5533de7f9009c57e1e3470bb31..1a6115615d9fddf55ec13c1f56231b9885a41922 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
@@ -45,7 +45,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
   BaseMemoryLib\r
   UefiBootServicesTableLib\r
   MemoryAllocationLib\r
   BaseMemoryLib\r

+  DpcLib\r

 \r
 [Protocols]\r
   gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED\r

-  gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED
\ No newline at end of file
+  gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
index 21ad6e16e4411f86cdf53f8b1d20a56c3a5b394e..a3b2427463b01866c6a15009ca1bb105b7f22c22 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
@@ -52,11 +52,10 @@
   UefiDriverEntryPoint\r
   DebugLib\r
   NetLib\r
   UefiDriverEntryPoint\r
   DebugLib\r
   NetLib\r

-\r
+  DpcLib\r

 \r
 [Protocols]\r
   gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r

-\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
index a3923d95bd8e006d161abb9363370f7887247d9e..9704f2139c6bd7b0a614f9b6a427188a870b9c9b 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.c
@@ -325,7 +325,7 @@ ArpOnFrameRcvd (
   //\r
   // Request ArpOnFrameRcvdDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request ArpOnFrameRcvdDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, ArpOnFrameRcvdDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, ArpOnFrameRcvdDpc, Context);\r

 }\r
 \r
 /**\r
 }\r
 \r
 /**\r


@@ -386,7 +386,7 @@ ArpOnFrameSent (
   //\r
   // Request ArpOnFrameSentDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request ArpOnFrameSentDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, ArpOnFrameSentDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, ArpOnFrameSentDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -812,7 +812,7 @@ ArpAddressResolved (
   //\r
   // Dispatch the DPCs queued by the NotifyFunction of the Context->UserRequestEvent.\r
   //\r
   //\r
   // Dispatch the DPCs queued by the NotifyFunction of the Context->UserRequestEvent.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
   return Count;\r
 }\r
 \r
   return Count;\r
 }\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
index 77873dc6744b30109b4dcb831cb52bd69135d50f..bc9128d33b13a40289139f324d1b51ef97b8c607 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpImpl.h
@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 //\r
 // Ethernet protocol type definitions.\r
 \r
 //\r
 // Ethernet protocol type definitions.\r

diff --git a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
index ac76fcd6324917747c2778b8ad80a39e4f754e59..0f66580bec593f321c3c9a7c53b3d401886d1d9a 100644 (file)
--- a/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
+++ b/MdeModulePkg/Universal/Network/ArpDxe/ArpMain.c
@@ -668,7 +668,7 @@ SIGNAL_USER:
     //\r
     // Dispatch the DPC queued by the NotifyFunction of ResolvedEvent.\r
     //\r
     //\r
     // Dispatch the DPC queued by the NotifyFunction of ResolvedEvent.\r
     //\r

-    NetLibDispatchDpc ();\r
+    DispatchDpc ();\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -737,7 +737,7 @@ ArpCancel (
   // Dispatch the DPCs queued by the NotifyFunction of the events signaled\r
   // by ArpCancleRequest.\r
   //\r
   // Dispatch the DPCs queued by the NotifyFunction of the events signaled\r
   // by ArpCancleRequest.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
   gBS->RestoreTPL (OldTpl);\r
 \r
 \r
   gBS->RestoreTPL (OldTpl);\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
index ed130d9c88400fb9e1cf202b508a758ab2c4b9b5..fa0445e2470dbea9bfb4f5897237a3bf4d6437d9 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.c
@@ -219,7 +219,7 @@ EfiNicIp4ConfigSetInfo (
   //\r
   if (Reconfig && (Instance->ReconfigEvent != NULL)) {\r
     Status = gBS->SignalEvent (Instance->ReconfigEvent);\r
   //\r
   if (Reconfig && (Instance->ReconfigEvent != NULL)) {\r
     Status = gBS->SignalEvent (Instance->ReconfigEvent);\r

-    NetLibDispatchDpc ();\r
+    DispatchDpc ();\r

   }\r
 \r
   return Status;\r
   }\r
 \r
   return Status;\r


@@ -335,7 +335,7 @@ ON_EXIT:
   gBS->SignalEvent (Instance->DoneEvent);\r
   Ip4ConfigCleanDhcp4 (Instance);\r
 \r
   gBS->SignalEvent (Instance->DoneEvent);\r
   Ip4ConfigCleanDhcp4 (Instance);\r
 \r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
   return ;\r
 }\r
 \r
   return ;\r
 }\r


@@ -538,7 +538,7 @@ ON_ERROR:
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
 \r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
   return Status;\r
 }\r
 \r
   return Status;\r
 }\r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
index c685fc7443cd8ddbf5234603290199781623e982..8cc789d2736465b0570991acccc8b288c18ef642 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4Config.h
@@ -37,6 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/HiiLib.h>\r
 #include <Library/PrintLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/HiiLib.h>\r
 #include <Library/PrintLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 #include "NicIp4Variable.h"\r
 \r
 \r
 #include "NicIp4Variable.h"\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
index 8a3aed75d3fbc0adf6fa87c2b18c2b213c397c02..2fe1b3bd9038690083fba2f307f6bb38eadb6eb1 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf
@@ -60,7 +60,7 @@
   NetLib\r
   HiiLib\r
   PrintLib\r
   NetLib\r
   HiiLib\r
   PrintLib\r

-\r
+  DpcLib\r

 \r
 [Protocols]\r
   gEfiDhcp4ServiceBindingProtocolGuid           # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiDhcp4ServiceBindingProtocolGuid           # PROTOCOL ALWAYS_CONSUMED\r


@@ -74,4 +74,3 @@
 [Guids]\r
   gEfiIfrTianoGuid                              ## CONSUMES ## Guid\r
   gEfiNicIp4ConfigVariableGuid                  ## CONSUMES ## Guid\r
 [Guids]\r
   gEfiIfrTianoGuid                              ## CONSUMES ## Guid\r
   gEfiNicIp4ConfigVariableGuid                  ## CONSUMES ## Guid\r

-   
\ No newline at end of file

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
index bd9946dd5fb5a21baf28a79103c3a026f33ec802..121fb17b77764095e7388dd484c77c17f18a6172 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
@@ -70,7 +70,7 @@
   UefiRuntimeServicesTableLib\r
   DebugLib\r
   NetLib\r
   UefiRuntimeServicesTableLib\r
   DebugLib\r
   NetLib\r

-\r
+  DpcLib\r

 \r
 [Protocols]\r
   gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r


@@ -80,4 +80,3 @@
   gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
   gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r

-\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index dd2674d22400e11f05daef17db7aebde7ff872e9..24727b0516aa620928c4d05bb2e8e56fe3bc93fe 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -871,7 +871,7 @@ Ip4OnArpResolved (
   //\r
   // Request Ip4OnArpResolvedDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request Ip4OnArpResolvedDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, Ip4OnArpResolvedDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, Ip4OnArpResolvedDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -924,7 +924,7 @@ Ip4OnFrameSent (
   //\r
   // Request Ip4OnFrameSentDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request Ip4OnFrameSentDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, Ip4OnFrameSentDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, Ip4OnFrameSentDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -1187,7 +1187,7 @@ Ip4OnFrameReceived (
   //\r
   // Request Ip4OnFrameReceivedDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request Ip4OnFrameReceivedDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, Ip4OnFrameReceivedDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, Ip4OnFrameReceivedDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
index 84a39656f6a10e3e92dc4d37edc0e13dec4f8170..714f3d9b822ecb525b972d36b42c471849cc1b62 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.c
@@ -703,7 +703,7 @@ Ip4AutoConfigCallBack (
   //\r
   // Request Ip4AutoConfigCallBackDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request Ip4AutoConfigCallBackDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, Ip4AutoConfigCallBackDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, Ip4AutoConfigCallBackDpc, Context);\r

 }\r
 \r
 \r
 }\r
 \r
 \r


@@ -1780,7 +1780,7 @@ Ip4FreeTxToken (
     //\r
     // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
     //\r
     //\r
     // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
     //\r

-    NetLibDispatchDpc ();\r
+    DispatchDpc ();\r

   }\r
 \r
   gBS->FreePool (Wrap);\r
   }\r
 \r
   gBS->FreePool (Wrap);\r


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

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r


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

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

   if (EFI_ERROR (Status)) {\r
     if ((Token != NULL) && (Status == EFI_ABORTED)) {\r
       return EFI_SUCCESS;\r
   if (EFI_ERROR (Status)) {\r
     if ((Token != NULL) && (Status == EFI_ABORTED)) {\r
       return EFI_SUCCESS;\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Impl.h
index 9de326f47addfc6382bbf7843d2e46a95b379cbe..615e5ae2a8bcda4a2e02d51157bfccd37c060a14 100644 (file)
--- 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>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/NetLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 #include "Ip4Common.h"\r
 #include "Ip4Driver.h"\r
 \r
 #include "Ip4Common.h"\r
 #include "Ip4Driver.h"\r

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 964fb96a79f33bb38f3c5f0238e175cafb3f0e55..b495e75deb88689eb6f6e0268c9ed020216c6546 100644 (file)
--- 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\r
   // which are signaled with received data.\r
   //\r
   // Dispatch the DPCs queued by the NotifyFunction of the rx token's events\r
   // which are signaled with received data.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
 RESTART:\r
   Ip4ReceiveFrame (IpSb->DefaultInterface, NULL, Ip4AccpetFrame, IpSb);\r
 \r
 RESTART:\r
   Ip4ReceiveFrame (IpSb->DefaultInterface, NULL, Ip4AccpetFrame, IpSb);\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
index 3fc7da1920e2421d0e2bad0cd9726d54f61970c6..b0153040617b847e8ff64e5b1dbb6b4b1794d621 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDriver.h
@@ -27,6 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/NetLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/NetLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 #include "ComponentName.h"\r
 \r
 \r
 #include "ComponentName.h"\r
 \r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
index 058a9c45621caafbdc72f4a4378db9ce56d3ae0f..a03592bfb88219a7e61018e9cd7226072708f354 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
@@ -54,10 +54,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   UefiDriverEntryPoint\r
   DebugLib\r
   NetLib\r
   UefiDriverEntryPoint\r
   DebugLib\r
   NetLib\r

-\r
+  DpcLib\r

 \r
 [Protocols]\r
   gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED\r
   gEfiSimpleNetworkProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED\r
   gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiManagedNetworkServiceBindingProtocolGuid  # PROTOCOL ALWAYS_CONSUMED\r
   gEfiSimpleNetworkProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED\r
   gEfiManagedNetworkProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r

-\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
index 57b1f7b5bc98c72dd35fa02aaa6b68a7459a2ffe..0c8196a7689efefd13a9f8b3f8a1c835020185f2 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpIo.c
@@ -282,7 +282,7 @@ SIGNAL_TOKEN:
   //\r
   // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
   //\r
   //\r
   // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
   return EFI_SUCCESS;\r
 }\r
 \r
   return EFI_SUCCESS;\r
 }\r


@@ -1064,5 +1064,5 @@ MnpSystemPoll (
   //\r
   // Dispatch the DPC queued by the NotifyFunction of rx token's events.\r
   //\r
   //\r
   // Dispatch the DPC queued by the NotifyFunction of rx token's events.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 }\r
 }\r

diff --git a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
index f93ee6ab77e80ad8e9720ef83f75e7d6057d661b..79ea4789144d40faa2373504d01ccc9a53a21b49 100644 (file)
--- a/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
+++ b/MdeModulePkg/Universal/Network/MnpDxe/MnpMain.c
@@ -632,7 +632,7 @@ MnpReceive (
     //\r
     // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
     //\r
     //\r
     // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
     //\r

-    NetLibDispatchDpc ();\r
+    DispatchDpc ();\r

   }\r
 \r
 ON_EXIT:\r
   }\r
 \r
 ON_EXIT:\r


@@ -709,7 +709,7 @@ MnpCancel (
   //\r
   // Dispatch the DPC queued by the NotifyFunction of the cancled token's events.\r
   //\r
   //\r
   // Dispatch the DPC queued by the NotifyFunction of the cancled token's events.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r


@@ -774,7 +774,7 @@ MnpPoll (
   //\r
   // Dispatch the DPC queued by the NotifyFunction of rx token's events.\r
   //\r
   //\r
   // Dispatch the DPC queued by the NotifyFunction of rx token's events.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r
 \r
 ON_EXIT:\r
   gBS->RestoreTPL (OldTpl);\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
index 601db1548ae597e741e640e7477637a384f57904..a5576a5aaddadae1effd0597a7578f8e33ec558a 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Socket.h
@@ -29,6 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/UefiLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 #define SOCK_SND_BUF        0\r
 #define SOCK_RCV_BUF        1\r
 \r
 #define SOCK_SND_BUF        0\r
 #define SOCK_RCV_BUF        1\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
index 3b9880d38ded8679aaa5f523de4d4d862566718a..cdb35dc2ff2bc9fdc1996b4687fe3c83727ef000 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
@@ -70,10 +70,10 @@
   NetLib\r
   IpIoLib\r
   DevicePathLib\r
   NetLib\r
   IpIoLib\r
   DevicePathLib\r

+  DpcLib\r

 \r
 [Protocols]\r
   gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
   gEfiTcp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED\r
   gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiTcp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
   gEfiTcp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED\r
   gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiTcp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED\r

-\r

diff --git a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
index 2d2c27614d3d0d6d0a9a71f785195b5cc7e4f3c7..91e763c48646c49573099dd71298b951e5d67868 100644 (file)
--- a/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
+++ b/MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Timer.c
@@ -577,6 +577,6 @@ TcpTicking (
   IN VOID      *Context\r
   )\r
 {\r
   IN VOID      *Context\r
   )\r
 {\r

-  NetLibQueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);\r

 }\r
 \r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
index c39ac1350b7cfa55b34270d0234b4e010885cee7..d1c06f3bf11f377f2264f86b8becacee505afcec 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
@@ -56,11 +56,10 @@
   DebugLib\r
   IpIoLib\r
   NetLib\r
   DebugLib\r
   IpIoLib\r
   NetLib\r

-\r
+  DpcLib\r

 \r
 [Protocols]\r
   gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
   gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED\r
   gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiIp4ProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
   gEfiUdp4ServiceBindingProtocolGuid            # PROTOCOL ALWAYS_CONSUMED\r
   gEfiIp4ServiceBindingProtocolGuid             # PROTOCOL ALWAYS_CONSUMED\r
   gEfiUdp4ProtocolGuid                          # PROTOCOL ALWAYS_CONSUMED\r

-\r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
index 0f14021e2397407b9ae63f4103f1dd5ac6311f69..292673d88bf5990f5535112a4e007f1c69577948 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.c
@@ -1007,7 +1007,7 @@ Udp4DgramSent (
     //\r
     Token->Status = Status;\r
     gBS->SignalEvent (Token->Event);\r
     //\r
     Token->Status = Status;\r
     gBS->SignalEvent (Token->Event);\r

-    NetLibDispatchDpc ();\r
+    DispatchDpc ();\r

   }\r
 }\r
 \r
   }\r
 }\r
 \r


@@ -1054,7 +1054,7 @@ Udp4DgramRcvd (
   // Dispatch the DPC queued by the NotifyFunction of the rx token's events\r
   // which are signaled with received data.\r
   //\r
   // Dispatch the DPC queued by the NotifyFunction of the rx token's events\r
   // which are signaled with received data.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 }\r
 \r
 \r
 }\r
 \r
 \r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
index 9772b29e2fdae646e699d70d8ed62bea83f7124a..82b21de971cdfeb25556071c42466b817ab294eb 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Impl.h
@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/TimerLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 #include "Udp4Driver.h"\r
 \r
 \r
 #include "Udp4Driver.h"\r
 \r

diff --git a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
index f3ff95463c0aa10575d57c2b5b7f5d899cc5639b..7bb83b06f66a717b54f9b64ef4020705595aec84 100644 (file)
--- a/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
+++ b/MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Main.c
@@ -783,7 +783,7 @@ Udp4Receive (
   //\r
   // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
   //\r
   //\r
   // Dispatch the DPC queued by the NotifyFunction of Token->Event.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
 ON_EXIT:\r
 \r
 \r
 ON_EXIT:\r
 \r


@@ -856,7 +856,7 @@ Udp4Cancel (
   //\r
   // Dispatch the DPC queued by the NotifyFunction of the cancelled token's events.\r
   //\r
   //\r
   // Dispatch the DPC queued by the NotifyFunction of the cancelled token's events.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
   gBS->RestoreTPL (OldTpl);\r
 \r
 \r
   gBS->RestoreTPL (OldTpl);\r
 \r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
index 4a91f1c3d16d7862186fc7864eed07b12dbd8459..3eeacdcc5c8065c51c56213b5a7dee9d9fb03db0 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c
@@ -240,7 +240,7 @@ IcmpErrorListenHandler (
   //\r
   // Request IpIoListenHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r
   //\r
   // Request IpIoListenHandlerDpc as a DPC at TPL_CALLBACK\r
   //\r

-  NetLibQueueDpc (TPL_CALLBACK, IcmpErrorListenHandlerDpc, Context);\r
+  QueueDpc (TPL_CALLBACK, IcmpErrorListenHandlerDpc, Context);\r

 }\r
 \r
 /**                                                                 \r
 }\r
 \r
 /**                                                                 \r


@@ -473,7 +473,7 @@ EfiPxeBcStop (
   // Dispatch the DPCs queued by the NotifyFunction of the canceled rx token's\r
   // events.\r
   //\r
   // Dispatch the DPCs queued by the NotifyFunction of the canceled rx token's\r
   // events.\r
   //\r

-  NetLibDispatchDpc ();\r
+  DispatchDpc ();\r

 \r
   Private->Ip4->Configure (Private->Ip4, NULL);\r
 \r
 \r
   Private->Ip4->Configure (Private->Ip4, NULL);\r
 \r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
index adc205b347f5f35c4ffc9d4130e7b77c15a87e8a..bc039ec730277abea20dd779385b052895bc7a94 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.h
@@ -39,6 +39,7 @@ typedef struct _PXEBC_PRIVATE_DATA  PXEBC_PRIVATE_DATA;
 #include <Library/UefiLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/NetLib.h>\r
 #include <Library/UefiLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/NetLib.h>\r

+#include <Library/DpcLib.h>\r

 \r
 #include "PxeBcDriver.h"\r
 #include "PxeArch.h"\r
 \r
 #include "PxeBcDriver.h"\r
 #include "PxeArch.h"\r

diff --git a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
index b070f161cbb64de6ae353f19a49d8c3046779fe0..7f8acd73d4f16ea1a64e9418d643d89b0163d3c5 100644 (file)
--- a/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
+++ b/MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
@@ -74,13 +74,11 @@
   MemoryAllocationLib\r
   DebugLib\r
   NetLib\r
   MemoryAllocationLib\r
   DebugLib\r
   NetLib\r

-\r
+  DpcLib\r

 \r
 [Guids]\r
   gEfiSmbiosTableGuid                              # ALWAYS_CONSUMED\r
 \r
 \r
 [Guids]\r
   gEfiSmbiosTableGuid                              # ALWAYS_CONSUMED\r
 \r

-\r
-\r

 [Protocols]\r
   gEfiArpServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED\r
 [Protocols]\r
   gEfiArpServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiArpProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED\r


@@ -96,4 +94,3 @@
   gEfiNetworkInterfaceIdentifierProtocolGuid_31    ## SOMETIMES_CONSUMES\r
   gEfiIp4ServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiIp4ProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED\r
   gEfiNetworkInterfaceIdentifierProtocolGuid_31    ## SOMETIMES_CONSUMES\r
   gEfiIp4ServiceBindingProtocolGuid                # PROTOCOL ALWAYS_CONSUMED\r
   gEfiIp4ProtocolGuid                              # PROTOCOL ALWAYS_CONSUMED\r

-\r