Patch to remove STATIC modifier. This is on longer recommended by EFI Framework codin...

[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 5ed1ec79f02e24e62cc512bf7b8733236721f508..620b6314be37237f7f31c435e3b352794a1a521a 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 - 2006, 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
@@ -37,7 +37,6 @@ Abstract:
   @return the point to just created reassemble entry.\r
 \r
 **/\r
-STATIC\r
 IP4_ASSEMBLE_ENTRY *\r
 Ip4CreateAssembleEntry (\r
   IN IP4_ADDR               Dst,\r
@@ -49,14 +48,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
@@ -80,24 +79,23 @@ Ip4CreateAssembleEntry (
   @return None\r
 \r
 **/\r
-STATIC\r
 VOID\r
 Ip4FreeAssembleEntry (\r
   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 +116,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 +135,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 +144,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
@@ -164,7 +162,6 @@ Ip4CleanAssembleTable (
   @return None\r
 \r
 **/\r
-STATIC\r
 VOID\r
 Ip4TrimPacket (\r
   IN NET_BUF                *Packet,\r
@@ -208,7 +205,6 @@ Ip4TrimPacket (
   @return None\r
 \r
 **/\r
-STATIC\r
 VOID\r
 Ip4OnFreeFragments (\r
   IN VOID                   *Arg\r
@@ -231,7 +227,6 @@ Ip4OnFreeFragments (
   @return packet if all the fragments of the packet have arrived.\r
 \r
 **/\r
-STATIC\r
 NET_BUF *\r
 Ip4Reassemble (\r
   IN IP4_ASSEMBLE_TABLE     *Table,\r
@@ -242,9 +237,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 +279,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 +339,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 +354,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 +399,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
@@ -607,6 +602,12 @@ Ip4AccpetFrame (
 \r
   Packet = NULL;\r
 \r
+  //\r
+  // Dispatch the DPCs queued by the NotifyFunction of the rx token's events\r
+  // which are signaled with received data.\r
+  //\r
+  NetLibDispatchDpc ();\r
+\r
 RESTART:\r
   Ip4ReceiveFrame (IpSb->DefaultInterface, NULL, Ip4AccpetFrame, IpSb);\r
 \r
@@ -773,7 +774,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
@@ -789,7 +790,6 @@ Ip4InstanceEnquePacket (
   @return None\r
 \r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 Ip4OnRecyclePacket (\r
@@ -801,15 +801,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
@@ -837,30 +837,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
@@ -919,7 +919,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
@@ -934,7 +934,7 @@ Ip4InstanceDeliverPacket (
         return EFI_OUT_OF_RESOURCES;\r
       }\r
 \r
-      NetListRemoveEntry (&Packet->List);\r
+      RemoveEntryList (&Packet->List);\r
 \r
     } else {\r
       //\r
@@ -954,7 +954,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
@@ -964,7 +964,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
@@ -974,9 +974,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
@@ -1011,7 +1011,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
@@ -1097,7 +1097,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
@@ -1133,7 +1133,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
@@ -1187,9 +1187,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
@@ -1205,7 +1205,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
@@ -1222,7 +1222,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