Change DT_ prefix to ESL_ prefix to eliminate SourceInsight conflict with DT_* constants defined in Include\sys\dirent.h.

Add ESL_IO_MGMT structure and a few port references.

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

10 files changed, 650 insertions, 614 deletions

diff --git a/StdLib/EfiSocketLib/DxeSupport.c b/StdLib/EfiSocketLib/DxeSupport.c
index 73aea04..89181a9 100644
--- a/StdLib/EfiSocketLib/DxeSupport.c
+++ b/StdLib/EfiSocketLib/DxeSupport.c
@@ -43,7 +43,7 @@ EslDxeCreateChild (
   IN OUT EFI_HANDLE * pChildHandle

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -90,9 +90,9 @@ EslDxeDestroyChild (
   IN EFI_HANDLE ChildHandle

   )

 {

-  DT_LAYER * pLayer;

-  DT_SOCKET * pSocket;

-  DT_SOCKET * pSocketPrevious;

+  ESL_LAYER * pLayer;

+  ESL_SOCKET * pSocket;

+  ESL_SOCKET * pSocketPrevious;

   EFI_SOCKET_PROTOCOL * pSocketProtocol;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

diff --git a/StdLib/EfiSocketLib/Ip4.c b/StdLib/EfiSocketLib/Ip4.c
index e42a8e1..712ecb6 100644
--- a/StdLib/EfiSocketLib/Ip4.c
+++ b/StdLib/EfiSocketLib/Ip4.c
@@ -14,7 +14,7 @@
 

 #include "Socket.h"

 

-CONST DT_PROTOCOL_API cEslIp4Api = {

+CONST ESL_PROTOCOL_API cEslIp4Api = {

   IPPROTO_IP,

   NULL,   //  Accept

   EslIpBind4,

@@ -33,33 +33,33 @@ CONST DT_PROTOCOL_API cEslIp4Api = {
 

 

 /**

-  Allocate and initialize a DT_PORT structure.

+  Allocate and initialize a ESL_PORT structure.

 

   @param [in] pSocket     Address of the socket structure.

-  @param [in] pService    Address of the DT_SERVICE structure.

+  @param [in] pService    Address of the ESL_SERVICE structure.

   @param [in] ChildHandle Ip4 child handle

   @param [in] pIpAddress  Buffer containing IP4 network address of the local host

   @param [in] DebugFlags  Flags for debug messages

-  @param [out] ppPort     Buffer to receive new DT_PORT structure address

+  @param [out] ppPort     Buffer to receive new ESL_PORT structure address

 

   @retval EFI_SUCCESS - Socket successfully created

 

  **/

 EFI_STATUS

 EslIpPortAllocate4 (

-  IN DT_SOCKET * pSocket,

-  IN DT_SERVICE * pService,

+  IN ESL_SOCKET * pSocket,

+  IN ESL_SERVICE * pService,

   IN EFI_HANDLE ChildHandle,

   IN CONST UINT8 * pIpAddress,

   IN UINTN DebugFlags,

-  OUT DT_PORT ** ppPort

+  OUT ESL_PORT ** ppPort

   )

 {

   UINTN LengthInBytes;

   EFI_IP4_CONFIG_DATA * pConfig;

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -275,7 +275,7 @@ EslIpPortAllocate4 (
  **/

 EFI_STATUS

 EslIpBind4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   )

@@ -283,9 +283,9 @@ EslIpBind4 (
   EFI_HANDLE ChildHandle;

   CONST struct sockaddr_in * pIp4Address;

   EFI_SERVICE_BINDING_PROTOCOL * pIp4Service;

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_SERVICE * pService;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_SERVICE * pService;

   EFI_STATUS Status;

   EFI_STATUS TempStatus;

   

@@ -420,15 +420,15 @@ EslIpBind4 (
  **/

 EFI_STATUS

 EslIpConnect4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   )

 {

   struct sockaddr_in LocalAddress;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -522,15 +522,15 @@ EslIpConnect4 (
 **/

 EFI_STATUS

 EslIpGetLocalAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   )

 {

   socklen_t LengthInBytes;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pLocalAddress;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -597,15 +597,15 @@ EslIpGetLocalAddress4 (
 **/

 EFI_STATUS

 EslIpGetRemoteAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   )

 {

   socklen_t LengthInBytes;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -663,7 +663,7 @@ EslIpGetRemoteAddress4 (
   This routine initializes the IP4 service after its service binding

   protocol was located on a controller.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

   @retval EFI_SUCCESS         The service was properly initialized

   @retval other               A failure occurred during the service initialization

@@ -672,10 +672,10 @@ EslIpGetRemoteAddress4 (
 EFI_STATUS

 EFIAPI

 EslIpInitialize4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   )

 {

-  DT_LAYER * pLayer;

+  ESL_LAYER * pLayer;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -710,7 +710,7 @@ EslIpInitialize4 (
 

   Retrieve the protocol options one at a time by name.

 

-  @param [in] pSocket           Address of a DT_SOCKET structure

+  @param [in] pSocket           Address of a ESL_SOCKET structure

   @param [in] level             Option protocol level

   @param [in] OptionName        Name of the option

   @param [out] ppOptionData     Buffer to receive address of option value

@@ -721,7 +721,7 @@ EslIpInitialize4 (
  **/

 EFI_STATUS

 EslIpOptionGet4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int level,

   IN int OptionName,

   OUT CONST void ** __restrict ppOptionData,

@@ -780,7 +780,7 @@ EslIpOptionGet4 (
 

   Adjust the protocol options one at a time by name.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   @param [in] level           Option protocol level

   @param [in] OptionName      Name of the option

   @param [in] pOptionValue    Buffer containing the option value

@@ -791,7 +791,7 @@ EslIpOptionGet4 (
  **/

 EFI_STATUS

 EslIpOptionSet4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int level,

   IN int OptionName,

   IN CONST void * pOptionValue,

@@ -901,17 +901,17 @@ EslIpOptionSet4 (
 **/

 EFI_STATUS

 EslIpPortClose4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   UINTN DebugFlags;

-  DT_LAYER * pLayer;

-  DT_PACKET * pPacket;

-  DT_PORT * pPreviousPort;

-  DT_SERVICE * pService;

-  DT_SOCKET * pSocket;

+  ESL_LAYER * pLayer;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPreviousPort;

+  ESL_SERVICE * pService;

+  ESL_SOCKET * pSocket;

   EFI_SERVICE_BINDING_PROTOCOL * pIp4Service;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -1130,12 +1130,12 @@ EslIpPortClose4 (
 **/

 EFI_STATUS

 EslIpPortCloseRxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   PORT_STATE PortState;

-  DT_SOCKET * pSocket;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_SOCKET * pSocket;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -1212,12 +1212,12 @@ EslIpPortCloseRxDone4 (
 **/

 EFI_STATUS

 EslIpPortCloseStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN BOOLEAN bCloseNow,

   IN UINTN DebugFlags

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -1274,12 +1274,12 @@ EslIpPortCloseStart4 (
 **/

 EFI_STATUS

 EslIpPortCloseTxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_IP4_PROTOCOL * pIp4Protocol;

   EFI_STATUS Status;

 

@@ -1422,7 +1422,7 @@ EslIpPortCloseTxDone4 (
   and copies the data from the IP4 driver's buffer into the

   application's buffer.  The IP4 driver's buffer is then returned.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -1441,7 +1441,7 @@ EslIpPortCloseTxDone4 (
 **/

 EFI_STATUS

 EslIpReceive4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN INT32 Flags,

   IN size_t BufferLength,

   IN UINT8 * pBuffer,

@@ -1458,11 +1458,11 @@ EslIpReceive4 (
   in_addr_t IpAddress;

   size_t LengthInBytes;

   UINT8 * pData;

-  DT_PACKET * pPacket;

-  DT_PORT * pPort;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

   EFI_IP4_RECEIVE_DATA * pRxData;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_IP4_CONTEXT * pIp4;

   struct sockaddr_in RemoteAddress;

   EFI_STATUS Status;

 

@@ -1716,19 +1716,19 @@ EslIpReceive4 (
 /**

   Cancel the receive operations

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The cancel was successful

 

  **/

 EFI_STATUS

 EslIpRxCancel4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

-  DT_PACKET * pPacket;

-  DT_PORT * pPort;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPort;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_IP4_PROTOCOL * pIp4Protocol;

   EFI_STATUS Status;

 

@@ -1783,21 +1783,21 @@ EslIpRxCancel4 (
 

   @param [in] Event     The receive completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslIpRxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   size_t LengthInBytes;

-  DT_PACKET * pPacket;

-  DT_PACKET * pPrevious;

+  ESL_PACKET * pPacket;

+  ESL_PACKET * pPrevious;

   EFI_IP4_RECEIVE_DATA * pRxData;

-  DT_SOCKET * pSocket;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_SOCKET * pSocket;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -1922,17 +1922,17 @@ EslIpRxComplete4 (
 /**

   Start a receive operation

 

-  @param [in] pPort       Address of the DT_PORT structure.

+  @param [in] pPort       Address of the ESL_PORT structure.

 

  **/

 VOID

 EslIpRxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_IP4_PROTOCOL * pIp4Protocol;

   EFI_STATUS Status;

 

@@ -2034,18 +2034,18 @@ EslIpRxStart4 (
 

   This routine undoes the work performed by ::IpInitialize4.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

 **/

 VOID

 EFIAPI

 EslIpShutdown4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   )

 {

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_SERVICE * pPreviousService;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_SERVICE * pPreviousService;

 

   DBG_ENTER ( );

 

@@ -2104,7 +2104,7 @@ EslIpShutdown4 (
   Determine if the sockedt is configured.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The port is connected

   @retval EFI_NOT_STARTED - The port is not connected

@@ -2112,12 +2112,12 @@ EslIpShutdown4 (
  **/

  EFI_STATUS

  EslIpSocketIsConfigured4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

-  DT_PORT * pPort;

-  DT_PORT * pNextPort;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_PORT * pPort;

+  ESL_PORT * pNextPort;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_IP4_PROTOCOL * pIp4Protocol;

   EFI_STATUS Status;

   struct sockaddr_in LocalAddress;

@@ -2281,7 +2281,7 @@ EslIpShutdown4 (
   during the close operation.  Only buffering errors are returned

   during the current transmission attempt.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -2300,7 +2300,7 @@ EslIpShutdown4 (
 **/

 EFI_STATUS

 EslIpTxBuffer4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int Flags,

   IN size_t BufferLength,

   IN CONST UINT8 * pBuffer,

@@ -2309,15 +2309,15 @@ EslIpTxBuffer4 (
   IN socklen_t AddressLength

   )

 {

-  DT_PACKET * pPacket;

-  DT_PACKET * pPreviousPacket;

-  DT_PACKET ** ppPacket;

-  DT_PORT * pPort;

+  ESL_PACKET * pPacket;

+  ESL_PACKET * pPreviousPacket;

+  ESL_PACKET ** ppPacket;

+  ESL_PORT * pPort;

   const struct sockaddr_in * pRemoteAddress;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_IP4_COMPLETION_TOKEN * pToken;

   size_t * pTxBytes;

-  DT_IP4_TX_DATA * pTxData;

+  ESL_IP4_TX_DATA * pTxData;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -2507,22 +2507,22 @@ EslIpTxBuffer4 (
 

   @param [in] Event     The normal transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslIpTxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   UINT32 LengthInBytes;

-  DT_PACKET * pCurrentPacket;

-  DT_PACKET * pNextPacket;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_IP4_TX_DATA * pTxData;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_PACKET * pCurrentPacket;

+  ESL_PACKET * pNextPacket;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_IP4_TX_DATA * pTxData;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -2610,18 +2610,18 @@ EslIpTxComplete4 (
 /**

   Transmit data using a network connection.

 

-  @param [in] pPort           Address of a DT_PORT structure

+  @param [in] pPort           Address of a ESL_PORT structure

 

  **/

 VOID

 EslIpTxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

-  DT_PACKET * pNextPacket;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_IP4_CONTEXT * pIp4;

+  ESL_PACKET * pNextPacket;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_IP4_CONTEXT * pIp4;

   EFI_IP4_PROTOCOL * pIp4Protocol;

   EFI_STATUS Status;

 

diff --git a/StdLib/EfiSocketLib/Service.c b/StdLib/EfiSocketLib/Service.c
index 5e6b5f3..90ebdf2 100644
--- a/StdLib/EfiSocketLib/Service.c
+++ b/StdLib/EfiSocketLib/Service.c
@@ -19,10 +19,10 @@
   Connect to the network service bindings

 

   Walk the network service protocols on the controller handle and

-  locate any that are not in use.  Create ::DT_SERVICE structures to

+  locate any that are not in use.  Create ::ESL_SERVICE structures to

   manage the network layer interfaces for the socket driver.  Tag

   each of the network interfaces that are being used.  Finally, this

-  routine calls DT_SOCKET_BINDING::pfnInitialize to prepare the network

+  routine calls ESL_SOCKET_BINDING::pfnInitialize to prepare the network

   interface for use by the socket layer.

 

   @param [in] BindingHandle    Handle for protocol binding.

@@ -41,11 +41,11 @@ EslServiceConnect (
 {

   BOOLEAN bInUse;

   UINTN LengthInBytes;

-  CONST DT_SOCKET_BINDING * pEnd;

+  CONST ESL_SOCKET_BINDING * pEnd;

   VOID * pJunk;

   VOID * pInterface;

-  DT_SERVICE * pService;

-  CONST DT_SOCKET_BINDING * pSocketBinding;

+  ESL_SERVICE * pService;

+  CONST ESL_SOCKET_BINDING * pSocketBinding;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -256,8 +256,8 @@ EslServiceConnect (
 /**

   Shutdown the connections to the network layer by locating the

   tags on the network interfaces established by ::EslServiceConnect.

-  This routine calls DT_SOCKET_BINDING::pfnShutdown to shutdown the any

-  activity on the network interface and then free the ::DT_SERVICE

+  This routine calls ESL_SOCKET_BINDING::pfnShutdown to shutdown the any

+  activity on the network interface and then free the ::ESL_SERVICE

   structures.

 

   @param [in] BindingHandle    Handle for protocol binding.

@@ -275,9 +275,9 @@ EslServiceDisconnect (
   IN  EFI_HANDLE Controller

   )

 {

-  CONST DT_SOCKET_BINDING * pEnd;

-  DT_SERVICE * pService;

-  CONST DT_SOCKET_BINDING * pSocketBinding;

+  CONST ESL_SOCKET_BINDING * pEnd;

+  ESL_SERVICE * pService;

+  CONST ESL_SOCKET_BINDING * pSocketBinding;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

   

@@ -402,7 +402,7 @@ EslServiceLoad (
   IN EFI_HANDLE ImageHandle

   )

 {

-  DT_LAYER * pLayer;

+  ESL_LAYER * pLayer;

 

   //

   //  Save the image handle

@@ -429,7 +429,7 @@ EslServiceUnload (
   VOID

   )

 {

-  DT_LAYER * pLayer;

+  ESL_LAYER * pLayer;

 

   //

   //  Undo the work by ServiceLoad

diff --git a/StdLib/EfiSocketLib/Socket.c b/StdLib/EfiSocketLib/Socket.c
index 85a5146..3bf34ff 100644
--- a/StdLib/EfiSocketLib/Socket.c
+++ b/StdLib/EfiSocketLib/Socket.c
@@ -24,22 +24,28 @@
 

   List the network stack connection points for the socket driver.

 **/

-CONST DT_SOCKET_BINDING cEslSocketBinding[] = {

+CONST ESL_SOCKET_BINDING cEslSocketBinding[] = {

   { L"Ip4",

     &gEfiIp4ServiceBindingProtocolGuid,

     &mEslIp4ServiceGuid,

     EslIpInitialize4,

-    EslIpShutdown4 },

+    EslIpShutdown4,

+    0,

+    0 },

   { L"Tcp4",

     &gEfiTcp4ServiceBindingProtocolGuid,

     &mEslTcp4ServiceGuid,

     EslTcpInitialize4,

-    EslTcpShutdown4 },

+    EslTcpShutdown4,

+    4,

+    4 },

   { L"Udp4",

     &gEfiUdp4ServiceBindingProtocolGuid,

     &mEslUdp4ServiceGuid,

     EslUdpInitialize4,

-    EslUdpShutdown4 }

+    EslUdpShutdown4,

+    0,

+    0 }

 };

 

 CONST UINTN cEslSocketBindingEntries = DIM ( cEslSocketBinding );

@@ -47,7 +53,7 @@ CONST UINTN cEslSocketBindingEntries = DIM ( cEslSocketBinding );
 /**

   APIs to support the various socket types

 **/

-CONST DT_PROTOCOL_API * cEslAfInetApi[] = {

+CONST ESL_PROTOCOL_API * cEslAfInetApi[] = {

   NULL,             //  0

   &cEslTcp4Api,     //  SOCK_STREAM

   &cEslUdp4Api,     //  SOCK_DGRAM

@@ -58,7 +64,7 @@ CONST DT_PROTOCOL_API * cEslAfInetApi[] = {
 

 CONST int cEslAfInetApiSize = DIM ( cEslAfInetApi );

 

-CONST DT_PROTOCOL_API * cEslAfInet6Api[] = {

+CONST ESL_PROTOCOL_API * cEslAfInet6Api[] = {

   NULL,             //  0

   NULL,             //  SOCK_STREAM

   NULL,             //  SOCK_DGRAM

@@ -69,7 +75,7 @@ CONST DT_PROTOCOL_API * cEslAfInet6Api[] = {
 

 CONST int cEslAfInet6ApiSize = DIM ( cEslAfInet6Api );

 

-DT_LAYER mEslLayer;

+ESL_LAYER mEslLayer;

 

 

 /**

@@ -104,10 +110,10 @@ EslSocket (
   IN int * pErrno

   )

 {

-  CONST DT_PROTOCOL_API * pApi;

-  CONST DT_PROTOCOL_API ** ppApiArray;

+  CONST ESL_PROTOCOL_API * pApi;

+  CONST ESL_PROTOCOL_API ** ppApiArray;

   int ApiArraySize;

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   int errno;

 

@@ -267,8 +273,8 @@ EslSocketAccept (
   IN int * pErrno

   )

 {

-  DT_SOCKET * pNewSocket;

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pNewSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -421,9 +427,9 @@ EslSocketAccept (
 

 

 /**

-  Allocate and initialize a DT_SOCKET structure.

+  Allocate and initialize a ESL_SOCKET structure.

   

-  This support function allocates a ::DT_SOCKET structure

+  This support function allocates a ::ESL_SOCKET structure

   and installs a protocol on ChildHandle.  If pChildHandle is a

   pointer to NULL, then a new handle is created and returned in

   pChildHandle.  If pChildHandle is not a pointer to NULL, then

@@ -435,7 +441,7 @@ EslSocketAccept (
                                 then the protocol is added to the existing UEFI

                                 handle.

   @param [in] DebugFlags        Flags for debug messages

-  @param [in, out] ppSocket     The buffer to receive the ::DT_SOCKET structure address.

+  @param [in, out] ppSocket     The buffer to receive the ::ESL_SOCKET structure address.

 

   @retval EFI_SUCCESS           The protocol was added to ChildHandle.

   @retval EFI_INVALID_PARAMETER ChildHandle is NULL.

@@ -449,12 +455,12 @@ EFIAPI
 EslSocketAllocate (

   IN OUT EFI_HANDLE * pChildHandle,

   IN     UINTN DebugFlags,

-  IN OUT DT_SOCKET ** ppSocket

+  IN OUT ESL_SOCKET ** ppSocket

   )

 {

   UINTN LengthInBytes;

-  DT_LAYER * pLayer;

-  DT_SOCKET * pSocket;

+  ESL_LAYER * pLayer;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -606,7 +612,7 @@ EslSocketBind (
   OUT int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -733,9 +739,9 @@ EslSocketClosePoll (
   )

 {

   int errno;

-  DT_LAYER * pLayer;

-  DT_SOCKET * pNextSocket;

-  DT_SOCKET * pSocket;

+  ESL_LAYER * pLayer;

+  ESL_SOCKET * pNextSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -878,9 +884,9 @@ EslSocketCloseStart (
   )

 {

   int errno;

-  DT_PORT * pNextPort;

-  DT_PORT * pPort;

-  DT_SOCKET * pSocket;

+  ESL_PORT * pNextPort;

+  ESL_PORT * pPort;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -992,7 +998,7 @@ EslSocketConnect (
   IN int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

   

@@ -1176,7 +1182,7 @@ EslSocketGetLocalAddress (
   IN int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

   

@@ -1290,7 +1296,7 @@ EslSocketGetPeerAddress (
   IN int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

   

@@ -1391,14 +1397,14 @@ EslSocketGetPeerAddress (
     <li>::EslSocketTransmit</li>

   </ul>

 

-  @param [in] pSocket       The ::DT_SOCKET structure address

+  @param [in] pSocket       The ::ESL_SOCKET structure address

 

   @retval EFI_SUCCESS - The socket is configured

 

 **/

 EFI_STATUS

 EslSocketIsConfigured (

-  DT_SOCKET * pSocket

+  ESL_SOCKET * pSocket

   )

 {

   EFI_STATUS Status;

@@ -1486,7 +1492,7 @@ EslSocketListen (
   OUT int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_STATUS TempStatus;

   EFI_TPL TplPrevious;

@@ -1656,7 +1662,7 @@ EslSocketOptionGet (
   socklen_t LengthInBytes;

   socklen_t MaxBytes;

   UINT8 * pOptionData;

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -1841,7 +1847,7 @@ EslSocketOptionSet (
   int errno;

   socklen_t LengthInBytes;

   UINT8 * pOptionData;

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -1993,7 +1999,7 @@ EslSocketOptionSet (
   This support routine is called by the network specific RxStart

   and TxBuffer routines to get buffer space for the next operation.

 

-  @param [in] ppPacket      Address to receive the ::DT_PACKET structure

+  @param [in] ppPacket      Address to receive the ::ESL_PACKET structure

   @param [in] LengthInBytes Length of the packet structure

   @param [in] DebugFlags    Flags for debug messages

 

@@ -2002,12 +2008,12 @@ EslSocketOptionSet (
  **/

 EFI_STATUS

 EslSocketPacketAllocate (

-  IN DT_PACKET ** ppPacket,

+  IN ESL_PACKET ** ppPacket,

   IN size_t LengthInBytes,

   IN UINTN DebugFlags

   )

 {

-  DT_PACKET * pPacket;

+  ESL_PACKET * pPacket;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -2054,9 +2060,9 @@ EslSocketPacketAllocate (
   This support routine is called by the network specific Close

   and TxComplete routines and during error cases in RxComplete

   and TxBuffer.  Note that the network layers typically place

-  receive packets on the DT_SOCKET::pRxFree list for reuse.

+  receive packets on the ESL_SOCKET::pRxFree list for reuse.

 

-  @param [in] pPacket     Address of the DT_PACKET structure

+  @param [in] pPacket     Address of the ESL_PACKET structure

   @param [in] DebugFlags  Flags for debug messages

 

   @retval EFI_SUCCESS - The packet was allocated successfully

@@ -2064,7 +2070,7 @@ EslSocketPacketAllocate (
  **/

 EFI_STATUS

 EslSocketPacketFree (

-  IN DT_PACKET * pPacket,

+  IN ESL_PACKET * pPacket,

   IN UINTN DebugFlags

   )

 {

@@ -2130,7 +2136,7 @@ EslSocketPoll (
   )

 {

   short DetectedEvents;

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   short ValidEvents;

 

@@ -2300,7 +2306,7 @@ EslSocketReceive (
   IN int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -2430,7 +2436,7 @@ EslSocketShutdown (
   IN int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

   

@@ -2571,7 +2577,7 @@ EslSocketTransmit (
   IN int * pErrno

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

diff --git a/StdLib/EfiSocketLib/Socket.h b/StdLib/EfiSocketLib/Socket.h
index 2b9bec2..bb0bafa 100644
--- a/StdLib/EfiSocketLib/Socket.h
+++ b/StdLib/EfiSocketLib/Socket.h
@@ -38,10 +38,10 @@
 #define RX_PACKET_DATA      16384       ///<  Maximum number of bytes in a RX packet

 #define MAX_UDP_RETRANSMIT  16          ///<  UDP retransmit attempts to handle address not mapped

 

-#define LAYER_SIGNATURE           SIGNATURE_32 ('S','k','t','L')  ///<  DT_LAYER memory signature

-#define SERVICE_SIGNATURE         SIGNATURE_32 ('S','k','t','S')  ///<  DT_SERVICE memory signature

-#define SOCKET_SIGNATURE          SIGNATURE_32 ('S','c','k','t')  ///<  DT_SOCKET memory signature

-#define PORT_SIGNATURE            SIGNATURE_32 ('P','o','r','t')  ///<  DT_PORT memory signature

+#define LAYER_SIGNATURE           SIGNATURE_32 ('S','k','t','L')  ///<  ESL_LAYER memory signature

+#define SERVICE_SIGNATURE         SIGNATURE_32 ('S','k','t','S')  ///<  ESL_SERVICE memory signature

+#define SOCKET_SIGNATURE          SIGNATURE_32 ('S','c','k','t')  ///<  ESL_SOCKET memory signature

+#define PORT_SIGNATURE            SIGNATURE_32 ('P','o','r','t')  ///<  ESL_PORT memory signature

 

 typedef enum

 {

@@ -89,21 +89,21 @@ typedef enum
 //  Data Types

 //------------------------------------------------------------------------------

 

-typedef struct _DT_PACKET DT_PACKET;    ///<  Forward declaration

-typedef struct _DT_PORT DT_PORT;        ///<  Forward declaration

-typedef struct _DT_SOCKET DT_SOCKET;    ///<  Forward declaration

+typedef struct _ESL_PACKET ESL_PACKET;  ///<  Forward declaration

+typedef struct _ESL_PORT ESL_PORT;      ///<  Forward declaration

+typedef struct _ESL_SOCKET ESL_SOCKET;  ///<  Forward declaration

 

 typedef struct

 {

   EFI_IP4_RECEIVE_DATA * pRxData;       ///<  Receive operation description

-} DT_IP4_RX_DATA;

+} ESL_IP4_RX_DATA;

 

 typedef struct

 {

   EFI_IP4_OVERRIDE_DATA Override;       ///<  Override data

   EFI_IP4_TRANSMIT_DATA TxData;         ///<  Transmit operation description

   UINT8 Buffer[ 1 ];                    ///<  Data buffer

-} DT_IP4_TX_DATA;

+} ESL_IP4_TX_DATA;

 

 typedef struct

 {

@@ -111,19 +111,19 @@ typedef struct
   size_t ValidBytes;                    ///<  Length of valid data in bytes

   UINT8 * pBuffer;                      ///<  Current data pointer

   UINT8 Buffer[ RX_PACKET_DATA ];       ///<  Data buffer

-} DT_TCP4_RX_DATA;

+} ESL_TCP4_RX_DATA;

 

 typedef struct

 {

   EFI_TCP4_TRANSMIT_DATA TxData;        ///<  Transmit operation description

   UINT8 Buffer[ 1 ];                    ///<  Data buffer

-} DT_TCP4_TX_DATA;

+} ESL_TCP4_TX_DATA;

 

 typedef struct

 {

   EFI_UDP4_SESSION_DATA Session;        ///<  Remote network address

   EFI_UDP4_RECEIVE_DATA * pRxData;      ///<  Receive operation description

-} DT_UDP4_RX_DATA;

+} ESL_UDP4_RX_DATA;

 

 typedef struct

 {

@@ -131,38 +131,38 @@ typedef struct
   EFI_UDP4_TRANSMIT_DATA TxData;        ///<  Transmit operation description

   UINTN RetransmitCount;                ///<  Retransmit to handle ARP negotiation

   UINT8 Buffer[ 1 ];                    ///<  Data buffer

-} DT_UDP4_TX_DATA;

+} ESL_UDP4_TX_DATA;

 

-typedef struct _DT_PACKET {

-  DT_PACKET * pNext;                    ///<  Next packet in the receive list

+typedef struct _ESL_PACKET {

+  ESL_PACKET * pNext;                   ///<  Next packet in the receive list

   size_t PacketSize;                    ///<  Size of this data structure

   union {

-    DT_IP4_RX_DATA Ip4Rx;               ///<  Receive operation description

-    DT_IP4_TX_DATA Ip4Tx;               ///<  Transmit operation description

-    DT_TCP4_RX_DATA Tcp4Rx;             ///<  Receive operation description

-    DT_TCP4_TX_DATA Tcp4Tx;             ///<  Transmit operation description

-    DT_UDP4_RX_DATA Udp4Rx;             ///<  Receive operation description

-    DT_UDP4_TX_DATA Udp4Tx;             ///<  Transmit operation description

+    ESL_IP4_RX_DATA Ip4Rx;              ///<  Receive operation description

+    ESL_IP4_TX_DATA Ip4Tx;              ///<  Transmit operation description

+    ESL_TCP4_RX_DATA Tcp4Rx;            ///<  Receive operation description

+    ESL_TCP4_TX_DATA Tcp4Tx;            ///<  Transmit operation description

+    ESL_UDP4_RX_DATA Udp4Rx;            ///<  Receive operation description

+    ESL_UDP4_TX_DATA Udp4Tx;            ///<  Transmit operation description

   } Op;

-} GCC_DT_PACKET;

+} GCC_ESL_PACKET;

 

 /**

   Service control structure

 

   The driver uses this structure to manage the network devices.

 **/

-typedef struct _DT_SERVICE {

+typedef struct _ESL_SERVICE {

   UINTN Signature;          ///<  Structure identification

 

   //

   //  Links

   //

-  DT_SERVICE * pNext;       ///<  Next service in the service list

+  ESL_SERVICE * pNext;      ///<  Next service in the service list

 

   //

   //  Service data

   //

-  CONST DT_SOCKET_BINDING * pSocketBinding; ///<  Name and shutdown routine

+  CONST ESL_SOCKET_BINDING * pSocketBinding;  ///<  Name and shutdown routine

   EFI_HANDLE Controller;    ///<  Controller for the service

   VOID * pInterface;        ///<  Network layer service binding interface

 

@@ -170,8 +170,8 @@ typedef struct _DT_SERVICE {
   //  Network data

   //

   NETWORK_TYPE NetworkType; ///<  Type of network service

-  DT_PORT * pPortList;      ///<  List of ports using this service

-}GCC_DT_SERVICE;

+  ESL_PORT * pPortList;     ///<  List of ports using this service

+}GCC_ESL_SERVICE;

 

 /**

   Start the close operation on a TCP4 port.

@@ -184,12 +184,28 @@ typedef struct _DT_SERVICE {
 typedef

 EFI_STATUS

 PFN_PORT_CLOSE_START (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN BOOLEAN bAbort,

   IN UINTN DebugFlags

   );

 

 /**

+  IO management structure

+

+  This structure manages a single operation with the network.

+**/

+typedef struct _ESL_IO_MGMT ESL_IO_MGMT;

+typedef struct _ESL_IO_MGMT {

+  ESL_IO_MGMT * pNext;            ///<  Next TX management structure

+  ESL_PORT * pPort;               ///<  Port structure address

+  ESL_PACKET * pPacket;           ///<  Packet structure address

+  union {

+    EFI_IP4_COMPLETION_TOKEN Ip4; ///<  IP4 transmit token

+    EFI_TCP4_IO_TOKEN Tcp4;       ///<  TCP4 transmit token

+  } Token;

+};

+

+/**

   IP4 context structure

 

   The driver uses this structure to manage the IP4 connections.

@@ -208,14 +224,14 @@ typedef struct {
   //  Receive data management

   //

   EFI_IP4_COMPLETION_TOKEN RxToken; ///<  Receive token

-  DT_PACKET * pReceivePending;      ///<  Receive operation in progress

+  ESL_PACKET * pReceivePending;     ///<  Receive operation in progress

 

   //

   //  Transmit data management

   //

   EFI_IP4_COMPLETION_TOKEN TxToken; ///<  Transmit token

-  DT_PACKET * pTxPacket;            ///<  Transmit in progress

-} DT_IP4_CONTEXT;

+  ESL_PACKET * pTxPacket;           ///<  Transmit in progress

+} ESL_IP4_CONTEXT;

 

 

 /**

@@ -244,17 +260,17 @@ typedef struct {
   //  Receive data management

   //

   EFI_TCP4_IO_TOKEN RxToken;        ///<  Receive token

-  DT_PACKET * pReceivePending;      ///<  Receive operation in progress

+  ESL_PACKET * pReceivePending;     ///<  Receive operation in progress

 

   //

   //  Transmit data management

   //

   EFI_TCP4_IO_TOKEN TxOobToken;     ///<  Urgent data token

-  DT_PACKET * pTxOobPacket;         ///<  Urgent data in progress

+  ESL_PACKET * pTxOobPacket;        ///<  Urgent data in progress

 

   EFI_TCP4_IO_TOKEN TxToken;        ///<  Normal data token

-  DT_PACKET * pTxPacket;            ///<  Normal transmit in progress

-} DT_TCP4_CONTEXT;

+  ESL_PACKET * pTxPacket;           ///<  Normal transmit in progress

+} ESL_TCP4_CONTEXT;

 

 /**

   UDP4 context structure

@@ -274,14 +290,14 @@ typedef struct {
   //  Receive data management

   //

   EFI_UDP4_COMPLETION_TOKEN RxToken;///<  Receive token

-  DT_PACKET * pReceivePending;      ///<  Receive operation in progress

+  ESL_PACKET * pReceivePending;     ///<  Receive operation in progress

 

   //

   //  Transmit data management

   //

   EFI_UDP4_COMPLETION_TOKEN TxToken;///<  Transmit token

-  DT_PACKET * pTxPacket;            ///<  Transmit in progress

-} DT_UDP4_CONTEXT;

+  ESL_PACKET * pTxPacket;           ///<  Transmit in progress

+} ESL_UDP4_CONTEXT;

 

 

 /**

@@ -290,36 +306,48 @@ typedef struct {
   The driver uses this structure to manager the socket's connection

   with the network driver.

 **/

-typedef struct _DT_PORT {

+typedef struct _ESL_PORT {

   UINTN Signature;              ///<  Structure identification

 

   //

   //  List links

   //

-  DT_PORT * pLinkService;       ///<  Link in service port list

-  DT_PORT * pLinkSocket;        ///<  Link in socket port list

+  ESL_PORT * pLinkService;      ///<  Link in service port list

+  ESL_PORT * pLinkSocket;       ///<  Link in socket port list

 

   //

   //  Structures

   //

-  DT_SERVICE * pService;        ///<  Service for this port

-  DT_SOCKET * pSocket;          ///<  Socket for this port

+  ESL_SERVICE * pService;       ///<  Service for this port

+  ESL_SOCKET * pSocket;         ///<  Socket for this port

 //  PFN_CLOSE_PORT pfnClosePort;  ///<  Routine to immediately close the port

   PFN_PORT_CLOSE_START * pfnCloseStart; ///<  Routine to start closing the port

 

   //

-  //  Protocol specific management data

+  //  Port management

   //

   PORT_STATE State;             ///<  State of the port

   UINTN DebugFlags;             ///<  Debug flags used to close the port

   BOOLEAN bCloseNow;            ///<  TRUE = Close the port immediately

-  

+

+  //

+  //  Transmit data management

+  //

+  ESL_IO_MGMT * pTxActive;      ///<  Normal data queue

+  ESL_IO_MGMT * pTxFree;        ///<  Normal free queue

+

+  ESL_IO_MGMT * pTxOobActive;   ///<  Urgent data queue

+  ESL_IO_MGMT * pTxOobFree;     ///<  Urgent free queue

+

+  //

+  //  Protocol specific management data

+  //

   union {

-    DT_IP4_CONTEXT Ip4;         ///<  IPv4 management data

-    DT_TCP4_CONTEXT Tcp4;       ///<  TCPv4 management data

-    DT_UDP4_CONTEXT Udp4;       ///<  UDPv4 management data

+    ESL_IP4_CONTEXT Ip4;        ///<  IPv4 management data

+    ESL_TCP4_CONTEXT Tcp4;      ///<  TCPv4 management data

+    ESL_UDP4_CONTEXT Udp4;      ///<  UDPv4 management data

   } Context;

-}GCC_DT_PORT;

+}GCC_ESL_PORT;

 

 /**

   Accept a network connection.

@@ -340,7 +368,7 @@ typedef struct _DT_PORT {
 typedef

 EFI_STATUS

 (* PFN_API_ACCEPT) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN struct sockaddr * pSockAddr,

   IN OUT socklen_t * pSockAddrLength

   );

@@ -368,7 +396,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_BIND) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -390,7 +418,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_CONNECT_START) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -408,7 +436,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_CONNECT_POLL) (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -427,7 +455,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_GET_LOCAL_ADDR) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -448,7 +476,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_GET_RMT_ADDR) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -457,7 +485,7 @@ EFI_STATUS
   Determine if the socket is configured.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The port is connected

   @retval EFI_NOT_STARTED - The port is not connected

@@ -466,7 +494,7 @@ EFI_STATUS
  typedef

  EFI_STATUS

  (* PFN_API_IS_CONFIGURED) (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -481,7 +509,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_LISTEN) (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -489,7 +517,7 @@ EFI_STATUS
 

   Retrieve the protocol options one at a time by name.

 

-  @param [in] pSocket           Address of a DT_SOCKET structure

+  @param [in] pSocket           Address of a ESL_SOCKET structure

   @param [in] level             Option protocol level

   @param [in] OptionName        Name of the option

   @param [out] ppOptionData     Buffer to receive address of option value

@@ -501,7 +529,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_OPTION_GET) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int level,

   IN int OptionName,

   OUT CONST void ** __restrict ppOptionData,

@@ -513,7 +541,7 @@ EFI_STATUS
 

   Adjust the protocol options one at a time by name.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   @param [in] level           Option protocol level

   @param [in] OptionName      Name of the option

   @param [in] pOptionValue    Buffer containing the option value

@@ -525,7 +553,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_OPTION_SET) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int level,

   IN int OptionName,

   IN CONST void * pOptionValue,

@@ -535,7 +563,7 @@ EFI_STATUS
 /**

   Receive data from a network connection.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @param [in] Flags           Message control flags

   

@@ -555,7 +583,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_RECEIVE) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN INT32 Flags,

   IN size_t BufferLength,

   IN UINT8 * pBuffer,

@@ -567,7 +595,7 @@ EFI_STATUS
 /**

   Cancel the receive operations

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The cancel was successful

 

@@ -575,13 +603,13 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_RX_CANCEL) (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

   Buffer data for transmission over a network connection.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -601,7 +629,7 @@ EFI_STATUS
 typedef

 EFI_STATUS

 (* PFN_API_TRANSMIT) (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int Flags,

   IN size_t BufferLength,

   IN CONST UINT8 * pBuffer,

@@ -630,7 +658,7 @@ typedef struct {
   PFN_API_RECEIVE pfnReceive;             ///<  Attempt to receive some data

   PFN_API_RX_CANCEL pfnRxCancel;          ///<  Cancel a receive operation

   PFN_API_TRANSMIT pfnTransmit;           ///<  Attempt to buffer a packet for transmit

-} DT_PROTOCOL_API;

+} ESL_PROTOCOL_API;

 

 

 /**

@@ -638,19 +666,19 @@ typedef struct {
 

   The driver uses this structure to manage the socket.

 **/

-typedef struct _DT_SOCKET {

+typedef struct _ESL_SOCKET {

   UINTN Signature;          ///<  Structure identification

 

   //

   //  Protocol binding

   //

   EFI_SOCKET_PROTOCOL SocketProtocol; ///<  Socket protocol declaration

-  CONST DT_PROTOCOL_API * pApi;       ///<  API for the protocol

+  CONST ESL_PROTOCOL_API * pApi;      ///<  API for the protocol

 

   //

   //  Socket management

   //

-  DT_SOCKET * pNext;            ///<  Next socket in the list of sockets

+  ESL_SOCKET * pNext;           ///<  Next socket in the list of sockets

   int errno;                    ///<  Error information for this socket

   EFI_STATUS Status;            ///<  Asyncronous error information for this socket

   SOCKET_STATE State;           ///<  Socket state

@@ -686,14 +714,14 @@ typedef struct _DT_SOCKET {
   EFI_STATUS ConnectStatus;     ///<  Connection status

   UINTN MaxFifoDepth;           ///<  Maximum FIFO depth

   UINTN FifoDepth;              ///<  Number of sockets in the FIFO

-  DT_SOCKET * pFifoHead;        ///<  Head of the FIFO

-  DT_SOCKET * pFifoTail;        ///<  Tail of the FIFO

-  DT_SOCKET * pNextConnection;  ///<  Link in the FIFO

+  ESL_SOCKET * pFifoHead;       ///<  Head of the FIFO

+  ESL_SOCKET * pFifoTail;       ///<  Tail of the FIFO

+  ESL_SOCKET * pNextConnection; ///<  Link in the FIFO

 

   //

   //  Network use

   //

-  DT_PORT * pPortList;          ///<  List of ports managed by this socket

+  ESL_PORT * pPortList;         ///<  List of ports managed by this socket

   EFI_EVENT WaitAccept;         ///<  Wait for accept completion

 

   //

@@ -701,23 +729,23 @@ typedef struct _DT_SOCKET {
   //

   UINT32 MaxRxBuf;                  ///<  Maximum size of the receive buffer

   struct timeval RxTimeout;         ///<  Receive timeout

-  DT_PACKET * pRxFree;              ///<  Free packet list

-  DT_PACKET * pRxOobPacketListHead; ///<  Urgent data list head

-  DT_PACKET * pRxOobPacketListTail; ///<  Urgent data list tail

-  DT_PACKET * pRxPacketListHead;    ///<  Normal data list head

-  DT_PACKET * pRxPacketListTail;    ///<  Normal data list tail

+  ESL_PACKET * pRxFree;             ///<  Free packet list

+  ESL_PACKET * pRxOobPacketListHead;///<  Urgent data list head

+  ESL_PACKET * pRxOobPacketListTail;///<  Urgent data list tail

+  ESL_PACKET * pRxPacketListHead;   ///<  Normal data list head

+  ESL_PACKET * pRxPacketListTail;   ///<  Normal data list tail

 

   //

   //  Transmit data management

   //

   UINT32 MaxTxBuf;                  ///<  Maximum size of the transmit buffer

-  DT_PACKET * pTxOobPacketListHead; ///<  Urgent data list head

-  DT_PACKET * pTxOobPacketListTail; ///<  Urgent data list tail

-  DT_PACKET * pTxPacketListHead;    ///<  Normal data list head

-  DT_PACKET * pTxPacketListTail;    ///<  Normal data list tail

-}GCC_DT_SOCKET;

+  ESL_PACKET * pTxOobPacketListHead;///<  Urgent data list head

+  ESL_PACKET * pTxOobPacketListTail;///<  Urgent data list tail

+  ESL_PACKET * pTxPacketListHead;   ///<  Normal data list head

+  ESL_PACKET * pTxPacketListTail;   ///<  Normal data list tail

+}GCC_ESL_SOCKET;

 

-#define SOCKET_FROM_PROTOCOL(a)  CR (a, DT_SOCKET, SocketProtocol, SOCKET_SIGNATURE)  ///< Locate DT_SOCKET from protocol

+#define SOCKET_FROM_PROTOCOL(a)  CR (a, ESL_SOCKET, SocketProtocol, SOCKET_SIGNATURE)  ///< Locate ESL_SOCKET from protocol

 

 /**

   Socket layer control structure

@@ -740,27 +768,27 @@ typedef struct {
   //

   //  Network services

   //

-  DT_SERVICE * pIp4List;        ///<  List of Ip4 services

-  DT_SERVICE * pTcp4List;       ///<  List of Tcp4 services

-  DT_SERVICE * pUdp4List;       ///<  List of Udp4 services

+  ESL_SERVICE * pIp4List;       ///<  List of Ip4 services

+  ESL_SERVICE * pTcp4List;      ///<  List of Tcp4 services

+  ESL_SERVICE * pUdp4List;      ///<  List of Udp4 services

 

   //

   //  Socket management

   //

-  DT_SOCKET * pSocketList;      ///<  List of sockets

-} DT_LAYER;

+  ESL_SOCKET * pSocketList;     ///<  List of sockets

+} ESL_LAYER;

 

-#define LAYER_FROM_SERVICE(a) CR (a, DT_LAYER, ServiceBinding, LAYER_SIGNATURE) ///< Locate DT_LAYER from service binding

+#define LAYER_FROM_SERVICE(a) CR (a, ESL_LAYER, ServiceBinding, LAYER_SIGNATURE) ///< Locate ESL_LAYER from service binding

 

 //------------------------------------------------------------------------------

 // Data

 //------------------------------------------------------------------------------

 

-extern DT_LAYER mEslLayer;

+extern ESL_LAYER mEslLayer;

 

-extern CONST DT_PROTOCOL_API cEslIp4Api;

-extern CONST DT_PROTOCOL_API cEslTcp4Api;

-extern CONST DT_PROTOCOL_API cEslUdp4Api;

+extern CONST ESL_PROTOCOL_API cEslIp4Api;

+extern CONST ESL_PROTOCOL_API cEslTcp4Api;

+extern CONST ESL_PROTOCOL_API cEslUdp4Api;

 

 extern CONST EFI_SERVICE_BINDING_PROTOCOL mEfiServiceBinding;

 

@@ -769,9 +797,9 @@ extern CONST EFI_SERVICE_BINDING_PROTOCOL mEfiServiceBinding;
 //------------------------------------------------------------------------------

 

 /**

-  Allocate and initialize a DT_SOCKET structure.

+  Allocate and initialize a ESL_SOCKET structure.

   

-  The ::SocketAllocate() function allocates a DT_SOCKET structure

+  The ::SocketAllocate() function allocates a ESL_SOCKET structure

   and installs a protocol on ChildHandle.  If pChildHandle is a

   pointer to NULL, then a new handle is created and returned in

   pChildHandle.  If pChildHandle is not a pointer to NULL, then

@@ -783,7 +811,7 @@ extern CONST EFI_SERVICE_BINDING_PROTOCOL mEfiServiceBinding;
                                 then the protocol is added to the existing UEFI

                                 handle.

   @param [in] DebugFlags        Flags for debug messages

-  @param [in, out] ppSocket     The buffer to receive the DT_SOCKET structure address.

+  @param [in, out] ppSocket     The buffer to receive the ESL_SOCKET structure address.

 

   @retval EFI_SUCCESS           The protocol was added to ChildHandle.

   @retval EFI_INVALID_PARAMETER ChildHandle is NULL.

@@ -797,26 +825,26 @@ EFIAPI
 EslSocketAllocate (

   IN OUT EFI_HANDLE * pChildHandle,

   IN     UINTN DebugFlags,

-  IN OUT DT_SOCKET ** ppSocket

+  IN OUT ESL_SOCKET ** ppSocket

   );

 

 /**

   Determine if the socket is configured

 

-  @param [in] pSocket       The DT_SOCKET structure address

+  @param [in] pSocket       The ESL_SOCKET structure address

 

   @retval EFI_SUCCESS - The socket is configured

 

 **/

 EFI_STATUS

 EslSocketIsConfigured (

-  DT_SOCKET * pSocket

+  ESL_SOCKET * pSocket

   );

 

 /**

   Allocate a packet for a receive or transmit operation

 

-  @param [in] ppPacket      Address to receive the DT_PACKET structure

+  @param [in] ppPacket      Address to receive the ESL_PACKET structure

   @param [in] LengthInBytes Length of the packet structure

   @param [in] DebugFlags    Flags for debug messages

 

@@ -825,7 +853,7 @@ EslSocketIsConfigured (
  **/

 EFI_STATUS

 EslSocketPacketAllocate (

-  IN DT_PACKET ** ppPacket,

+  IN ESL_PACKET ** ppPacket,

   IN size_t LengthInBytes,

   IN UINTN DebugFlags

   );

@@ -833,7 +861,7 @@ EslSocketPacketAllocate (
 /**

   Free a packet used for receive or transmit operation

 

-  @param [in] pPacket     Address of the DT_PACKET structure

+  @param [in] pPacket     Address of the ESL_PACKET structure

   @param [in] DebugFlags  Flags for debug messages

 

   @retval EFI_SUCCESS - The packet was allocated successfully

@@ -841,7 +869,7 @@ EslSocketPacketAllocate (
  **/

 EFI_STATUS

 EslSocketPacketFree (

-  IN DT_PACKET * pPacket,

+  IN ESL_PACKET * pPacket,

   IN UINTN DebugFlags

   );

 

@@ -877,7 +905,7 @@ EslSocketPacketFree (
  **/

 EFI_STATUS

 EslIpBind4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -900,7 +928,7 @@ EslIpBind4 (
  **/

 EFI_STATUS

 EslIpConnect4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -920,7 +948,7 @@ EslIpConnect4 (
 **/

 EFI_STATUS

 EslIpGetLocalAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -940,7 +968,7 @@ EslIpGetLocalAddress4 (
 **/

 EFI_STATUS

 EslIpGetRemoteAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -951,7 +979,7 @@ EslIpGetRemoteAddress4 (
   This routine initializes the IP4 service after its service binding

   protocol was located on a controller.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

   @retval EFI_SUCCESS         The service was properly initialized

   @retval other               A failure occurred during the service initialization

@@ -960,7 +988,7 @@ EslIpGetRemoteAddress4 (
 EFI_STATUS

 EFIAPI

 EslIpInitialize4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   );

 

 /**

@@ -968,7 +996,7 @@ EslIpInitialize4 (
 

   Retrieve the protocol options one at a time by name.

 

-  @param [in] pSocket           Address of a DT_SOCKET structure

+  @param [in] pSocket           Address of a ESL_SOCKET structure

   @param [in] level             Option protocol level

   @param [in] OptionName        Name of the option

   @param [out] ppOptionData     Buffer to receive address of option value

@@ -979,7 +1007,7 @@ EslIpInitialize4 (
  **/

 EFI_STATUS

 EslIpOptionGet4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int level,

   IN int OptionName,

   OUT CONST void ** __restrict ppOptionData,

@@ -991,7 +1019,7 @@ EslIpOptionGet4 (
 

   Adjust the protocol options one at a time by name.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   @param [in] level           Option protocol level

   @param [in] OptionName      Name of the option

   @param [in] pOptionValue    Buffer containing the option value

@@ -1002,7 +1030,7 @@ EslIpOptionGet4 (
  **/

 EFI_STATUS

 EslIpOptionSet4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int level,

   IN int OptionName,

   IN CONST void * pOptionValue,

@@ -1023,7 +1051,7 @@ EslIpOptionSet4 (
 **/

 EFI_STATUS

 EslIpPortClose4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1047,7 +1075,7 @@ EslIpPortClose4 (
 **/

 EFI_STATUS

 EslIpPortCloseStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN BOOLEAN bCloseNow,

   IN UINTN DebugFlags

   );

@@ -1067,7 +1095,7 @@ EslIpPortCloseStart4 (
 **/

 EFI_STATUS

 EslIpPortCloseTxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1085,7 +1113,7 @@ EslIpPortCloseTxDone4 (
   and copies the data from the IP4 driver's buffer into the

   application's buffer.  The IP4 driver's buffer is then returned.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -1104,7 +1132,7 @@ EslIpPortCloseTxDone4 (
 **/

 EFI_STATUS

 EslIpReceive4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN INT32 Flags,

   IN size_t BufferLength,

   IN UINT8 * pBuffer,

@@ -1116,14 +1144,14 @@ EslIpReceive4 (
 /**

   Cancel the receive operations

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The cancel was successful

 

  **/

 EFI_STATUS

 EslIpRxCancel4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -1136,24 +1164,24 @@ EslIpRxCancel4 (
 

   @param [in] Event     The receive completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslIpRxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

   Start a receive operation

 

-  @param [in] pPort       Address of the DT_PORT structure.

+  @param [in] pPort       Address of the ESL_PORT structure.

 

  **/

 VOID

 EslIpRxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1161,20 +1189,20 @@ EslIpRxStart4 (
 

   This routine undoes the work performed by ::IpInitialize4.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

 **/

 VOID

 EFIAPI

 EslIpShutdown4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   );

 

 /**

   Determine if the sockedt is configured.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The port is connected

   @retval EFI_NOT_STARTED - The port is not connected

@@ -1182,7 +1210,7 @@ EslIpShutdown4 (
  **/

  EFI_STATUS

  EslIpSocketIsConfigured4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -1200,7 +1228,7 @@ EslIpShutdown4 (
   during the close operation.  Only buffering errors are returned

   during the current transmission attempt.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -1219,7 +1247,7 @@ EslIpShutdown4 (
 **/

 EFI_STATUS

 EslIpTxBuffer4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int Flags,

   IN size_t BufferLength,

   IN CONST UINT8 * pBuffer,

@@ -1233,24 +1261,24 @@ EslIpTxBuffer4 (
 

   @param [in] Event     The normal transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslIpTxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

   Transmit data using a network connection.

 

-  @param [in] pPort           Address of a DT_PORT structure

+  @param [in] pPort           Address of a ESL_PORT structure

 

  **/

 VOID

 EslIpTxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 //------------------------------------------------------------------------------

@@ -1279,7 +1307,7 @@ EslIpTxStart4 (
  **/

 EFI_STATUS

 EslTcpAccept4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN struct sockaddr * pSockAddr,

   IN OUT socklen_t * pSockAddrLength

   );

@@ -1308,7 +1336,7 @@ EslTcpAccept4 (
  **/

 EFI_STATUS

 EslTcpBind4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -1328,7 +1356,7 @@ EslTcpBind4 (
  **/

 EFI_STATUS

 EslTcpConnectPoll4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -1350,7 +1378,7 @@ EslTcpConnectPoll4 (
  **/

 EFI_STATUS

 EslTcpConnectStart4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -1361,7 +1389,7 @@ EslTcpConnectStart4 (
   This routine initializes the TCP4 service after its service binding

   protocol was located on a controller.

 

-  @param [in] pService             DT_SERVICE structure address

+  @param [in] pService             ESL_SERVICE structure address

 

   @retval EFI_SUCCESS          The service was properly initialized

   @retval other                A failure occurred during the service initialization

@@ -1370,7 +1398,7 @@ EslTcpConnectStart4 (
 EFI_STATUS

 EFIAPI

 EslTcpInitialize4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   );

 

 /**

@@ -1388,7 +1416,7 @@ EslTcpInitialize4 (
 **/

 EFI_STATUS

 EslTcpGetLocalAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -1408,7 +1436,7 @@ EslTcpGetLocalAddress4 (
 **/

 EFI_STATUS

 EslTcpGetRemoteAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -1431,7 +1459,7 @@ EslTcpGetRemoteAddress4 (
 **/

 EFI_STATUS

 EslTcpListen4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -1442,38 +1470,38 @@ EslTcpListen4 (
 

   @param [in] Event     The listeen completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpListenComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

-  Allocate and initialize a DT_PORT structure.

+  Allocate and initialize a ESL_PORT structure.

 

   @param [in] pSocket     Address of the socket structure.

-  @param [in] pService    Address of the DT_SERVICE structure.

+  @param [in] pService    Address of the ESL_SERVICE structure.

   @param [in] ChildHandle TCP4 child handle

   @param [in] pIpAddress  Buffer containing IP4 network address of the local host

   @param [in] PortNumber  Tcp4 port number

   @param [in] DebugFlags  Flags for debug messages

-  @param [out] ppPort     Buffer to receive new DT_PORT structure address

+  @param [out] ppPort     Buffer to receive new ESL_PORT structure address

 

   @retval EFI_SUCCESS - Socket successfully created

 

  **/

 EFI_STATUS

 EslTcpPortAllocate4 (

-  IN DT_SOCKET * pSocket,

-  IN DT_SERVICE * pService,

+  IN ESL_SOCKET * pSocket,

+  IN ESL_SERVICE * pService,

   IN EFI_HANDLE ChildHandle,

   IN CONST UINT8 *pIpAddress,

   IN UINT16 PortNumber,

   IN UINTN DebugFlags,

-  OUT DT_PORT ** ppPort

+  OUT ESL_PORT ** ppPort

   );

 

 /**

@@ -1490,7 +1518,7 @@ EslTcpPortAllocate4 (
 **/

 EFI_STATUS

 EslTcpPortClose4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1498,13 +1526,13 @@ EslTcpPortClose4 (
 

   @param [in] Event     The close completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpPortCloseComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1522,7 +1550,7 @@ EslTcpPortCloseComplete4 (
 **/

 EFI_STATUS

 EslTcpPortCloseRxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1535,7 +1563,7 @@ EslTcpPortCloseRxDone4 (
 **/

 EFI_STATUS

 EslTcpPortCloseStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN BOOLEAN bAbort,

   IN UINTN DebugFlags

   );

@@ -1554,14 +1582,14 @@ EslTcpPortCloseStart4 (
 **/

 EFI_STATUS

 EslTcpPortCloseTxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

   Receive data from a network connection.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @param [in] Flags           Message control flags

   

@@ -1580,7 +1608,7 @@ EslTcpPortCloseTxDone4 (
  **/

 EFI_STATUS

 EslTcpReceive4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN INT32 Flags,

   IN size_t BufferLength,

   IN UINT8 * pBuffer,

@@ -1592,14 +1620,14 @@ EslTcpReceive4 (
 /**

   Cancel the receive operations

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The cancel was successful

 

  **/

 EFI_STATUS

 EslTcpRxCancel4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -1609,24 +1637,24 @@ EslTcpRxCancel4 (
 

   @param [in] Event     The receive completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpRxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

   Start a receive operation

 

-  @param [in] pPort       Address of the DT_PORT structure.

+  @param [in] pPort       Address of the ESL_PORT structure.

 

  **/

 VOID

 EslTcpRxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1634,20 +1662,20 @@ EslTcpRxStart4 (
 

   This routine undoes the work performed by ::TcpInitialize4.

 

-  @param [in] pService             DT_SERVICE structure address

+  @param [in] pService             ESL_SERVICE structure address

 

 **/

 VOID

 EFIAPI

 EslTcpShutdown4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   );

 

 /**

   Determine if the socket is configured.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The port is connected

   @retval EFI_NOT_STARTED - The port is not connected

@@ -1655,7 +1683,7 @@ EslTcpShutdown4 (
  **/

  EFI_STATUS

  EslTcpSocketIsConfigured4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -1666,7 +1694,7 @@ EslTcpShutdown4 (
   start the transmit engine that performs the data transmission

   on the network connection.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @param [in] Flags           Message control flags

   

@@ -1685,7 +1713,7 @@ EslTcpShutdown4 (
  **/

 EFI_STATUS

 EslTcpTxBuffer4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int Flags,

   IN size_t BufferLength,

   IN CONST UINT8 * pBuffer,

@@ -1699,13 +1727,13 @@ EslTcpTxBuffer4 (
 

   @param [in] Event     The normal transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpTxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1713,20 +1741,20 @@ EslTcpTxComplete4 (
 

   @param [in] Event     The urgent transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpTxOobComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

   Transmit data using a network connection.

 

 

-  @param [in] pPort           Address of a DT_PORT structure

+  @param [in] pPort           Address of a ESL_PORT structure

   @param [in] pToken          Address of either the OOB or normal transmit token

   @param [in] ppQueueHead     Transmit queue head address

   @param [in] ppQueueTail     Transmit queue tail address

@@ -1735,11 +1763,11 @@ EslTcpTxOobComplete4 (
  **/

 VOID

 EslTcpTxStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN EFI_TCP4_IO_TOKEN * pToken,

-  IN DT_PACKET ** ppQueueHead,

-  IN DT_PACKET ** ppQueueTail,

-  IN DT_PACKET ** ppPacket

+  IN ESL_PACKET ** ppQueueHead,

+  IN ESL_PACKET ** ppQueueTail,

+  IN ESL_PACKET ** ppPacket

   );

 

 //------------------------------------------------------------------------------

@@ -1770,7 +1798,7 @@ EslTcpTxStart4 (
  **/

 EFI_STATUS

 EslUdpBind4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -1781,7 +1809,7 @@ EslUdpBind4 (
   This routine initializes the UDP4 service after its service binding

   protocol was located on a controller.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

   @retval EFI_SUCCESS         The service was properly initialized

   @retval other               A failure occurred during the service initialization

@@ -1790,32 +1818,32 @@ EslUdpBind4 (
 EFI_STATUS

 EFIAPI

 EslUdpInitialize4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   );

 

 /**

-  Allocate and initialize a DT_PORT structure.

+  Allocate and initialize a ESL_PORT structure.

 

   @param [in] pSocket     Address of the socket structure.

-  @param [in] pService    Address of the DT_SERVICE structure.

+  @param [in] pService    Address of the ESL_SERVICE structure.

   @param [in] ChildHandle Udp4 child handle

   @param [in] pIpAddress  Buffer containing IP4 network address of the local host

   @param [in] PortNumber  Udp4 port number

   @param [in] DebugFlags  Flags for debug messages

-  @param [out] ppPort     Buffer to receive new DT_PORT structure address

+  @param [out] ppPort     Buffer to receive new ESL_PORT structure address

 

   @retval EFI_SUCCESS - Socket successfully created

 

  **/

 EFI_STATUS

 EslUdpPortAllocate4 (

-  IN DT_SOCKET * pSocket,

-  IN DT_SERVICE * pService,

+  IN ESL_SOCKET * pSocket,

+  IN ESL_SERVICE * pService,

   IN EFI_HANDLE ChildHandle,

   IN CONST UINT8 * pIpAddress,

   IN UINT16 PortNumber,

   IN UINTN DebugFlags,

-  OUT DT_PORT ** ppPort

+  OUT ESL_PORT ** ppPort

   );

 

 /**

@@ -1832,7 +1860,7 @@ EslUdpPortAllocate4 (
 **/

 EFI_STATUS

 EslUdpPortClose4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1856,7 +1884,7 @@ EslUdpPortClose4 (
 **/

 EFI_STATUS

 EslUdpPortCloseStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN BOOLEAN bCloseNow,

   IN UINTN DebugFlags

   );

@@ -1876,7 +1904,7 @@ EslUdpPortCloseStart4 (
 **/

 EFI_STATUS

 EslUdpPortCloseTxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -1897,7 +1925,7 @@ EslUdpPortCloseTxDone4 (
  **/

 EFI_STATUS

 EslUdpConnect4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   );

@@ -1917,7 +1945,7 @@ EslUdpConnect4 (
 **/

 EFI_STATUS

 EslUdpGetLocalAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -1937,7 +1965,7 @@ EslUdpGetLocalAddress4 (
 **/

 EFI_STATUS

 EslUdpGetRemoteAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   );

@@ -1957,7 +1985,7 @@ EslUdpGetRemoteAddress4 (
   and copies the data from the UDP4 driver's buffer into the

   application's buffer.  The UDP4 driver's buffer is then returned.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -1976,7 +2004,7 @@ EslUdpGetRemoteAddress4 (
 **/

 EFI_STATUS

 EslUdpReceive4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN INT32 Flags,

   IN size_t BufferLength,

   IN UINT8 * pBuffer,

@@ -1988,14 +2016,14 @@ EslUdpReceive4 (
 /**

   Cancel the receive operations

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The cancel was successful

 

  **/

 EFI_STATUS

 EslUdpRxCancel4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -2008,31 +2036,31 @@ EslUdpRxCancel4 (
 

   @param [in] Event     The receive completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslUdpRxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

   Start a receive operation

 

-  @param [in] pPort       Address of the DT_PORT structure.

+  @param [in] pPort       Address of the ESL_PORT structure.

 

  **/

 VOID

 EslUdpRxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

   Determine if the socket is configured.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The port is connected

   @retval EFI_NOT_STARTED - The port is not connected

@@ -2040,7 +2068,7 @@ EslUdpRxStart4 (
  **/

  EFI_STATUS

  EslUdpSocketIsConfigured4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   );

 

 /**

@@ -2048,13 +2076,13 @@ EslUdpRxStart4 (
 

   @param [in] Event     The normal transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslUdpTxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 /**

@@ -2062,13 +2090,13 @@ EslUdpTxComplete4 (
 

   This routine undoes the work performed by ::UdpInitialize4.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

 **/

 VOID

 EFIAPI

 EslUdpShutdown4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   );

 

 /**

@@ -2086,7 +2114,7 @@ EslUdpShutdown4 (
   during the close operation.  Only buffering errors are returned

   during the current transmission attempt.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -2105,7 +2133,7 @@ EslUdpShutdown4 (
 **/

 EFI_STATUS

 EslUdpTxBuffer4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int Flags,

   IN size_t BufferLength,

   IN CONST UINT8 * pBuffer,

@@ -2117,12 +2145,12 @@ EslUdpTxBuffer4 (
 /**

   Transmit data using a network connection.

 

-  @param [in] pPort           Address of a DT_PORT structure

+  @param [in] pPort           Address of a ESL_PORT structure

 

  **/

 VOID

 EslUdpTxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   );

 

 //------------------------------------------------------------------------------

diff --git a/StdLib/EfiSocketLib/Tcp4.c b/StdLib/EfiSocketLib/Tcp4.c
index 6cd9a87..46f50ac 100644
--- a/StdLib/EfiSocketLib/Tcp4.c
+++ b/StdLib/EfiSocketLib/Tcp4.c
@@ -14,7 +14,7 @@
 

 #include "Socket.h"

 

-CONST DT_PROTOCOL_API cEslTcp4Api = {

+CONST ESL_PROTOCOL_API cEslTcp4Api = {

   IPPROTO_TCP,

   EslTcpAccept4,

   EslTcpBind4,

@@ -54,14 +54,14 @@ CONST DT_PROTOCOL_API cEslTcp4Api = {
  **/

 EFI_STATUS

 EslTcpAccept4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN struct sockaddr * pSockAddr,

   IN OUT socklen_t * pSockAddrLength

   )

 {

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_TCP4_CONTEXT * pTcp4;

   UINT32 RemoteAddress;

   EFI_STATUS Status;

 

@@ -142,15 +142,15 @@ EslTcpAccept4 (
  **/

 EFI_STATUS

 EslTcpBind4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   )

 {

   EFI_HANDLE ChildHandle;

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_SERVICE * pService;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_SERVICE * pService;

   CONST struct sockaddr_in * pIp4Address;

   EFI_SERVICE_BINDING_PROTOCOL * pTcp4Service;

   EFI_STATUS Status;

@@ -281,11 +281,11 @@ EslTcpBind4 (
  **/

 EFI_STATUS

 EslTcpConnectAttempt4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

-  DT_PORT * pPort;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PORT * pPort;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_TCP4_PROTOCOL * pTcp4Protocol;

   EFI_STATUS Status;

 

@@ -401,20 +401,20 @@ EslTcpConnectAttempt4 (
 

   @param [in] Event     The connect completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpConnectComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   BOOLEAN bRemoveFirstPort;

   BOOLEAN bRemovePorts;

-  DT_PORT * pNextPort;

-  DT_SOCKET * pSocket;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PORT * pNextPort;

+  ESL_SOCKET * pSocket;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -547,7 +547,7 @@ EslTcpConnectComplete4 (
  **/

 EFI_STATUS

 EslTcpConnectPoll4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

   EFI_STATUS Status;

@@ -647,14 +647,14 @@ EslTcpConnectPoll4 (
  **/

 EFI_STATUS

 EslTcpConnectStart4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   )

 {

   struct sockaddr_in LocalAddress;

-  DT_PORT * pPort;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PORT * pPort;

+  ESL_TCP4_CONTEXT * pTcp4;

   CONST struct sockaddr_in * pIp4Address;

   EFI_STATUS Status;

 

@@ -729,7 +729,7 @@ EslTcpConnectStart4 (
   This routine initializes the TCP4 service after its service binding

   protocol was located on a controller.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

   @retval EFI_SUCCESS         The service was properly initialized

   @retval other               A failure occurred during the service initialization

@@ -738,10 +738,10 @@ EslTcpConnectStart4 (
 EFI_STATUS

 EFIAPI

 EslTcpInitialize4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   )

 {

-  DT_LAYER * pLayer;

+  ESL_LAYER * pLayer;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -786,15 +786,15 @@ EslTcpInitialize4 (
 **/

 EFI_STATUS

 EslTcpGetLocalAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   )

 {

   socklen_t LengthInBytes;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pLocalAddress;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -862,15 +862,15 @@ EslTcpGetLocalAddress4 (
 **/

 EFI_STATUS

 EslTcpGetRemoteAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   )

 {

   socklen_t LengthInBytes;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -941,12 +941,12 @@ EslTcpGetRemoteAddress4 (
 **/

 EFI_STATUS

 EslTcpListen4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

-  DT_PORT * pNextPort;

-  DT_PORT * pPort;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PORT * pNextPort;

+  ESL_PORT * pPort;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_TCP4_PROTOCOL * pTcp4Protocol;

   EFI_STATUS Status;

 

@@ -1150,22 +1150,22 @@ EslTcpListen4 (
 

   @param [in] Event     The listen completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpListenComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   EFI_HANDLE ChildHandle;

   EFI_TCP4_CONFIG_DATA * pConfigData;

-  DT_LAYER * pLayer;

-  DT_PORT * pNewPort;

-  DT_SOCKET * pNewSocket;

-  DT_SOCKET * pSocket;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pNewPort;

+  ESL_SOCKET * pNewSocket;

+  ESL_SOCKET * pSocket;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_TCP4_PROTOCOL * pTcp4Protocol;

   EFI_STATUS Status;

   EFI_HANDLE TcpPortHandle;

@@ -1360,35 +1360,35 @@ EslTcpListenComplete4 (
 

 

 /**

-  Allocate and initialize a DT_PORT structure.

+  Allocate and initialize a ESL_PORT structure.

 

   @param [in] pSocket     Address of the socket structure.

-  @param [in] pService    Address of the DT_SERVICE structure.

+  @param [in] pService    Address of the ESL_SERVICE structure.

   @param [in] ChildHandle TCP4 child handle

   @param [in] pIpAddress  Buffer containing IP4 network address of the local host

   @param [in] PortNumber  Tcp4 port number

   @param [in] DebugFlags  Flags for debug messages

-  @param [out] ppPort     Buffer to receive new DT_PORT structure address

+  @param [out] ppPort     Buffer to receive new ESL_PORT structure address

 

   @retval EFI_SUCCESS - Socket successfully created

 

  **/

 EFI_STATUS

 EslTcpPortAllocate4 (

-  IN DT_SOCKET * pSocket,

-  IN DT_SERVICE * pService,

+  IN ESL_SOCKET * pSocket,

+  IN ESL_SERVICE * pService,

   IN EFI_HANDLE ChildHandle,

   IN CONST UINT8 * pIpAddress,

   IN UINT16 PortNumber,

   IN UINTN DebugFlags,

-  OUT DT_PORT ** ppPort

+  OUT ESL_PORT ** ppPort

   )

 {

   UINTN LengthInBytes;

   EFI_TCP4_ACCESS_POINT * pAccessPoint;

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -1629,17 +1629,17 @@ EslTcpPortAllocate4 (
 **/

 EFI_STATUS

 EslTcpPortClose4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   UINTN DebugFlags;

-  DT_LAYER * pLayer;

-  DT_PACKET * pPacket;

-  DT_PORT * pPreviousPort;

-  DT_SERVICE * pService;

-  DT_SOCKET * pSocket;

+  ESL_LAYER * pLayer;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPreviousPort;

+  ESL_SERVICE * pService;

+  ESL_SOCKET * pSocket;

   EFI_SERVICE_BINDING_PROTOCOL * pTcp4Service;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -1922,13 +1922,13 @@ EslTcpPortClose4 (
 

   @param [in] Event     The close completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpPortCloseComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   EFI_STATUS Status;

@@ -1969,12 +1969,12 @@ EslTcpPortCloseComplete4 (
 **/

 EFI_STATUS

 EslTcpPortCloseStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN BOOLEAN bCloseNow,

   IN UINTN DebugFlags

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -2031,11 +2031,11 @@ EslTcpPortCloseStart4 (
 **/

 EFI_STATUS

 EslTcpPortCloseRxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   PORT_STATE PortState;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -2113,11 +2113,11 @@ EslTcpPortCloseRxDone4 (
 **/

 EFI_STATUS

 EslTcpPortCloseTxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

-  DT_SOCKET * pSocket;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_SOCKET * pSocket;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_TCP4_PROTOCOL * pTcp4Protocol;

   EFI_STATUS Status;

 

@@ -2220,7 +2220,7 @@ EslTcpPortCloseTxDone4 (
   Receive data from a network connection.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @param [in] Flags           Message control flags

   

@@ -2239,7 +2239,7 @@ EslTcpPortCloseTxDone4 (
  **/

 EFI_STATUS

 EslTcpReceive4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN INT32 Flags,

   IN size_t BufferLength,

   IN UINT8 * pBuffer,

@@ -2252,13 +2252,13 @@ EslTcpReceive4 (
   size_t BytesToCopy;

   in_addr_t IpAddress;

   size_t LengthInBytes;

-  DT_PACKET * pPacket;

-  DT_PORT * pPort;

-  DT_PACKET ** ppQueueHead;

-  DT_PACKET ** ppQueueTail;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPort;

+  ESL_PACKET ** ppQueueHead;

+  ESL_PACKET ** ppQueueTail;

   struct sockaddr_in * pRemoteAddress;

   size_t * pRxDataBytes;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_TCP4_CONTEXT * pTcp4;

   struct sockaddr_in RemoteAddress;

   EFI_STATUS Status;

 

@@ -2525,19 +2525,19 @@ EslTcpReceive4 (
 /**

   Cancel the receive operations

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The cancel was successful

 

  **/

 EFI_STATUS

 EslTcpRxCancel4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

-  DT_PACKET * pPacket;

-  DT_PORT * pPort;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPort;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_TCP4_PROTOCOL * pTcp4Protocol;

   EFI_STATUS Status;

 

@@ -2589,21 +2589,21 @@ EslTcpRxCancel4 (
 

   @param [in] Event     The receive completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpRxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   BOOLEAN bUrgent;

   size_t LengthInBytes;

-  DT_PACKET * pPacket;

-  DT_PACKET * pPrevious;

-  DT_SOCKET * pSocket;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PACKET * pPacket;

+  ESL_PACKET * pPrevious;

+  ESL_SOCKET * pSocket;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -2728,18 +2728,18 @@ EslTcpRxComplete4 (
 /**

   Start a receive operation

 

-  @param [in] pPort       Address of the DT_PORT structure.

+  @param [in] pPort       Address of the ESL_PORT structure.

 

  **/

 VOID

 EslTcpRxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   size_t LengthInBytes;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_TCP4_PROTOCOL * pTcp4Protocol;

   EFI_STATUS Status;

 

@@ -2838,18 +2838,18 @@ EslTcpRxStart4 (
 

   This routine undoes the work performed by ::TcpInitialize4.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

 **/

 VOID

 EFIAPI

 EslTcpShutdown4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   )

 {

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_SERVICE * pPreviousService;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_SERVICE * pPreviousService;

 

   DBG_ENTER ( );

 

@@ -2908,7 +2908,7 @@ EslTcpShutdown4 (
   Determine if the socket is configured.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The port is connected

   @retval EFI_NOT_STARTED - The port is not connected

@@ -2916,7 +2916,7 @@ EslTcpShutdown4 (
  **/

  EFI_STATUS

  EslTcpSocketIsConfigured4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

   EFI_STATUS Status;

@@ -2954,7 +2954,7 @@ EslTcpShutdown4 (
   during the close operation.  Only buffering errors are returned

   during the current transmission attempt.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @param [in] Flags           Message control flags

   

@@ -2973,7 +2973,7 @@ EslTcpShutdown4 (
  **/

 EFI_STATUS

 EslTcpTxBuffer4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int Flags,

   IN size_t BufferLength,

   IN CONST UINT8 * pBuffer,

@@ -2984,13 +2984,13 @@ EslTcpTxBuffer4 (
 {

   BOOLEAN bUrgent;

   BOOLEAN bUrgentQueue;

-  DT_PACKET * pPacket;

-  DT_PACKET * pPreviousPacket;

-  DT_PACKET ** ppPacket;

-  DT_PACKET ** ppQueueHead;

-  DT_PACKET ** ppQueueTail;

-  DT_PORT * pPort;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PACKET * pPacket;

+  ESL_PACKET * pPreviousPacket;

+  ESL_PACKET ** ppPacket;

+  ESL_PACKET ** ppQueueHead;

+  ESL_PACKET ** ppQueueTail;

+  ESL_PORT * pPort;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_TCP4_IO_TOKEN * pToken;

   size_t * pTxBytes;

   EFI_TCP4_TRANSMIT_DATA * pTxData;

@@ -3169,21 +3169,21 @@ EslTcpTxBuffer4 (
 

   @param [in] Event     The normal transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpTxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   UINT32 LengthInBytes;

-  DT_PACKET * pCurrentPacket;

-  DT_PACKET * pNextPacket;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PACKET * pCurrentPacket;

+  ESL_PACKET * pNextPacket;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -3273,21 +3273,21 @@ EslTcpTxComplete4 (
 

   @param [in] Event     The urgent transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslTcpTxOobComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   UINT32 LengthInBytes;

-  DT_PACKET * pCurrentPacket;

-  DT_PACKET * pNextPacket;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_TCP4_CONTEXT * pTcp4;

+  ESL_PACKET * pCurrentPacket;

+  ESL_PACKET * pNextPacket;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_TCP4_CONTEXT * pTcp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -3377,7 +3377,7 @@ EslTcpTxOobComplete4 (
   Transmit data using a network connection.

 

 

-  @param [in] pPort           Address of a DT_PORT structure

+  @param [in] pPort           Address of a ESL_PORT structure

   @param [in] pToken          Address of either the OOB or normal transmit token

   @param [in] ppQueueHead     Transmit queue head address

   @param [in] ppQueueTail     Transmit queue tail address

@@ -3386,16 +3386,16 @@ EslTcpTxOobComplete4 (
  **/

 VOID

 EslTcpTxStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN EFI_TCP4_IO_TOKEN * pToken,

-  IN DT_PACKET ** ppQueueHead,

-  IN DT_PACKET ** ppQueueTail,

-  IN DT_PACKET ** ppPacket

+  IN ESL_PACKET ** ppQueueHead,

+  IN ESL_PACKET ** ppQueueTail,

+  IN ESL_PACKET ** ppPacket

   )

 {

-  DT_PACKET * pNextPacket;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

+  ESL_PACKET * pNextPacket;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

   EFI_TCP4_PROTOCOL * pTcp4Protocol;

   EFI_STATUS Status;

 

diff --git a/StdLib/EfiSocketLib/Udp4.c b/StdLib/EfiSocketLib/Udp4.c
index 6d3e2d2..0f506d8 100644
--- a/StdLib/EfiSocketLib/Udp4.c
+++ b/StdLib/EfiSocketLib/Udp4.c
@@ -14,7 +14,7 @@
 

 #include "Socket.h"

 

-CONST DT_PROTOCOL_API cEslUdp4Api = {

+CONST ESL_PROTOCOL_API cEslUdp4Api = {

   IPPROTO_UDP,

   NULL,   //  Accept

   EslUdpBind4,

@@ -60,15 +60,15 @@ CONST DT_PROTOCOL_API cEslUdp4Api = {
  **/

 EFI_STATUS

 EslUdpBind4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   )

 {

   EFI_HANDLE ChildHandle;

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_SERVICE * pService;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_SERVICE * pService;

   CONST struct sockaddr_in * pIp4Address;

   EFI_SERVICE_BINDING_PROTOCOL * pUdp4Service;

   EFI_STATUS Status;

@@ -194,7 +194,7 @@ EslUdpBind4 (
   This routine initializes the UDP4 service after its service binding

   protocol was located on a controller.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

   @retval EFI_SUCCESS         The service was properly initialized

   @retval other               A failure occurred during the service initialization

@@ -203,10 +203,10 @@ EslUdpBind4 (
 EFI_STATUS

 EFIAPI

 EslUdpInitialize4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   )

 {

-  DT_LAYER * pLayer;

+  ESL_LAYER * pLayer;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -237,35 +237,35 @@ EslUdpInitialize4 (
 

 

 /**

-  Allocate and initialize a DT_PORT structure.

+  Allocate and initialize a ESL_PORT structure.

 

   @param [in] pSocket     Address of the socket structure.

-  @param [in] pService    Address of the DT_SERVICE structure.

+  @param [in] pService    Address of the ESL_SERVICE structure.

   @param [in] ChildHandle Udp4 child handle

   @param [in] pIpAddress  Buffer containing IP4 network address of the local host

   @param [in] PortNumber  Udp4 port number

   @param [in] DebugFlags  Flags for debug messages

-  @param [out] ppPort     Buffer to receive new DT_PORT structure address

+  @param [out] ppPort     Buffer to receive new ESL_PORT structure address

 

   @retval EFI_SUCCESS - Socket successfully created

 

  **/

 EFI_STATUS

 EslUdpPortAllocate4 (

-  IN DT_SOCKET * pSocket,

-  IN DT_SERVICE * pService,

+  IN ESL_SOCKET * pSocket,

+  IN ESL_SERVICE * pService,

   IN EFI_HANDLE ChildHandle,

   IN CONST UINT8 * pIpAddress,

   IN UINT16 PortNumber,

   IN UINTN DebugFlags,

-  OUT DT_PORT ** ppPort

+  OUT ESL_PORT ** ppPort

   )

 {

   UINTN LengthInBytes;

   EFI_UDP4_CONFIG_DATA * pConfig;

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -453,17 +453,17 @@ EslUdpPortAllocate4 (
 **/

 EFI_STATUS

 EslUdpPortClose4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   UINTN DebugFlags;

-  DT_LAYER * pLayer;

-  DT_PACKET * pPacket;

-  DT_PORT * pPreviousPort;

-  DT_SERVICE * pService;

-  DT_SOCKET * pSocket;

+  ESL_LAYER * pLayer;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPreviousPort;

+  ESL_SERVICE * pService;

+  ESL_SOCKET * pSocket;

   EFI_SERVICE_BINDING_PROTOCOL * pUdp4Service;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -688,12 +688,12 @@ EslUdpPortClose4 (
 **/

 EFI_STATUS

 EslUdpPortCloseStart4 (

-  IN DT_PORT * pPort,

+  IN ESL_PORT * pPort,

   IN BOOLEAN bCloseNow,

   IN UINTN DebugFlags

   )

 {

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -750,12 +750,12 @@ EslUdpPortCloseStart4 (
 **/

 EFI_STATUS

 EslUdpPortCloseRxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   PORT_STATE PortState;

-  DT_SOCKET * pSocket;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_SOCKET * pSocket;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -826,12 +826,12 @@ EslUdpPortCloseRxDone4 (
 **/

 EFI_STATUS

 EslUdpPortCloseTxDone4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_UDP4_PROTOCOL * pUdp4Protocol;

   EFI_STATUS Status;

 

@@ -977,15 +977,15 @@ EslUdpPortCloseTxDone4 (
  **/

 EFI_STATUS

 EslUdpConnect4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN const struct sockaddr * pSockAddr,

   IN socklen_t SockAddrLength

   )

 {

   struct sockaddr_in LocalAddress;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -1080,15 +1080,15 @@ EslUdpConnect4 (
 **/

 EFI_STATUS

 EslUdpGetLocalAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   )

 {

   socklen_t LengthInBytes;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pLocalAddress;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -1156,15 +1156,15 @@ EslUdpGetLocalAddress4 (
 **/

 EFI_STATUS

 EslUdpGetRemoteAddress4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   OUT struct sockaddr * pAddress,

   IN OUT socklen_t * pAddressLength

   )

 {

   socklen_t LengthInBytes;

-  DT_PORT * pPort;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -1232,7 +1232,7 @@ EslUdpGetRemoteAddress4 (
   and copies the data from the UDP4 driver's buffer into the

   application's buffer.  The UDP4 driver's buffer is then returned.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -1251,7 +1251,7 @@ EslUdpGetRemoteAddress4 (
 **/

 EFI_STATUS

 EslUdpReceive4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN INT32 Flags,

   IN size_t BufferLength,

   IN UINT8 * pBuffer,

@@ -1267,11 +1267,11 @@ EslUdpReceive4 (
   in_addr_t IpAddress;

   size_t LengthInBytes;

   UINT8 * pData;

-  DT_PACKET * pPacket;

-  DT_PORT * pPort;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPort;

   struct sockaddr_in * pRemoteAddress;

   EFI_UDP4_RECEIVE_DATA * pRxData;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_UDP4_CONTEXT * pUdp4;

   struct sockaddr_in RemoteAddress;

   EFI_STATUS Status;

 

@@ -1510,19 +1510,19 @@ EslUdpReceive4 (
 /**

   Cancel the receive operations

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The cancel was successful

 

  **/

 EFI_STATUS

 EslUdpRxCancel4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

-  DT_PACKET * pPacket;

-  DT_PORT * pPort;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_PACKET * pPacket;

+  ESL_PORT * pPort;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_UDP4_PROTOCOL * pUdp4Protocol;

   EFI_STATUS Status;

 

@@ -1577,21 +1577,21 @@ EslUdpRxCancel4 (
 

   @param [in] Event     The receive completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslUdpRxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   size_t LengthInBytes;

-  DT_PACKET * pPacket;

-  DT_PACKET * pPrevious;

+  ESL_PACKET * pPacket;

+  ESL_PACKET * pPrevious;

   EFI_UDP4_RECEIVE_DATA * pRxData;

-  DT_SOCKET * pSocket;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_SOCKET * pSocket;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_STATUS Status;

   

   DBG_ENTER ( );

@@ -1718,17 +1718,17 @@ EslUdpRxComplete4 (
 /**

   Start a receive operation

 

-  @param [in] pPort       Address of the DT_PORT structure.

+  @param [in] pPort       Address of the ESL_PORT structure.

 

  **/

 VOID

 EslUdpRxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_UDP4_PROTOCOL * pUdp4Protocol;

   EFI_STATUS Status;

 

@@ -1830,18 +1830,18 @@ EslUdpRxStart4 (
 

   This routine undoes the work performed by ::UdpInitialize4.

 

-  @param [in] pService        DT_SERVICE structure address

+  @param [in] pService        ESL_SERVICE structure address

 

 **/

 VOID

 EFIAPI

 EslUdpShutdown4 (

-  IN DT_SERVICE * pService

+  IN ESL_SERVICE * pService

   )

 {

-  DT_LAYER * pLayer;

-  DT_PORT * pPort;

-  DT_SERVICE * pPreviousService;

+  ESL_LAYER * pLayer;

+  ESL_PORT * pPort;

+  ESL_SERVICE * pPreviousService;

 

   DBG_ENTER ( );

 

@@ -1900,7 +1900,7 @@ EslUdpShutdown4 (
   Determine if the sockedt is configured.

 

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

   

   @retval EFI_SUCCESS - The port is connected

   @retval EFI_NOT_STARTED - The port is not connected

@@ -1908,12 +1908,12 @@ EslUdpShutdown4 (
  **/

  EFI_STATUS

  EslUdpSocketIsConfigured4 (

-  IN DT_SOCKET * pSocket

+  IN ESL_SOCKET * pSocket

   )

 {

-  DT_PORT * pPort;

-  DT_PORT * pNextPort;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_PORT * pPort;

+  ESL_PORT * pNextPort;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_UDP4_PROTOCOL * pUdp4Protocol;

   EFI_STATUS Status;

   struct sockaddr_in LocalAddress;

@@ -2070,7 +2070,7 @@ EslUdpShutdown4 (
   during the close operation.  Only buffering errors are returned

   during the current transmission attempt.

 

-  @param [in] pSocket         Address of a DT_SOCKET structure

+  @param [in] pSocket         Address of a ESL_SOCKET structure

 

   @param [in] Flags           Message control flags

 

@@ -2089,7 +2089,7 @@ EslUdpShutdown4 (
 **/

 EFI_STATUS

 EslUdpTxBuffer4 (

-  IN DT_SOCKET * pSocket,

+  IN ESL_SOCKET * pSocket,

   IN int Flags,

   IN size_t BufferLength,

   IN CONST UINT8 * pBuffer,

@@ -2098,15 +2098,15 @@ EslUdpTxBuffer4 (
   IN socklen_t AddressLength

   )

 {

-  DT_PACKET * pPacket;

-  DT_PACKET * pPreviousPacket;

-  DT_PACKET ** ppPacket;

-  DT_PORT * pPort;

+  ESL_PACKET * pPacket;

+  ESL_PACKET * pPreviousPacket;

+  ESL_PACKET ** ppPacket;

+  ESL_PORT * pPort;

   const struct sockaddr_in * pRemoteAddress;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_UDP4_COMPLETION_TOKEN * pToken;

   size_t * pTxBytes;

-  DT_UDP4_TX_DATA * pTxData;

+  ESL_UDP4_TX_DATA * pTxData;

   EFI_STATUS Status;

   EFI_TPL TplPrevious;

 

@@ -2287,23 +2287,23 @@ EslUdpTxBuffer4 (
 

   @param [in] Event     The normal transmit completion event

 

-  @param [in] pPort     The DT_PORT structure address

+  @param [in] pPort     The ESL_PORT structure address

 

 **/

 VOID

 EslUdpTxComplete4 (

   IN EFI_EVENT Event,

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

   BOOLEAN bRetransmit;

   UINT32 LengthInBytes;

-  DT_PACKET * pCurrentPacket;

-  DT_PACKET * pNextPacket;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_UDP4_TX_DATA * pTxData;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_PACKET * pCurrentPacket;

+  ESL_PACKET * pNextPacket;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_UDP4_TX_DATA * pTxData;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_UDP4_PROTOCOL * pUdp4Protocol;

   EFI_STATUS Status;

   

@@ -2415,18 +2415,18 @@ EslUdpTxComplete4 (
 /**

   Transmit data using a network connection.

 

-  @param [in] pPort           Address of a DT_PORT structure

+  @param [in] pPort           Address of a ESL_PORT structure

 

  **/

 VOID

 EslUdpTxStart4 (

-  IN DT_PORT * pPort

+  IN ESL_PORT * pPort

   )

 {

-  DT_PACKET * pNextPacket;

-  DT_PACKET * pPacket;

-  DT_SOCKET * pSocket;

-  DT_UDP4_CONTEXT * pUdp4;

+  ESL_PACKET * pNextPacket;

+  ESL_PACKET * pPacket;

+  ESL_SOCKET * pSocket;

+  ESL_UDP4_CONTEXT * pUdp4;

   EFI_UDP4_PROTOCOL * pUdp4Protocol;

   EFI_STATUS Status;

 

diff --git a/StdLib/EfiSocketLib/UseEfiSocketLib.c b/StdLib/EfiSocketLib/UseEfiSocketLib.c
index a431cc8..fc2d567 100644
--- a/StdLib/EfiSocketLib/UseEfiSocketLib.c
+++ b/StdLib/EfiSocketLib/UseEfiSocketLib.c
@@ -58,7 +58,7 @@ EslServiceGetProtocol (
   )

 {

   EFI_HANDLE ChildHandle;

-  DT_SOCKET * pSocket;

+  ESL_SOCKET * pSocket;

   int RetVal;

   EFI_STATUS Status;

 

@@ -110,10 +110,10 @@ EslServiceNetworkConnect (
   )

 {

   UINTN HandleCount;

-  EFI_HANDLE * pHandles;

   UINTN Index;

-  CONST DT_SOCKET_BINDING * pSocketBinding;

-  CONST DT_SOCKET_BINDING * pEnd;

+  CONST ESL_SOCKET_BINDING * pEnd;

+  EFI_HANDLE * pHandles;

+  CONST ESL_SOCKET_BINDING * pSocketBinding;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

@@ -191,10 +191,10 @@ EslServiceNetworkDisconnect (
   )

 {

   UINTN HandleCount;

-  EFI_HANDLE * pHandles;

   UINTN Index;

-  CONST DT_SOCKET_BINDING * pSocketBinding;

-  CONST DT_SOCKET_BINDING * pEnd;

+  CONST ESL_SOCKET_BINDING * pEnd;

+  EFI_HANDLE * pHandles;

+  CONST ESL_SOCKET_BINDING * pSocketBinding;

   EFI_STATUS Status;

 

   DBG_ENTER ( );

diff --git a/StdLib/Include/Efi/EfiSocketLib.h b/StdLib/Include/Efi/EfiSocketLib.h
index 0c6108a..6a786a2 100644
--- a/StdLib/Include/Efi/EfiSocketLib.h
+++ b/StdLib/Include/Efi/EfiSocketLib.h
@@ -117,7 +117,7 @@
 // Data Types

 //------------------------------------------------------------------------------

 

-typedef struct _DT_SERVICE DT_SERVICE;  ///<  Forward delcaration

+typedef struct _ESL_SERVICE ESL_SERVICE;  ///<  Forward delcaration

 

 /**

   Initialize the network layer

@@ -125,7 +125,7 @@ typedef struct _DT_SERVICE DT_SERVICE;  ///<  Forward delcaration
 typedef

 EFI_STATUS

 (EFIAPI * PFN_SB_INITIALIZE) (

-    IN DT_SERVICE * pService

+    IN ESL_SERVICE * pService

     );

 

 /**

@@ -134,7 +134,7 @@ EFI_STATUS
 typedef

 VOID

 (EFIAPI * PFN_SB_SHUTDOWN) (

-    IN DT_SERVICE * pService

+    IN ESL_SERVICE * pService

     );

 

 /**

@@ -148,7 +148,9 @@ typedef struct {
   CONST EFI_GUID * pTagGuid;      ///<  Tag to mark protocol in use

   PFN_SB_INITIALIZE pfnInitialize;///<  Routine to initialize the service

   PFN_SB_SHUTDOWN pfnShutdown;    ///<  Routine to shutdown the service

-} DT_SOCKET_BINDING;

+  UINTN TxIoNormal;               ///<  Number of transmit ESL_IO_MGMT structures for normal data

+  UINTN TxIoUrgent;               ///<  Number of transmit ESL_IO_MGMT structures for urgent data

+} ESL_SOCKET_BINDING;

 

 //------------------------------------------------------------------------------

 // GUIDs

@@ -162,7 +164,7 @@ extern CONST EFI_GUID mEslUdp4ServiceGuid;  ///<  Tag GUID for the UDPv4 layer
 // Data

 //------------------------------------------------------------------------------

 

-extern CONST DT_SOCKET_BINDING cEslSocketBinding[]; ///<  List of network service bindings

+extern CONST ESL_SOCKET_BINDING cEslSocketBinding[];///<  List of network service bindings

 extern CONST UINTN cEslSocketBindingEntries;        ///<  Number of network service bindings

 

 //------------------------------------------------------------------------------

@@ -264,10 +266,10 @@ EslDxeUninstall (
   Connect to the network service bindings

 

   Walk the network service protocols on the controller handle and

-  locate any that are not in use.  Create ::DT_SERVICE structures to

+  locate any that are not in use.  Create ::ESL_SERVICE structures to

   manage the network layer interfaces for the socket driver.  Tag

   each of the network interfaces that are being used.  Finally, this

-  routine calls DT_SOCKET_BINDING::pfnInitialize to prepare the network

+  routine calls ESL_SOCKET_BINDING::pfnInitialize to prepare the network

   interface for use by the socket layer.

 

   @param [in] BindingHandle    Handle for protocol binding.

@@ -287,8 +289,8 @@ EslServiceConnect (
 /**

   Shutdown the connections to the network layer by locating the

   tags on the network interfaces established by ::EslServiceConnect.

-  This routine calls DT_SOCKET_BINDING::pfnShutdown to shutdown the any

-  activity on the network interface and then free the ::DT_SERVICE

+  This routine calls ESL_SOCKET_BINDING::pfnShutdown to shutdown the any

+  activity on the network interface and then free the ::ESL_SERVICE

   structures.

 

   @param [in] BindingHandle    Handle for protocol binding.

diff --git a/StdLib/SocketDxe/DriverBinding.c b/StdLib/SocketDxe/DriverBinding.c
index 7de7f62..b3ab58f 100644
--- a/StdLib/SocketDxe/DriverBinding.c
+++ b/StdLib/SocketDxe/DriverBinding.c
@@ -38,9 +38,9 @@ DriverSupported (
   IN EFI_DEVICE_PATH_PROTOCOL * pRemainingDevicePath

   )

 {

-  CONST DT_SOCKET_BINDING * pEnd;

+  CONST ESL_SOCKET_BINDING * pEnd;

   VOID * pInterface;

-  CONST DT_SOCKET_BINDING * pSocketBinding;

+  CONST ESL_SOCKET_BINDING * pSocketBinding;

   EFI_STATUS Status;

 

   //