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

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

diff --git a/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c b/MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.c
index 279ada7b11e63adeefaa68f23f037497371d9234..d55ee8b0ce6caaa1cc3b278a93ccb38cbe588748 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
@@ -58,7 +58,7 @@ EFI_IP4_CONFIG_DATA  mIpIoDefaultIpConfigData = {
   0\r
 };\r
 \r
-STATIC ICMP_ERROR_INFO  mIcmpErrMap[10] = {\r
+ICMP_ERROR_INFO  mIcmpErrMap[10] = {\r
   {FALSE, TRUE},\r
   {FALSE, TRUE},\r
   {TRUE, TRUE},\r
@@ -71,14 +71,12 @@ STATIC ICMP_ERROR_INFO  mIcmpErrMap[10] = {
   {FALSE, TRUE}\r
 };\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoTransmitHandlerDpc (\r
   IN VOID      *Context\r
   );\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoTransmitHandler (\r
@@ -101,7 +99,6 @@ IpIoTransmitHandler (
   @retval other                 The required operation failed.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 IpIoCreateIpChildOpenProtocol (\r
   IN  EFI_HANDLE  ControllerHandle,\r
@@ -164,7 +161,6 @@ IpIoCreateIpChildOpenProtocol (
   @retval other                 The required operation failed.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 IpIoCloseProtocolDestroyIpChild (\r
   IN EFI_HANDLE  ControllerHandle,\r
@@ -209,7 +205,6 @@ IpIoCloseProtocolDestroyIpChild (
   @retval EFI_ABORTED           This type of ICMP packet is not supported.\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 IpIoIcmpHandler (\r
   IN IP_IO                *IpIo,\r
@@ -341,7 +336,6 @@ IpIoIcmpHandler (
   @return None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 IpIoExtFree (\r
   IN VOID  *Event\r
@@ -366,7 +360,6 @@ IpIoExtFree (
   @return resource limit occurred.\r
 \r
 **/\r
-STATIC\r
 IP_IO_SEND_ENTRY *\r
 IpIoCreateSndEntry (\r
   IN IP_IO             *IpIo,\r
@@ -388,7 +381,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 +389,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 +408,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 +423,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 +436,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 +467,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
@@ -502,7 +495,6 @@ ReleaseSndEntry:
   @return None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 IpIoDestroySndEntry (\r
   IN IP_IO_SEND_ENTRY  *SndEntry\r
@@ -513,17 +505,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
@@ -535,7 +527,6 @@ IpIoDestroySndEntry (
   @return None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoTransmitHandlerDpc (\r
@@ -571,7 +562,6 @@ IpIoTransmitHandlerDpc (
 \r
 **/\r
 \r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoTransmitHandler (\r
@@ -594,7 +584,6 @@ IpIoTransmitHandler (
   @return None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoDummyHandlerDpc (\r
@@ -631,7 +620,6 @@ IpIoDummyHandlerDpc (
   @return None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoDummyHandler (\r
@@ -655,7 +643,6 @@ IpIoDummyHandler (
   @return None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoListenHandlerDpc (\r
@@ -757,7 +744,6 @@ Resume:
   @return None.\r
 \r
 **/\r
-STATIC\r
 VOID\r
 EFIAPI\r
 IpIoListenHandler (\r
@@ -783,6 +769,7 @@ IpIoListenHandler (
 \r
 **/\r
 IP_IO *\r
+EFIAPI\r
 IpIoCreate (\r
   IN EFI_HANDLE Image,\r
   IN EFI_HANDLE Controller\r
@@ -791,19 +778,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 +820,7 @@ ReleaseIpIo:
     gBS->CloseEvent (IpIo->RcvToken.Event);\r
   }\r
 \r
-  NetFreePool (IpIo);\r
+  gBS->FreePool (IpIo);\r
 \r
   return NULL;\r
 }\r
@@ -851,6 +838,7 @@ ReleaseIpIo:
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 IpIoOpen (\r
   IN IP_IO           *IpIo,\r
   IN IP_IO_OPEN_DATA *OpenData\r
@@ -902,7 +890,7 @@ IpIoOpen (
   }\r
 \r
   IpIo->IsConfigured = TRUE;\r
-  NetListInsertTail (&mActiveIpIoList, &IpIo->Entry);\r
+  InsertTailList (&mActiveIpIoList, &IpIo->Entry);\r
 \r
 ErrorExit:\r
 \r
@@ -935,7 +923,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 +941,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 +950,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
@@ -984,6 +972,7 @@ IpIoStop (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 IpIoDestroy (\r
   IN IP_IO *IpIo\r
   )\r
@@ -998,7 +987,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
@@ -1022,6 +1011,7 @@ IpIoDestroy (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 IpIoSend (\r
   IN IP_IO           *IpIo,\r
   IN NET_BUF         *Pkt,\r
@@ -1072,12 +1062,13 @@ IpIoSend (
 \r
 **/\r
 VOID\r
+EFIAPI\r
 IpIoCancelTxToken (\r
   IN IP_IO  *IpIo,\r
   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
@@ -1092,12 +1083,6 @@ IpIoCancelTxToken (
       Ip = SndEntry->Ip;\r
       Ip->Cancel (Ip, SndEntry->SndToken);\r
 \r
-      //\r
-      // Abort the user token.\r
-      //\r
-      SndEntry->SndToken->Status = EFI_ABORTED;\r
-      IpIoTransmitHandler (NULL, SndEntry);\r
-\r
       break;\r
     }\r
   }\r
@@ -1115,6 +1100,7 @@ IpIoCancelTxToken (
 \r
 **/\r
 IP_IO_IP_INFO *\r
+EFIAPI\r
 IpIoAddIp (\r
   IN IP_IO  *IpIo\r
   )\r
@@ -1124,7 +1110,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
@@ -1133,7 +1119,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
@@ -1157,7 +1143,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
@@ -1169,7 +1155,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
@@ -1183,7 +1169,7 @@ ReleaseIpChild:
 \r
 ReleaseIpInfo:\r
 \r
-  NetFreePool (IpInfo);\r
+  gBS->FreePool (IpInfo);\r
 \r
   return NULL;\r
 }\r
@@ -1205,6 +1191,7 @@ ReleaseIpInfo:
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 IpIoConfigIp (\r
   IN     IP_IO_IP_INFO        *IpInfo,\r
   IN OUT EFI_IP4_CONFIG_DATA  *Ip4ConfigData OPTIONAL\r
@@ -1242,8 +1229,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
@@ -1275,6 +1262,7 @@ OnExit:
 \r
 **/\r
 VOID\r
+EFIAPI\r
 IpIoRemoveIp (\r
   IN IP_IO          *IpIo,\r
   IN IP_IO_IP_INFO  *IpInfo\r
@@ -1289,7 +1277,7 @@ IpIoRemoveIp (
     return;\r
   }\r
 \r
-  NetListRemoveEntry (&IpInfo->Entry);\r
+  RemoveEntryList (&IpInfo->Entry);\r
 \r
   IpInfo->Ip->Configure (IpInfo->Ip, NULL);\r
 \r
@@ -1297,7 +1285,7 @@ IpIoRemoveIp (
 \r
   gBS->CloseEvent (IpInfo->DummyRcvToken.Event);\r
 \r
-  NetFreePool (IpInfo);\r
+  gBS->FreePool (IpInfo);\r
 }\r
 \r
 \r
@@ -1313,14 +1301,15 @@ IpIoRemoveIp (
 \r
 **/\r
 IP_IO_IP_INFO *\r
+EFIAPI\r
 IpIoFindSender (\r
   IN OUT IP_IO     **IpIo,\r
   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
@@ -1361,6 +1350,7 @@ IpIoFindSender (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 IpIoGetIcmpErrStatus (\r
   IN  ICMP_ERROR  IcmpError,\r
   OUT BOOLEAN     *IsHard, OPTIONAL\r