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

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

diff --git a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
index 06a011031597ff08fa7935918dba19b9cdf96a61..9498d056e16eb06d99d99742ccc62f431c6a8922 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
+++ b/MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Input.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2005 - 2007, Intel Corporation                                                         \r
+Copyright (c) 2005 - 2007, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -49,14 +49,14 @@ Ip4CreateAssembleEntry (
 \r
   IP4_ASSEMBLE_ENTRY        *Assemble;\r
 \r
-  Assemble = NetAllocatePool (sizeof (IP4_ASSEMBLE_ENTRY));\r
+  Assemble = AllocatePool (sizeof (IP4_ASSEMBLE_ENTRY));\r
 \r
   if (Assemble == NULL) {\r
     return NULL;\r
   }\r
 \r
-  NetListInit (&Assemble->Link);\r
-  NetListInit (&Assemble->Fragments);\r
+  InitializeListHead (&Assemble->Link);\r
+  InitializeListHead (&Assemble->Fragments);\r
 \r
   Assemble->Dst      = Dst;\r
   Assemble->Src      = Src;\r
@@ -86,18 +86,18 @@ Ip4FreeAssembleEntry (
   IN IP4_ASSEMBLE_ENTRY     *Assemble\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   NET_BUF                   *Fragment;\r
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Assemble->Fragments) {\r
     Fragment = NET_LIST_USER_STRUCT (Entry, NET_BUF, List);\r
 \r
-    NetListRemoveEntry (Entry);\r
+    RemoveEntryList (Entry);\r
     NetbufFree (Fragment);\r
   }\r
 \r
-  NetFreePool (Assemble);\r
+  gBS->FreePool (Assemble);\r
 }\r
 \r
 \r
@@ -118,7 +118,7 @@ Ip4InitAssembleTable (
   UINT32                    Index;\r
 \r
   for (Index = 0; Index < IP4_ASSEMLE_HASH_SIZE; Index++) {\r
-    NetListInit (&Table->Bucket[Index]);\r
+    InitializeListHead (&Table->Bucket[Index]);\r
   }\r
 }\r
 \r
@@ -137,8 +137,8 @@ Ip4CleanAssembleTable (
   IN IP4_ASSEMBLE_TABLE     *Table\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_ASSEMBLE_ENTRY        *Assemble;\r
   UINT32                    Index;\r
 \r
@@ -146,7 +146,7 @@ Ip4CleanAssembleTable (
     NET_LIST_FOR_EACH_SAFE (Entry, Next, &Table->Bucket[Index]) {\r
       Assemble = NET_LIST_USER_STRUCT (Entry, IP4_ASSEMBLE_ENTRY, Link);\r
 \r
-      NetListRemoveEntry (Entry);\r
+      RemoveEntryList (Entry);\r
       Ip4FreeAssembleEntry (Assemble);\r
     }\r
   }\r
@@ -242,9 +242,9 @@ Ip4Reassemble (
   IP4_CLIP_INFO             *This;\r
   IP4_CLIP_INFO             *Node;\r
   IP4_ASSEMBLE_ENTRY        *Assemble;\r
-  NET_LIST_ENTRY            *Head;\r
-  NET_LIST_ENTRY            *Prev;\r
-  NET_LIST_ENTRY            *Cur;\r
+  LIST_ENTRY                *Head;\r
+  LIST_ENTRY                *Prev;\r
+  LIST_ENTRY                *Cur;\r
   NET_BUF                   *Fragment;\r
   NET_BUF                   *NewPacket;\r
   INTN                      Index;\r
@@ -284,7 +284,7 @@ Ip4Reassemble (
       goto DROP;\r
     }\r
 \r
-    NetListInsertHead (&Table->Bucket[Index], &Assemble->Link);\r
+    InsertHeadList (&Table->Bucket[Index], &Assemble->Link);\r
   }\r
 \r
   //\r
@@ -344,7 +344,7 @@ Ip4Reassemble (
     if (Node->End <= This->End) {\r
       Cur = Cur->ForwardLink;\r
 \r
-      NetListRemoveEntry (&Fragment->List);\r
+      RemoveEntryList (&Fragment->List);\r
       Assemble->CurLen -= Node->Length;\r
 \r
       NetbufFree (Fragment);\r
@@ -359,7 +359,7 @@ Ip4Reassemble (
     //\r
     if (Node->Start < This->End) {\r
       if (This->Start == Node->Start) {\r
-        NetListRemoveEntry (&Packet->List);\r
+        RemoveEntryList (&Packet->List);\r
         goto DROP;\r
       }\r
 \r
@@ -404,7 +404,7 @@ Ip4Reassemble (
   //\r
   if ((Assemble->TotalLen != 0) && (Assemble->CurLen >= Assemble->TotalLen)) {\r
 \r
-    NetListRemoveEntry (&Assemble->Link);\r
+    RemoveEntryList (&Assemble->Link);\r
 \r
     //\r
     // If the packet is properly formated, the last fragment's End\r
@@ -779,7 +779,7 @@ Ip4InstanceEnquePacket (
   Info        = IP4_GET_CLIP_INFO (Clone);\r
   Info->Life  = IP4_US_TO_SEC (IpInstance->ConfigData.ReceiveTimeout);\r
 \r
-  NetListInsertTail (&IpInstance->Received, &Clone->List);\r
+  InsertTailList (&IpInstance->Received, &Clone->List);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -807,15 +807,15 @@ Ip4OnRecyclePacket (
 \r
   Wrap = (IP4_RXDATA_WRAP *) Context;\r
 \r
-  NET_TRYLOCK (&Wrap->IpInstance->RecycleLock);\r
-  NetListRemoveEntry (&Wrap->Link);\r
-  NET_UNLOCK (&Wrap->IpInstance->RecycleLock);\r
+  EfiAcquireLockOrFail (&Wrap->IpInstance->RecycleLock);\r
+  RemoveEntryList (&Wrap->Link);\r
+  EfiReleaseLock (&Wrap->IpInstance->RecycleLock);\r
 \r
   ASSERT (!NET_BUF_SHARED (Wrap->Packet));\r
   NetbufFree (Wrap->Packet);\r
 \r
   gBS->CloseEvent (Wrap->RxData.RecycleSignal);\r
-  NetFreePool (Wrap);\r
+  gBS->FreePool (Wrap);\r
 }\r
 \r
 \r
@@ -843,30 +843,30 @@ Ip4WrapRxData (
   EFI_IP4_RECEIVE_DATA      *RxData;\r
   EFI_STATUS                Status;\r
 \r
-  Wrap = NetAllocatePool (IP4_RXDATA_WRAP_SIZE (Packet->BlockOpNum));\r
+  Wrap = AllocatePool (IP4_RXDATA_WRAP_SIZE (Packet->BlockOpNum));\r
 \r
   if (Wrap == NULL) {\r
     return NULL;\r
   }\r
 \r
-  NetListInit (&Wrap->Link);\r
+  InitializeListHead (&Wrap->Link);\r
 \r
   Wrap->IpInstance  = IpInstance;\r
   Wrap->Packet      = Packet;\r
   RxData            = &Wrap->RxData;\r
 \r
-  NetZeroMem (&RxData->TimeStamp, sizeof (EFI_TIME));\r
+  ZeroMem (&RxData->TimeStamp, sizeof (EFI_TIME));\r
 \r
   Status = gBS->CreateEvent (\r
                   EVT_NOTIFY_SIGNAL,\r
-                  NET_TPL_RECYCLE,\r
+                  TPL_NOTIFY,\r
                   Ip4OnRecyclePacket,\r
                   Wrap,\r
                   &RxData->RecycleSignal\r
                   );\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NetFreePool (Wrap);\r
+    gBS->FreePool (Wrap);\r
     return NULL;\r
   }\r
 \r
@@ -925,7 +925,7 @@ Ip4InstanceDeliverPacket (
   //\r
   // Deliver a packet if there are both a packet and a receive token.\r
   //\r
-  while (!NetListIsEmpty (&IpInstance->Received) &&\r
+  while (!IsListEmpty (&IpInstance->Received) &&\r
          !NetMapIsEmpty (&IpInstance->RxTokens)) {\r
 \r
     Packet = NET_LIST_HEAD (&IpInstance->Received, NET_BUF, List);\r
@@ -940,7 +940,7 @@ Ip4InstanceDeliverPacket (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      NetListRemoveEntry (&Packet->List);\r
+      RemoveEntryList (&Packet->List);\r
 \r
     } else {\r
       //\r
@@ -960,7 +960,7 @@ Ip4InstanceDeliverPacket (
       Head    = NetbufAllocSpace (Dup, IP4_MAX_HEADLEN, NET_BUF_HEAD);\r
       Dup->Ip = (IP4_HEAD *) Head;\r
 \r
-      NetCopyMem (Head, Packet->Ip, Packet->Ip->HeadLen << 2);\r
+      CopyMem (Head, Packet->Ip, Packet->Ip->HeadLen << 2);\r
       NetbufTrim (Dup, IP4_MAX_HEADLEN, TRUE);\r
 \r
       Wrap = Ip4WrapRxData (IpInstance, Dup);\r
@@ -970,7 +970,7 @@ Ip4InstanceDeliverPacket (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      NetListRemoveEntry (&Packet->List);\r
+      RemoveEntryList (&Packet->List);\r
       NetbufFree (Packet);\r
 \r
       Packet = Dup;\r
@@ -980,9 +980,9 @@ Ip4InstanceDeliverPacket (
     // Insert it into the delivered packet, then get a user's\r
     // receive token, pass the wrapped packet up.\r
     //\r
-    NET_TRYLOCK (&IpInstance->RecycleLock);\r
-    NetListInsertHead (&IpInstance->Delivered, &Wrap->Link);\r
-    NET_UNLOCK (&IpInstance->RecycleLock);\r
+    EfiAcquireLockOrFail (&IpInstance->RecycleLock);\r
+    InsertHeadList (&IpInstance->Delivered, &Wrap->Link);\r
+    EfiReleaseLock (&IpInstance->RecycleLock);\r
 \r
     Token                = NetMapRemoveHead (&IpInstance->RxTokens, NULL);\r
     Token->Status        = IP4_GET_CLIP_INFO (Packet)->Status;\r
@@ -1017,7 +1017,7 @@ Ip4InterfaceEnquePacket (
 {\r
   IP4_PROTOCOL              *IpInstance;\r
   IP4_CLIP_INFO             *Info;\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
   INTN                      Enqueued;\r
   INTN                      LocalType;\r
   INTN                      SavedType;\r
@@ -1103,7 +1103,7 @@ Ip4InterfaceDeliverPacket (
   )\r
 {\r
   IP4_PROTOCOL              *Ip4Instance;\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
 \r
   NET_LIST_FOR_EACH (Entry, &IpIf->IpInstances) {\r
     Ip4Instance = NET_LIST_USER_STRUCT (Entry, IP4_PROTOCOL, AddrLink);\r
@@ -1139,7 +1139,7 @@ Ip4Demultiplex (
   IN NET_BUF                *Packet\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
+  LIST_ENTRY                *Entry;\r
   IP4_INTERFACE             *IpIf;\r
   INTN                      Enqueued;\r
 \r
@@ -1193,9 +1193,9 @@ Ip4PacketTimerTicking (
   IN IP4_SERVICE            *IpSb\r
   )\r
 {\r
-  NET_LIST_ENTRY            *InstanceEntry;\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *InstanceEntry;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   IP4_PROTOCOL              *IpInstance;\r
   IP4_ASSEMBLE_ENTRY        *Assemble;\r
   NET_BUF                   *Packet;\r
@@ -1211,7 +1211,7 @@ Ip4PacketTimerTicking (
       Assemble = NET_LIST_USER_STRUCT (Entry, IP4_ASSEMBLE_ENTRY, Link);\r
 \r
       if ((Assemble->Life > 0) && (--Assemble->Life == 0)) {\r
-        NetListRemoveEntry (Entry);\r
+        RemoveEntryList (Entry);\r
         Ip4FreeAssembleEntry (Assemble);\r
       }\r
     }\r
@@ -1228,7 +1228,7 @@ Ip4PacketTimerTicking (
       Info   = IP4_GET_CLIP_INFO (Packet);\r
 \r
       if ((Info->Life > 0) && (--Info->Life == 0)) {\r
-        NetListRemoveEntry (Entry);\r
+        RemoveEntryList (Entry);\r
         NetbufFree (Packet);\r
       }\r
     }\r