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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4Dxe / Ip4If.c

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
index a7a230d6fb22f82ba725d188a02e7348c625b4c6..d8f88e14b12778e5be2dc4603f9b5528038c9113 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4If.c
@@ -114,7 +114,7 @@ Ip4WrapLinkTxToken (
   EFI_STATUS                            Status;\r
   UINT32                                Count;\r
 \r
-  Token = NetAllocatePool (sizeof (IP4_LINK_TX_TOKEN) + \\r
+  Token = AllocatePool (sizeof (IP4_LINK_TX_TOKEN) + \\r
             (Packet->BlockOpNum - 1) * sizeof (EFI_MANAGED_NETWORK_FRAGMENT_DATA));\r
 \r
   if (Token == NULL) {\r
@@ -122,7 +122,7 @@ Ip4WrapLinkTxToken (
   }\r
 \r
   Token->Signature = IP4_FRAME_TX_SIGNATURE;\r
-  NetListInit (&Token->Link);\r
+  InitializeListHead (&Token->Link);\r
 \r
   Token->Interface  = Interface;\r
   Token->IpInstance = IpInstance;\r
@@ -137,14 +137,14 @@ Ip4WrapLinkTxToken (
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   Ip4OnFrameSent,\r
                   Token,\r
                   &MnpToken->Event\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (Token);\r
+    gBS->FreePool (Token);\r
     return NULL;\r
   }\r
 \r
@@ -184,7 +184,7 @@ Ip4FreeLinkTxToken (
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_TX_SIGNATURE);\r
 \r
   gBS->CloseEvent (Token->MnpToken.Event);\r
-  NetFreePool (Token);\r
+  gBS->FreePool (Token);\r
 }\r
 \r
 \r
@@ -208,28 +208,28 @@ Ip4CreateArpQue (
   IP4_ARP_QUE               *ArpQue;\r
   EFI_STATUS                Status;\r
 \r
-  ArpQue = NetAllocatePool (sizeof (IP4_ARP_QUE));\r
+  ArpQue = AllocatePool (sizeof (IP4_ARP_QUE));\r
 \r
   if (ArpQue == NULL) {\r
     return NULL;\r
   }\r
 \r
   ArpQue->Signature = IP4_FRAME_ARP_SIGNATURE;\r
-  NetListInit (&ArpQue->Link);\r
+  InitializeListHead (&ArpQue->Link);\r
 \r
-  NetListInit (&ArpQue->Frames);\r
+  InitializeListHead (&ArpQue->Frames);\r
   ArpQue->Interface = Interface;\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   Ip4OnArpResolved,\r
                   ArpQue,\r
                   &ArpQue->OnResolved\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (ArpQue);\r
+    gBS->FreePool (ArpQue);\r
     return NULL;\r
   }\r
 \r
@@ -265,7 +265,7 @@ Ip4FreeArpQue (
   Ip4CancelFrameArp (ArpQue, IoStatus, NULL, NULL);\r
 \r
   gBS->CloseEvent (ArpQue->OnResolved);\r
-  NetFreePool (ArpQue);\r
+  gBS->FreePool (ArpQue);\r
 }\r
 \r
 \r
@@ -294,7 +294,7 @@ Ip4CreateLinkRxToken (
   IP4_LINK_RX_TOKEN                     *Token;\r
   EFI_STATUS                            Status;\r
 \r
-  Token = NetAllocatePool (sizeof (IP4_LINK_RX_TOKEN));\r
+  Token = AllocatePool (sizeof (IP4_LINK_RX_TOKEN));\r
   if (Token == NULL) {\r
     return NULL;\r
   }\r
@@ -310,14 +310,14 @@ Ip4CreateLinkRxToken (
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   Ip4OnFrameReceived,\r
                   Token,\r
                   &MnpToken->Event\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (Token);\r
+    gBS->FreePool (Token);\r
     return NULL;\r
   }\r
 \r
@@ -345,7 +345,7 @@ Ip4FreeFrameRxToken (
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_RX_SIGNATURE);\r
 \r
   gBS->CloseEvent (Token->MnpToken.Event);\r
-  NetFreePool (Token);\r
+  gBS->FreePool (Token);\r
 }\r
 \r
 \r
@@ -371,15 +371,15 @@ Ip4CancelFrameArp (
   IN VOID                   *Context\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_LINK_TX_TOKEN         *Token;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &ArpQue->Frames) {\r
     Token = NET_LIST_USER_STRUCT (Entry, IP4_LINK_TX_TOKEN, Link);\r
 \r
     if ((FrameToCancel == NULL) || FrameToCancel (Token, Context)) {\r
-      NetListRemoveEntry (Entry);\r
+      RemoveEntryList (Entry);\r
 \r
       Token->CallBack (Token->IpInstance, Token->Packet, IoStatus, 0, Token->Context);\r
       Ip4FreeLinkTxToken (Token);\r
@@ -411,8 +411,8 @@ Ip4CancelFrames (
   IN VOID                   *Context\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ARP_QUE               *ArpQue;\r
   IP4_LINK_TX_TOKEN         *Token;\r
 \r
@@ -424,7 +424,7 @@ Ip4CancelFrames (
 \r
     Ip4CancelFrameArp (ArpQue, IoStatus, FrameToCancel, Context);\r
 \r
-    if (NetListIsEmpty (&ArpQue->Frames)) {\r
+    if (IsListEmpty (&ArpQue->Frames)) {\r
       Interface->Arp->Cancel (Interface->Arp, &ArpQue->Ip, ArpQue->OnResolved);\r
     }\r
   }\r
@@ -466,14 +466,14 @@ Ip4CreateInterface (
   IP4_INTERFACE             *Interface;\r
   EFI_SIMPLE_NETWORK_MODE   SnpMode;\r
 \r
-  Interface = NetAllocatePool (sizeof (IP4_INTERFACE));\r
+  Interface = AllocatePool (sizeof (IP4_INTERFACE));\r
 \r
   if ((Interface == NULL) || (Mnp == NULL)) {\r
     return NULL;\r
   }\r
 \r
   Interface->Signature = IP4_INTERFACE_SIGNATURE;\r
-  NetListInit (&Interface->Link);\r
+  InitializeListHead (&Interface->Link);\r
   Interface->RefCnt     = 1;\r
 \r
   Interface->Ip         = IP4_ALLZERO_ADDRESS;\r
@@ -486,8 +486,8 @@ Ip4CreateInterface (
   Interface->Arp        = NULL;\r
   Interface->ArpHandle  = NULL;\r
 \r
-  NetListInit (&Interface->ArpQues);\r
-  NetListInit (&Interface->SentFrames);\r
+  InitializeListHead (&Interface->ArpQues);\r
+  InitializeListHead (&Interface->SentFrames);\r
 \r
   Interface->RecvRequest = NULL;\r
 \r
@@ -495,7 +495,7 @@ Ip4CreateInterface (
   // Get the interface's Mac address and broadcast mac address from SNP\r
   //\r
   if (EFI_ERROR (Mnp->GetModeData (Mnp, NULL, &SnpMode))) {\r
-    NetFreePool (Interface);\r
+    gBS->FreePool (Interface);\r
     return NULL;\r
   }\r
 \r
@@ -503,7 +503,7 @@ Ip4CreateInterface (
   CopyMem (&Interface->BroadcastMac, &SnpMode.BroadcastAddress, sizeof (Interface->BroadcastMac));\r
   Interface->HwaddrLen    = SnpMode.HwAddressSize;\r
 \r
-  NetListInit (&Interface->IpInstances);\r
+  InitializeListHead (&Interface->IpInstances);\r
   Interface->PromiscRecv = FALSE;\r
 \r
   return Interface;\r
@@ -677,12 +677,12 @@ Ip4CancelReceive (
   IP4_LINK_RX_TOKEN         *Token;\r
 \r
   if ((Token = Interface->RecvRequest) != NULL) {\r
-    OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+    OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
     Interface->RecvRequest = NULL;\r
     Interface->Mnp->Cancel (Interface->Mnp, &Token->MnpToken);\r
 \r
-    NET_RESTORE_TPL (OldTpl);\r
+    gBS->RestoreTPL (OldTpl);\r
   }\r
 }\r
 \r
@@ -728,9 +728,9 @@ Ip4FreeInterface (
   Ip4CancelFrames (Interface, EFI_ABORTED, Ip4CancelInstanceFrame, NULL);\r
   Ip4CancelReceive (Interface);\r
 \r
-  ASSERT (NetListIsEmpty (&Interface->IpInstances));\r
-  ASSERT (NetListIsEmpty (&Interface->ArpQues));\r
-  ASSERT (NetListIsEmpty (&Interface->SentFrames));\r
+  ASSERT (IsListEmpty (&Interface->IpInstances));\r
+  ASSERT (IsListEmpty (&Interface->ArpQues));\r
+  ASSERT (IsListEmpty (&Interface->SentFrames));\r
 \r
   if (Interface->Arp != NULL) {\r
     gBS->CloseProtocol (\r
@@ -748,8 +748,8 @@ Ip4FreeInterface (
       );\r
   }\r
 \r
-  NetListRemoveEntry (&Interface->Link);\r
-  NetFreePool (Interface);\r
+  RemoveEntryList (&Interface->Link);\r
+  gBS->FreePool (Interface);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -773,8 +773,8 @@ Ip4OnArpResolvedDpc (
   IN VOID                   *Context\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ARP_QUE               *ArpQue;\r
   IP4_INTERFACE             *Interface;\r
   IP4_LINK_TX_TOKEN         *Token;\r
@@ -783,7 +783,7 @@ Ip4OnArpResolvedDpc (
   ArpQue = (IP4_ARP_QUE *) Context;\r
   NET_CHECK_SIGNATURE (ArpQue, IP4_FRAME_ARP_SIGNATURE);\r
 \r
-  NetListRemoveEntry (&ArpQue->Link);\r
+  RemoveEntryList (&ArpQue->Link);\r
 \r
   //\r
   // ARP resolve failed for some reason. Release all the frame\r
@@ -804,7 +804,7 @@ Ip4OnArpResolvedDpc (
   Interface = ArpQue->Interface;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &ArpQue->Frames) {\r
-    NetListRemoveEntry (Entry);\r
+    RemoveEntryList (Entry);\r
 \r
     Token         = NET_LIST_USER_STRUCT (Entry, IP4_LINK_TX_TOKEN, Link);\r
     CopyMem (&Token->DstMac, &ArpQue->Mac, sizeof (Token->DstMac));\r
@@ -816,11 +816,11 @@ Ip4OnArpResolvedDpc (
     // Status of Mnp->Transmit is not EFI_SUCCESS as in this case the\r
     // FrameSentDpc won't be queued.\r
     //\r
-    NetListInsertTail (&Interface->SentFrames, &Token->Link);\r
+    InsertTailList (&Interface->SentFrames, &Token->Link);\r
 \r
     Status = Interface->Mnp->Transmit (Interface->Mnp, &Token->MnpToken);\r
     if (EFI_ERROR (Status)) {\r
-      NetListRemoveEntry (Entry);\r
+      RemoveEntryList (Entry);\r
       Token->CallBack (Token->IpInstance, Token->Packet, Status, 0, Token->Context);\r
 \r
       Ip4FreeLinkTxToken (Token);\r
@@ -884,7 +884,7 @@ Ip4OnFrameSentDpc (
   Token = (IP4_LINK_TX_TOKEN *) Context;\r
   NET_CHECK_SIGNATURE (Token, IP4_FRAME_TX_SIGNATURE);\r
 \r
-  NetListRemoveEntry (&Token->Link);\r
+  RemoveEntryList (&Token->Link);\r
 \r
   Token->CallBack (\r
           Token->IpInstance,\r
@@ -961,7 +961,7 @@ Ip4SendFrame (
   )\r
 {\r
   IP4_LINK_TX_TOKEN         *Token;\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
   IP4_ARP_QUE               *ArpQue;\r
   EFI_ARP_PROTOCOL          *Arp;\r
   EFI_STATUS                Status;\r
@@ -1034,7 +1034,7 @@ Ip4SendFrame (
   // Found a pending ARP request, enqueue the frame then return\r
   //\r
   if (Entry != &Interface->ArpQues) {\r
-    NetListInsertTail (&ArpQue->Frames, &Token->Link);\r
+    InsertTailList (&ArpQue->Frames, &Token->Link);\r
     return EFI_SUCCESS;\r
   }\r
 \r
@@ -1055,8 +1055,8 @@ Ip4SendFrame (
     goto ON_ERROR;\r
   }\r
 \r
-  NetListInsertHead (&ArpQue->Frames, &Token->Link);\r
-  NetListInsertHead (&Interface->ArpQues, &ArpQue->Link);\r
+  InsertHeadList (&ArpQue->Frames, &Token->Link);\r
+  InsertHeadList (&Interface->ArpQues, &ArpQue->Link);\r
   return EFI_SUCCESS;\r
 \r
 SEND_NOW:\r
@@ -1064,10 +1064,10 @@ SEND_NOW:
   // Insert the tx token into the SentFrames list before calling Mnp->Transmit.\r
   // Remove it if the returned status is not EFI_SUCCESS.\r
   //\r
-  NetListInsertTail (&Interface->SentFrames, &Token->Link);\r
+  InsertTailList (&Interface->SentFrames, &Token->Link);\r
   Status = Interface->Mnp->Transmit (Interface->Mnp, &Token->MnpToken);\r
   if (EFI_ERROR (Status)) {\r
-    NetListRemoveEntry (&Interface->SentFrames);\r
+    RemoveEntryList (&Interface->SentFrames);\r
     goto ON_ERROR;\r
   }\r
 \r