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

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

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index 2dd6e60bb58496d7e2e85d89f85d7466a95ae10b..4674d7d028aa49f8ad9d93ad53dce93ed6fdfded 100644 (file)
--- a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
+++ b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
@@ -36,7 +36,7 @@ Abstract:
 #define ICMP_ERRLEN(IpHdr) \\r
   (sizeof(IP4_ICMP_HEAD) + EFI_IP4_HEADER_LEN(IpHdr) + 8)\r
 \r
-NET_LIST_ENTRY  mActiveIpIoList = {\r
+LIST_ENTRY  mActiveIpIoList = {\r
   &mActiveIpIoList,\r
   &mActiveIpIoList\r
 };\r
@@ -388,7 +388,7 @@ IpIoCreateSndEntry (
   //\r
   // Allocate resource for SndEntry\r
   //\r
-  SndEntry = NetAllocatePool (sizeof (IP_IO_SEND_ENTRY));\r
+  SndEntry = AllocatePool (sizeof (IP_IO_SEND_ENTRY));\r
   if (NULL == SndEntry) {\r
     return NULL;\r
   }\r
@@ -396,14 +396,14 @@ IpIoCreateSndEntry (
   //\r
   // Allocate resource for SndToken\r
   //\r
-  SndToken = NetAllocatePool (sizeof (EFI_IP4_COMPLETION_TOKEN));\r
+  SndToken = AllocatePool (sizeof (EFI_IP4_COMPLETION_TOKEN));\r
   if (NULL == SndToken) {\r
     goto ReleaseSndEntry;\r
   }\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   IpIoTransmitHandler,\r
                   SndEntry,\r
                   &(SndToken->Event)\r
@@ -415,7 +415,7 @@ IpIoCreateSndEntry (
   //\r
   // Allocate resource for TxData\r
   //\r
-  TxData = NetAllocatePool (\r
+  TxData = AllocatePool (\r
     sizeof (EFI_IP4_TRANSMIT_DATA) +\r
     sizeof (EFI_IP4_FRAGMENT_DATA) * (Pkt->BlockOpNum - 1)\r
     );\r
@@ -430,7 +430,7 @@ IpIoCreateSndEntry (
   OverrideData = NULL;\r
   if (NULL != Override) {\r
 \r
-    OverrideData = NetAllocatePool (sizeof (EFI_IP4_OVERRIDE_DATA));\r
+    OverrideData = AllocatePool (sizeof (EFI_IP4_OVERRIDE_DATA));\r
     if (NULL == OverrideData) {\r
       goto ReleaseResource;\r
     }\r
@@ -443,7 +443,7 @@ IpIoCreateSndEntry (
   //\r
   // Set the fields of TxData\r
   //\r
-  NetCopyMem (&TxData->DestinationAddress, &Dest, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&TxData->DestinationAddress, &Dest, sizeof (EFI_IPv4_ADDRESS));\r
   TxData->OverrideData                  = OverrideData;\r
   TxData->OptionsLength                 = 0;\r
   TxData->OptionsBuffer                 = NULL;\r
@@ -474,21 +474,21 @@ IpIoCreateSndEntry (
 \r
   SndEntry->SndToken = SndToken;\r
 \r
-  NetListInsertTail (&IpIo->PendingSndList, &SndEntry->Entry);\r
+  InsertTailList (&IpIo->PendingSndList, &SndEntry->Entry);\r
 \r
   return SndEntry;\r
 \r
 ReleaseResource:\r
-  NetFreePool (TxData);\r
+  gBS->FreePool (TxData);\r
 \r
 ReleaseEvent:\r
   gBS->CloseEvent (SndToken->Event);\r
 \r
 ReleaseSndToken:\r
-  NetFreePool (SndToken);\r
+  gBS->FreePool (SndToken);\r
 \r
 ReleaseSndEntry:\r
-  NetFreePool (SndEntry);\r
+  gBS->FreePool (SndEntry);\r
 \r
   return NULL;\r
 }\r
@@ -513,17 +513,17 @@ IpIoDestroySndEntry (
   TxData = SndEntry->SndToken->Packet.TxData;\r
 \r
   if (NULL != TxData->OverrideData) {\r
-    NetFreePool (TxData->OverrideData);\r
+    gBS->FreePool (TxData->OverrideData);\r
   }\r
 \r
-  NetFreePool (TxData);\r
+  gBS->FreePool (TxData);\r
   NetbufFree (SndEntry->Pkt);\r
   gBS->CloseEvent (SndEntry->SndToken->Event);\r
 \r
-  NetFreePool (SndEntry->SndToken);\r
-  NetListRemoveEntry (&SndEntry->Entry);\r
+  gBS->FreePool (SndEntry->SndToken);\r
+  RemoveEntryList (&SndEntry->Entry);\r
 \r
-  NetFreePool (SndEntry);\r
+  gBS->FreePool (SndEntry);\r
 }\r
 \r
 \r
@@ -791,19 +791,19 @@ IpIoCreate (
   EFI_STATUS  Status;\r
   IP_IO       *IpIo;\r
 \r
-  IpIo = NetAllocateZeroPool (sizeof (IP_IO));\r
+  IpIo = AllocateZeroPool (sizeof (IP_IO));\r
   if (NULL == IpIo) {\r
     return NULL;\r
   }\r
 \r
-  NetListInit (&(IpIo->PendingSndList));\r
-  NetListInit (&(IpIo->IpList));\r
+  InitializeListHead (&(IpIo->PendingSndList));\r
+  InitializeListHead (&(IpIo->IpList));\r
   IpIo->Controller  = Controller;\r
   IpIo->Image       = Image;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   IpIoListenHandler,\r
                   IpIo,\r
                   &(IpIo->RcvToken.Event)\r
@@ -833,7 +833,7 @@ ReleaseIpIo:
     gBS->CloseEvent (IpIo->RcvToken.Event);\r
   }\r
 \r
-  NetFreePool (IpIo);\r
+  gBS->FreePool (IpIo);\r
 \r
   return NULL;\r
 }\r
@@ -902,7 +902,7 @@ IpIoOpen (
   }\r
 \r
   IpIo->IsConfigured = TRUE;\r
-  NetListInsertTail (&mActiveIpIoList, &IpIo->Entry);\r
+  InsertTailList (&mActiveIpIoList, &IpIo->Entry);\r
 \r
 ErrorExit:\r
 \r
@@ -935,7 +935,7 @@ IpIoStop (
   //\r
   // Remove the IpIo from the active IpIo list.\r
   //\r
-  NetListRemoveEntry (&IpIo->Entry);\r
+  RemoveEntryList (&IpIo->Entry);\r
 \r
   Ip = IpIo->Ip;\r
 \r
@@ -953,7 +953,7 @@ IpIoStop (
   // Detroy the Ip List used by IpIo\r
   //\r
 \r
-  while (!NetListIsEmpty (&(IpIo->IpList))) {\r
+  while (!IsListEmpty (&(IpIo->IpList))) {\r
     IpInfo = NET_LIST_HEAD (&(IpIo->IpList), IP_IO_IP_INFO, Entry);\r
 \r
     IpIoRemoveIp (IpIo, IpInfo);\r
@@ -962,7 +962,7 @@ IpIoStop (
   //\r
   // All pending snd tokens should be flushed by reseting the IP instances.\r
   //\r
-  ASSERT (NetListIsEmpty (&IpIo->PendingSndList));\r
+  ASSERT (IsListEmpty (&IpIo->PendingSndList));\r
 \r
   //\r
   // Close the receive event.\r
@@ -998,7 +998,7 @@ IpIoDestroy (
   //\r
   IpIoCloseProtocolDestroyIpChild (IpIo->Controller, IpIo->Image, IpIo->ChildHandle);\r
 \r
-  NetFreePool (IpIo);\r
+  gBS->FreePool (IpIo);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1077,7 +1077,7 @@ IpIoCancelTxToken (
   IN VOID   *Packet\r
   )\r
 {\r
-  NET_LIST_ENTRY    *Node;\r
+  LIST_ENTRY        *Node;\r
   IP_IO_SEND_ENTRY  *SndEntry;\r
   EFI_IP4_PROTOCOL  *Ip;\r
 \r
@@ -1118,7 +1118,7 @@ IpIoAddIp (
 \r
   ASSERT (IpIo);\r
 \r
-  IpInfo = NetAllocatePool (sizeof (IP_IO_IP_INFO));\r
+  IpInfo = AllocatePool (sizeof (IP_IO_IP_INFO));\r
   if (IpInfo == NULL) {\r
     return IpInfo;\r
   }\r
@@ -1127,7 +1127,7 @@ IpIoAddIp (
   // Init this IpInfo, set the Addr and SubnetMask to 0 before we configure the IP\r
   // instance.\r
   //\r
-  NetListInit (&IpInfo->Entry);\r
+  InitializeListHead (&IpInfo->Entry);\r
   IpInfo->ChildHandle = NULL;\r
   IpInfo->Addr        = 0;\r
   IpInfo->SubnetMask  = 0;\r
@@ -1151,7 +1151,7 @@ IpIoAddIp (
   //\r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   IpIoDummyHandler,\r
                   IpInfo,\r
                   &IpInfo->DummyRcvToken.Event\r
@@ -1163,7 +1163,7 @@ IpIoAddIp (
   //\r
   // Link this IpInfo into the IpIo.\r
   //\r
-  NetListInsertTail (&IpIo->IpList, &IpInfo->Entry);\r
+  InsertTailList (&IpIo->IpList, &IpInfo->Entry);\r
 \r
   return IpInfo;\r
 \r
@@ -1177,7 +1177,7 @@ ReleaseIpChild:
 \r
 ReleaseIpInfo:\r
 \r
-  NetFreePool (IpInfo);\r
+  gBS->FreePool (IpInfo);\r
 \r
   return NULL;\r
 }\r
@@ -1236,8 +1236,8 @@ IpIoConfigIp (
       Ip4ConfigData->SubnetMask     = Ip4ModeData.ConfigData.SubnetMask;\r
     }\r
 \r
-    NetCopyMem (&IpInfo->Addr, &Ip4ConfigData->StationAddress, sizeof (IP4_ADDR));\r
-    NetCopyMem (&IpInfo->SubnetMask, &Ip4ConfigData->SubnetMask, sizeof (IP4_ADDR));\r
+    CopyMem (&IpInfo->Addr, &Ip4ConfigData->StationAddress, sizeof (IP4_ADDR));\r
+    CopyMem (&IpInfo->SubnetMask, &Ip4ConfigData->SubnetMask, sizeof (IP4_ADDR));\r
 \r
     Status = Ip->Receive (Ip, &IpInfo->DummyRcvToken);\r
     if (EFI_ERROR (Status)) {\r
@@ -1283,7 +1283,7 @@ IpIoRemoveIp (
     return;\r
   }\r
 \r
-  NetListRemoveEntry (&IpInfo->Entry);\r
+  RemoveEntryList (&IpInfo->Entry);\r
 \r
   IpInfo->Ip->Configure (IpInfo->Ip, NULL);\r
 \r
@@ -1291,7 +1291,7 @@ IpIoRemoveIp (
 \r
   gBS->CloseEvent (IpInfo->DummyRcvToken.Event);\r
 \r
-  NetFreePool (IpInfo);\r
+  gBS->FreePool (IpInfo);\r
 }\r
 \r
 \r
@@ -1312,9 +1312,9 @@ IpIoFindSender (
   IN     IP4_ADDR  Src\r
   )\r
 {\r
-  NET_LIST_ENTRY  *IpIoEntry;\r
+  LIST_ENTRY      *IpIoEntry;\r
   IP_IO           *IpIoPtr;\r
-  NET_LIST_ENTRY  *IpInfoEntry;\r
+  LIST_ENTRY      *IpInfoEntry;\r
   IP_IO_IP_INFO   *IpInfo;\r
 \r
   NET_LIST_FOR_EACH (IpIoEntry, &mActiveIpIoList) {\r