Use Mde library and definition instead of some native definitions in NetLib, to simpl...

[mirror_edk2.git] / MdeModulePkg / Library / DxeUdpIoLib / DxeUdpIoLib.c

diff --git a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
index b1329f860425bb26ef22922b0a9183d0b83964bb..864da9b986b22ef779581d2cf1a33988fe2d3405 100644 (file)
--- a/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
+++ b/MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.c
@@ -30,7 +30,7 @@ Abstract:
 #include <Library/DebugLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
-#include <library/BaseMemoryLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
 \r
 STATIC\r
 VOID\r
@@ -87,7 +87,7 @@ UdpIoWrapTx (
   UINT32                    Count;\r
   IP4_ADDR                  Ip;\r
 \r
-  Token = NetAllocatePool (sizeof (UDP_TX_TOKEN) +\r
+  Token = AllocatePool (sizeof (UDP_TX_TOKEN) +\r
                            sizeof (EFI_UDP4_FRAGMENT_DATA) * (Packet->BlockOpNum - 1));\r
 \r
   if (Token == NULL) {\r
@@ -95,7 +95,7 @@ UdpIoWrapTx (
   }\r
 \r
   Token->Signature  = UDP_IO_TX_SIGNATURE;\r
-  NetListInit (&Token->Link);\r
+  InitializeListHead (&Token->Link);\r
 \r
   Token->UdpIo      = UdpIo;\r
   Token->CallBack   = CallBack;\r
@@ -107,14 +107,14 @@ UdpIoWrapTx (
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   UdpIoOnDgramSent,\r
                   Token,\r
                   &UdpToken->Event\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (Token);\r
+    gBS->FreePool (Token);\r
     return NULL;\r
   }\r
 \r
@@ -126,10 +126,10 @@ UdpIoWrapTx (
 \r
   if (EndPoint != NULL) {\r
     Ip = HTONL (EndPoint->LocalAddr);\r
-    NetCopyMem (&Token->UdpSession.SourceAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Token->UdpSession.SourceAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     Ip = HTONL (EndPoint->RemoteAddr);\r
-    NetCopyMem (&Token->UdpSession.DestinationAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Token->UdpSession.DestinationAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     Token->UdpSession.SourcePort      = EndPoint->LocalPort;\r
     Token->UdpSession.DestinationPort = EndPoint->RemotePort;\r
@@ -138,7 +138,7 @@ UdpIoWrapTx (
 \r
   if (Gateway != 0) {\r
     Ip = HTONL (Gateway);\r
-    NetCopyMem (&Token->Gateway, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
+    CopyMem (&Token->Gateway, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
 \r
     UdpTxData->GatewayAddress = &Token->Gateway;\r
   }\r
@@ -166,7 +166,7 @@ UdpIoFreeTxToken (
   )\r
 {\r
   gBS->CloseEvent (Token->UdpToken.Event);\r
-  NetFreePool (Token);\r
+  gBS->FreePool (Token);\r
 }\r
 \r
 \r
@@ -192,7 +192,7 @@ UdpIoCreateRxToken (
   UDP_RX_TOKEN              *Token;\r
   EFI_STATUS                Status;\r
 \r
-  Token = NetAllocatePool (sizeof (UDP_RX_TOKEN));\r
+  Token = AllocatePool (sizeof (UDP_RX_TOKEN));\r
 \r
   if (Token == NULL) {\r
     return NULL;\r
@@ -209,14 +209,14 @@ UdpIoCreateRxToken (
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   UdpIoOnDgramRcvd,\r
                   Token,\r
                   &Token->UdpToken.Event\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (Token);\r
+    gBS->FreePool (Token);\r
     return NULL;\r
   }\r
 \r
@@ -238,7 +238,7 @@ UdpIoFreeRxToken (
   )\r
 {\r
   gBS->CloseEvent (Token->UdpToken.Event);\r
-  NetFreePool (Token);\r
+  gBS->FreePool (Token);\r
 }\r
 \r
 \r
@@ -268,20 +268,20 @@ UdpIoCreatePort (
 \r
   ASSERT (Configure != NULL);\r
 \r
-  UdpIo = NetAllocatePool (sizeof (UDP_IO_PORT));\r
+  UdpIo = AllocatePool (sizeof (UDP_IO_PORT));\r
 \r
   if (UdpIo == NULL) {\r
     return NULL;\r
   }\r
 \r
   UdpIo->Signature    = UDP_IO_SIGNATURE;\r
-  NetListInit (&UdpIo->Link);\r
+  InitializeListHead (&UdpIo->Link);\r
   UdpIo->RefCnt       = 1;\r
 \r
   UdpIo->Controller   = Controller;\r
   UdpIo->Image        = Image;\r
 \r
-  NetListInit (&UdpIo->SentDatagram);\r
+  InitializeListHead (&UdpIo->SentDatagram);\r
   UdpIo->RecvRequest  = NULL;\r
   UdpIo->UdpHandle    = NULL;\r
 \r
@@ -336,7 +336,7 @@ FREE_CHILD:
     );\r
 \r
 FREE_MEM:\r
-  NetFreePool (UdpIo);\r
+  gBS->FreePool (UdpIo);\r
   return NULL;\r
 }\r
 \r
@@ -363,8 +363,8 @@ UdpIoCancelDgrams (
   IN VOID                   *Context\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   UDP_TX_TOKEN              *Token;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &UdpIo->SentDatagram) {\r
@@ -425,10 +425,10 @@ UdpIoFreePort (
     );\r
 \r
   if (!IsListEmpty(&UdpIo->Link)) {\r
-    NetListRemoveEntry (&UdpIo->Link);\r
+    RemoveEntryList (&UdpIo->Link);\r
   }\r
 \r
-  NetFreePool (UdpIo);\r
+  gBS->FreePool (UdpIo);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -485,7 +485,7 @@ UdpIoOnDgramSentDpc (
   Token   = (UDP_TX_TOKEN *) Context;\r
   ASSERT (Token->Signature == UDP_IO_TX_SIGNATURE);\r
 \r
-  NetListRemoveEntry (&Token->Link);\r
+  RemoveEntryList (&Token->Link);\r
   Token->CallBack (Token->Packet, NULL, Token->UdpToken.Status, Token->Context);\r
 \r
   UdpIoFreeTxToken (Token);\r
@@ -554,10 +554,10 @@ UdpIoSendDatagram (
   // Insert the tx token into SendDatagram list before transmitting it. Remove\r
   // it from the list if the returned status is not EFI_SUCCESS.\r
   //\r
-  NetListInsertHead (&UdpIo->SentDatagram, &Token->Link);\r
+  InsertHeadList (&UdpIo->SentDatagram, &Token->Link);\r
   Status = UdpIo->Udp->Transmit (UdpIo->Udp, &Token->UdpToken);\r
   if (EFI_ERROR (Status)) {\r
-    NetListRemoveEntry (&Token->Link);\r
+    RemoveEntryList (&Token->Link);\r
     UdpIoFreeTxToken (Token);\r
     return Status;\r
   }\r
@@ -708,8 +708,8 @@ UdpIoOnDgramRcvdDpc (
   Points.LocalPort  = UdpSession->DestinationPort;\r
   Points.RemotePort = UdpSession->SourcePort;\r
 \r
-  NetCopyMem (&Points.LocalAddr, &UdpSession->DestinationAddress, sizeof (IP4_ADDR));\r
-  NetCopyMem (&Points.RemoteAddr, &UdpSession->SourceAddress, sizeof (IP4_ADDR));\r
+  CopyMem (&Points.LocalAddr, &UdpSession->DestinationAddress, sizeof (IP4_ADDR));\r
+  CopyMem (&Points.RemoteAddr, &UdpSession->SourceAddress, sizeof (IP4_ADDR));\r
   Points.LocalAddr  = NTOHL (Points.LocalAddr);\r
   Points.RemoteAddr = NTOHL (Points.RemoteAddr);\r
 \r