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
This commit is contained in:
mdkinney
2009-07-11 22:51:51 +00:00
parent e9880e2539
commit d8d26fb207
33 changed files with 53 additions and 174 deletions

View File

@@ -52,11 +52,10 @@
UefiDriverEntryPoint
DebugLib
NetLib
DpcLib
[Protocols]
gEfiManagedNetworkServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED

View File

@@ -325,7 +325,7 @@ ArpOnFrameRcvd (
//
// Request ArpOnFrameRcvdDpc as a DPC at TPL_CALLBACK
//
NetLibQueueDpc (TPL_CALLBACK, ArpOnFrameRcvdDpc, Context);
QueueDpc (TPL_CALLBACK, ArpOnFrameRcvdDpc, Context);
}
/**
@@ -386,7 +386,7 @@ ArpOnFrameSent (
//
// Request ArpOnFrameSentDpc as a DPC at TPL_CALLBACK
//
NetLibQueueDpc (TPL_CALLBACK, ArpOnFrameSentDpc, Context);
QueueDpc (TPL_CALLBACK, ArpOnFrameSentDpc, Context);
}
@@ -812,7 +812,7 @@ ArpAddressResolved (
//
// Dispatch the DPCs queued by the NotifyFunction of the Context->UserRequestEvent.
//
NetLibDispatchDpc ();
DispatchDpc ();
return Count;
}

View File

@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/BaseLib.h>
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/DpcLib.h>
//
// Ethernet protocol type definitions.

View File

@@ -668,7 +668,7 @@ SIGNAL_USER:
//
// Dispatch the DPC queued by the NotifyFunction of ResolvedEvent.
//
NetLibDispatchDpc ();
DispatchDpc ();
}
return Status;
@@ -737,7 +737,7 @@ ArpCancel (
// Dispatch the DPCs queued by the NotifyFunction of the events signaled
// by ArpCancleRequest.
//
NetLibDispatchDpc ();
DispatchDpc ();
gBS->RestoreTPL (OldTpl);

View File

@@ -219,7 +219,7 @@ EfiNicIp4ConfigSetInfo (
//
if (Reconfig && (Instance->ReconfigEvent != NULL)) {
Status = gBS->SignalEvent (Instance->ReconfigEvent);
NetLibDispatchDpc ();
DispatchDpc ();
}
return Status;
@@ -335,7 +335,7 @@ ON_EXIT:
gBS->SignalEvent (Instance->DoneEvent);
Ip4ConfigCleanDhcp4 (Instance);
NetLibDispatchDpc ();
DispatchDpc ();
return ;
}
@@ -538,7 +538,7 @@ ON_ERROR:
ON_EXIT:
gBS->RestoreTPL (OldTpl);
NetLibDispatchDpc ();
DispatchDpc ();
return Status;
}

View File

@@ -37,6 +37,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/MemoryAllocationLib.h>
#include <Library/HiiLib.h>
#include <Library/PrintLib.h>
#include <Library/DpcLib.h>
#include "NicIp4Variable.h"

View File

@@ -60,7 +60,7 @@
NetLib
HiiLib
PrintLib
DpcLib
[Protocols]
gEfiDhcp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
@@ -74,4 +74,3 @@
[Guids]
gEfiIfrTianoGuid ## CONSUMES ## Guid
gEfiNicIp4ConfigVariableGuid ## CONSUMES ## Guid

View File

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

View File

@@ -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);
}

View File

@@ -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;

View File

@@ -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"

View File

@@ -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);

View File

@@ -27,6 +27,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
#include <Library/NetLib.h>
#include <Library/DpcLib.h>
#include "ComponentName.h"

View File

@@ -54,10 +54,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
UefiDriverEntryPoint
DebugLib
NetLib
DpcLib
[Protocols]
gEfiManagedNetworkServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiSimpleNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiManagedNetworkProtocolGuid # PROTOCOL ALWAYS_CONSUMED

View File

@@ -282,7 +282,7 @@ SIGNAL_TOKEN:
//
// Dispatch the DPC queued by the NotifyFunction of Token->Event.
//
NetLibDispatchDpc ();
DispatchDpc ();
return EFI_SUCCESS;
}
@@ -1064,5 +1064,5 @@ MnpSystemPoll (
//
// Dispatch the DPC queued by the NotifyFunction of rx token's events.
//
NetLibDispatchDpc ();
DispatchDpc ();
}

View File

@@ -632,7 +632,7 @@ MnpReceive (
//
// Dispatch the DPC queued by the NotifyFunction of Token->Event.
//
NetLibDispatchDpc ();
DispatchDpc ();
}
ON_EXIT:
@@ -709,7 +709,7 @@ MnpCancel (
//
// Dispatch the DPC queued by the NotifyFunction of the cancled token's events.
//
NetLibDispatchDpc ();
DispatchDpc ();
ON_EXIT:
gBS->RestoreTPL (OldTpl);
@@ -774,7 +774,7 @@ MnpPoll (
//
// Dispatch the DPC queued by the NotifyFunction of rx token's events.
//
NetLibDispatchDpc ();
DispatchDpc ();
ON_EXIT:
gBS->RestoreTPL (OldTpl);

View File

@@ -29,6 +29,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/UefiLib.h>
#include <Library/DpcLib.h>
#define SOCK_SND_BUF 0
#define SOCK_RCV_BUF 1

View File

@@ -70,10 +70,10 @@
NetLib
IpIoLib
DevicePathLib
DpcLib
[Protocols]
gEfiIp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiTcp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiTcp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED

View File

@@ -577,6 +577,6 @@ TcpTicking (
IN VOID *Context
)
{
NetLibQueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);
QueueDpc (TPL_CALLBACK, TcpTickingDpc, Context);
}

View File

@@ -56,11 +56,10 @@
DebugLib
IpIoLib
NetLib
DpcLib
[Protocols]
gEfiIp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiUdp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED

View File

@@ -1007,7 +1007,7 @@ Udp4DgramSent (
//
Token->Status = Status;
gBS->SignalEvent (Token->Event);
NetLibDispatchDpc ();
DispatchDpc ();
}
}
@@ -1054,7 +1054,7 @@ Udp4DgramRcvd (
// Dispatch the DPC queued by the NotifyFunction of the rx token's events
// which are signaled with received data.
//
NetLibDispatchDpc ();
DispatchDpc ();
}

View File

@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Library/BaseMemoryLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Library/TimerLib.h>
#include <Library/DpcLib.h>
#include "Udp4Driver.h"

View File

@@ -783,7 +783,7 @@ Udp4Receive (
//
// Dispatch the DPC queued by the NotifyFunction of Token->Event.
//
NetLibDispatchDpc ();
DispatchDpc ();
ON_EXIT:
@@ -856,7 +856,7 @@ Udp4Cancel (
//
// Dispatch the DPC queued by the NotifyFunction of the cancelled token's events.
//
NetLibDispatchDpc ();
DispatchDpc ();
gBS->RestoreTPL (OldTpl);

View File

@@ -240,7 +240,7 @@ IcmpErrorListenHandler (
//
// Request IpIoListenHandlerDpc as a DPC at TPL_CALLBACK
//
NetLibQueueDpc (TPL_CALLBACK, IcmpErrorListenHandlerDpc, Context);
QueueDpc (TPL_CALLBACK, IcmpErrorListenHandlerDpc, Context);
}
/**
@@ -473,7 +473,7 @@ EfiPxeBcStop (
// Dispatch the DPCs queued by the NotifyFunction of the canceled rx token's
// events.
//
NetLibDispatchDpc ();
DispatchDpc ();
Private->Ip4->Configure (Private->Ip4, NULL);

View File

@@ -39,6 +39,7 @@ typedef struct _PXEBC_PRIVATE_DATA PXEBC_PRIVATE_DATA;
#include <Library/UefiLib.h>
#include <Library/BaseLib.h>
#include <Library/NetLib.h>
#include <Library/DpcLib.h>
#include "PxeBcDriver.h"
#include "PxeArch.h"

View File

@@ -74,13 +74,11 @@
MemoryAllocationLib
DebugLib
NetLib
DpcLib
[Guids]
gEfiSmbiosTableGuid # ALWAYS_CONSUMED
[Protocols]
gEfiArpServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiArpProtocolGuid # PROTOCOL ALWAYS_CONSUMED
@@ -96,4 +94,3 @@
gEfiNetworkInterfaceIdentifierProtocolGuid_31 ## SOMETIMES_CONSUMES
gEfiIp4ServiceBindingProtocolGuid # PROTOCOL ALWAYS_CONSUMED
gEfiIp4ProtocolGuid # PROTOCOL ALWAYS_CONSUMED