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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiTcp4Io.c

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
index d43437be2da8d5b8d231682cb8c7f703fb33fcc0..06caf72166749d20e32296b64ca1979732a1cac3 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiTcp4Io.c
@@ -144,9 +144,9 @@ Returns:
   AccessPoint->RemotePort = ConfigData->RemotePort;\r
   AccessPoint->ActiveFlag = TRUE;\r
 \r
-  NetCopyMem (&AccessPoint->StationAddress, &ConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&AccessPoint->SubnetMask, &ConfigData->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
-  NetCopyMem (&AccessPoint->RemoteAddress, &ConfigData->RemoteIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&AccessPoint->StationAddress, &ConfigData->LocalIp, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&AccessPoint->SubnetMask, &ConfigData->SubnetMask, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&AccessPoint->RemoteAddress, &ConfigData->RemoteIp, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   //\r
   // Configure the TCP4 protocol.\r
@@ -170,7 +170,7 @@ Returns:
   //\r
   Status = gBS->CreateEvent (\r
                   EFI_EVENT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   Tcp4IoCommonNotify,\r
                   &Tcp4Io->IsConnDone,\r
                   &Tcp4Io->ConnToken.CompletionToken.Event\r
@@ -181,7 +181,7 @@ Returns:
 \r
   Status = gBS->CreateEvent (\r
                   EFI_EVENT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   Tcp4IoCommonNotify,\r
                   &Tcp4Io->IsTxDone,\r
                   &Tcp4Io->TxToken.CompletionToken.Event\r
@@ -192,7 +192,7 @@ Returns:
 \r
   Status = gBS->CreateEvent (\r
                   EFI_EVENT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   Tcp4IoCommonNotify,\r
                   &Tcp4Io->IsRxDone,\r
                   &Tcp4Io->RxToken.CompletionToken.Event\r
@@ -203,7 +203,7 @@ Returns:
 \r
   Status = gBS->CreateEvent (\r
                   EFI_EVENT_NOTIFY_SIGNAL,\r
-                  NET_TPL_EVENT,\r
+                  TPL_NOTIFY,\r
                   Tcp4IoCommonNotify,\r
                   &Tcp4Io->IsCloseDone,\r
                   &Tcp4Io->CloseToken.CompletionToken.Event\r
@@ -406,7 +406,7 @@ Returns:
   EFI_TCP4_PROTOCOL       *Tcp4;\r
   EFI_STATUS              Status;\r
 \r
-  TxData = NetAllocatePool (sizeof (EFI_TCP4_TRANSMIT_DATA) + (Packet->BlockOpNum - 1) * sizeof (EFI_TCP4_FRAGMENT_DATA));\r
+  TxData = AllocatePool (sizeof (EFI_TCP4_TRANSMIT_DATA) + (Packet->BlockOpNum - 1) * sizeof (EFI_TCP4_FRAGMENT_DATA));\r
   if (TxData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -442,7 +442,7 @@ Returns:
 \r
 ON_EXIT:\r
 \r
-  NetFreePool (TxData);\r
+  gBS->FreePool (TxData);\r
 \r
   return Status;\r
 }\r
@@ -485,7 +485,7 @@ Returns:
   UINT32                CurrentFragment;\r
 \r
   FragmentCount = Packet->BlockOpNum;\r
-  Fragment      = NetAllocatePool (FragmentCount * sizeof (NET_FRAGMENT));\r
+  Fragment      = AllocatePool (FragmentCount * sizeof (NET_FRAGMENT));\r
   if (Fragment == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
@@ -544,7 +544,7 @@ Returns:
 \r
 ON_EXIT:\r
 \r
-  NetFreePool (Fragment);\r
+  gBS->FreePool (Fragment);\r
 \r
   return Status;\r
 }\r