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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Mtftp4Dxe / Mtftp4Impl.c

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
index 0bd835b7b9aa2d2b7b020dbe7bf7507e909f0d83..3c2b4e101952a3388fa1796a90a10f1857b25acd 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Impl.c
@@ -56,7 +56,7 @@ EfiMtftp4GetModeData (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   Instance                         = MTFTP4_PROTOCOL_FROM_THIS (This);\r
   CopyMem(&ModeData->ConfigData, &Instance->Config, sizeof (Instance->Config));\r
@@ -65,7 +65,7 @@ EfiMtftp4GetModeData (
   ModeData->UnsupportedOptionCount = 0;\r
   ModeData->UnsupportedOptoins     = NULL;\r
 \r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -87,8 +87,8 @@ Mtftp4CleanOperation (
   IN EFI_STATUS             Result\r
   )\r
 {\r
-  NET_LIST_ENTRY            *Entry;\r
-  NET_LIST_ENTRY            *Next;\r
+  LIST_ENTRY                *Entry;\r
+  LIST_ENTRY                *Next;\r
   MTFTP4_BLOCK_RANGE        *Block;\r
   EFI_MTFTP4_TOKEN          *Token;\r
 \r
@@ -122,11 +122,11 @@ Mtftp4CleanOperation (
 \r
   NET_LIST_FOR_EACH_SAFE (Entry, Next, &Instance->Blocks) {\r
     Block = NET_LIST_USER_STRUCT (Entry, MTFTP4_BLOCK_RANGE, Link);\r
-    NetListRemoveEntry (Entry);\r
-    NetFreePool (Block);\r
+    RemoveEntryList (Entry);\r
+    gBS->FreePool (Block);\r
   }\r
 \r
-  NetZeroMem (&Instance->RequestOption, sizeof (MTFTP4_OPTION));\r
+  ZeroMem (&Instance->RequestOption, sizeof (MTFTP4_OPTION));\r
 \r
   Instance->Operation     = 0;\r
 \r
@@ -183,22 +183,22 @@ EfiMtftp4Configure (
     //\r
     // Reset the operation if ConfigData is NULL\r
     //\r
-    OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+    OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
     Mtftp4CleanOperation (Instance, EFI_ABORTED);\r
-    NetZeroMem (&Instance->Config, sizeof (EFI_MTFTP4_CONFIG_DATA));\r
+    ZeroMem (&Instance->Config, sizeof (EFI_MTFTP4_CONFIG_DATA));\r
     Instance->State = MTFTP4_STATE_UNCONFIGED;\r
 \r
-    NET_RESTORE_TPL (OldTpl);\r
+    gBS->RestoreTPL (OldTpl);\r
 \r
   } else {\r
     //\r
     // Configure the parameters for new operation.\r
     //\r
-    NetCopyMem (&Ip, &ConfigData->StationIp, sizeof (IP4_ADDR));\r
-    NetCopyMem (&Netmask, &ConfigData->SubnetMask, sizeof (IP4_ADDR));\r
-    NetCopyMem (&Gateway, &ConfigData->GatewayIp, sizeof (IP4_ADDR));\r
-    NetCopyMem (&ServerIp, &ConfigData->ServerIp, sizeof (IP4_ADDR));\r
+    CopyMem (&Ip, &ConfigData->StationIp, sizeof (IP4_ADDR));\r
+    CopyMem (&Netmask, &ConfigData->SubnetMask, sizeof (IP4_ADDR));\r
+    CopyMem (&Gateway, &ConfigData->GatewayIp, sizeof (IP4_ADDR));\r
+    CopyMem (&ServerIp, &ConfigData->ServerIp, sizeof (IP4_ADDR));\r
 \r
     Ip       = NTOHL (Ip);\r
     Netmask  = NTOHL (Netmask);\r
@@ -221,17 +221,17 @@ EfiMtftp4Configure (
       return EFI_INVALID_PARAMETER;\r
     }\r
 \r
-    OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+    OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
     if ((Instance->State == MTFTP4_STATE_CONFIGED) && (Instance->Operation != 0)) {\r
-      NET_RESTORE_TPL (OldTpl);\r
+      gBS->RestoreTPL (OldTpl);\r
       return EFI_ACCESS_DENIED;\r
     }\r
 \r
     CopyMem(&Instance->Config, ConfigData, sizeof (*ConfigData));;\r
     Instance->State = MTFTP4_STATE_CONFIGED;\r
 \r
-    NET_RESTORE_TPL (OldTpl);\r
+    gBS->RestoreTPL (OldTpl);\r
   }\r
 \r
   return EFI_SUCCESS;\r
@@ -287,7 +287,7 @@ Mtftp4GetInfoCheckPacket (
 \r
   //\r
   // Allocate buffer then copy the packet over. Use gBS->AllocatePool\r
-  // in case NetAllocatePool will implements something tricky.\r
+  // in case AllocatePool will implements something tricky.\r
   //\r
   Status = gBS->AllocatePool (EfiBootServicesData, PacketLen, (VOID **) State->Packet);\r
 \r
@@ -297,7 +297,7 @@ Mtftp4GetInfoCheckPacket (
   }\r
 \r
   *(State->PacketLen) = PacketLen;\r
-  NetCopyMem (*(State->Packet), Packet, PacketLen);\r
+  CopyMem (*(State->Packet), Packet, PacketLen);\r
 \r
   return EFI_ABORTED;\r
 }\r
@@ -456,19 +456,19 @@ Mtftp4OverrideValid (
   IP4_ADDR                  Netmask;\r
   IP4_ADDR                  Gateway;\r
 \r
-  NetCopyMem (&Ip, &Override->ServerIp, sizeof (IP4_ADDR));\r
+  CopyMem (&Ip, &Override->ServerIp, sizeof (IP4_ADDR));\r
   if (!Ip4IsUnicast (NTOHL (Ip), 0)) {\r
     return FALSE;\r
   }\r
 \r
   Config = &Instance->Config;\r
 \r
-  NetCopyMem (&Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));\r
+  CopyMem (&Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));\r
   Gateway = NTOHL (Gateway);\r
 \r
   if (!Config->UseDefaultSetting && (Gateway != 0)) {\r
-    NetCopyMem (&Netmask, &Config->SubnetMask, sizeof (IP4_ADDR));\r
-    NetCopyMem (&Ip, &Config->StationIp, sizeof (IP4_ADDR));\r
+    CopyMem (&Netmask, &Config->SubnetMask, sizeof (IP4_ADDR));\r
+    CopyMem (&Ip, &Config->StationIp, sizeof (IP4_ADDR));\r
 \r
     Netmask = NTOHL (Netmask);\r
     Ip      = NTOHL (Ip);\r
@@ -577,7 +577,7 @@ Mtftp4ConfigUnicastPort (
   UdpConfig.RemotePort         = 0;\r
 \r
   Ip = HTONL (Instance->ServerIp);\r
-  NetCopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
+  CopyMem (&UdpConfig.RemoteAddress, &Ip, sizeof (EFI_IPv4_ADDRESS));\r
 \r
   Status = UdpIo->Udp->Configure (UdpIo->Udp, &UdpConfig);\r
 \r
@@ -654,7 +654,7 @@ Mtftp4Start (
   Instance = MTFTP4_PROTOCOL_FROM_THIS (This);\r
 \r
   Status = EFI_SUCCESS;\r
-  OldTpl = NET_RAISE_TPL (NET_TPL_LOCK);\r
+  OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
   if (Instance->State != MTFTP4_STATE_CONFIGED) {\r
     Status = EFI_NOT_STARTED;\r
@@ -665,7 +665,7 @@ Mtftp4Start (
   }\r
 \r
   if (EFI_ERROR (Status)) {\r
-    NET_RESTORE_TPL (OldTpl);\r
+    gBS->RestoreTPL (OldTpl);\r
     return Status;\r
   }\r
 \r
@@ -701,13 +701,13 @@ Mtftp4Start (
   Instance->Token         = Token;\r
   Instance->BlkSize       = MTFTP4_DEFAULT_BLKSIZE;\r
 \r
-  NetCopyMem (&Instance->ServerIp, &Config->ServerIp, sizeof (IP4_ADDR));\r
+  CopyMem (&Instance->ServerIp, &Config->ServerIp, sizeof (IP4_ADDR));\r
   Instance->ServerIp      = NTOHL (Instance->ServerIp);\r
 \r
   Instance->ListeningPort = Config->InitialServerPort;\r
   Instance->ConnectedPort = 0;\r
 \r
-  NetCopyMem (&Instance->Gateway, &Config->GatewayIp, sizeof (IP4_ADDR));\r
+  CopyMem (&Instance->Gateway, &Config->GatewayIp, sizeof (IP4_ADDR));\r
   Instance->Gateway       = NTOHL (Instance->Gateway);\r
 \r
   Instance->MaxRetry      = Config->TryCount;\r
@@ -715,8 +715,8 @@ Mtftp4Start (
   Instance->Master        = TRUE;\r
 \r
   if (Override != NULL) {\r
-    NetCopyMem (&Instance->ServerIp, &Override->ServerIp, sizeof (IP4_ADDR));\r
-    NetCopyMem (&Instance->Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));\r
+    CopyMem (&Instance->ServerIp, &Override->ServerIp, sizeof (IP4_ADDR));\r
+    CopyMem (&Instance->Gateway, &Override->GatewayIp, sizeof (IP4_ADDR));\r
 \r
     Instance->ServerIp      = NTOHL (Instance->ServerIp);\r
     Instance->Gateway       = NTOHL (Instance->Gateway);\r
@@ -756,7 +756,7 @@ Mtftp4Start (
     Status = Mtftp4RrqStart (Instance, Operation);\r
   }\r
 \r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
 \r
   if (EFI_ERROR (Status)) {\r
     goto ON_ERROR;\r
@@ -779,7 +779,7 @@ Mtftp4Start (
 \r
 ON_ERROR:\r
   Mtftp4CleanOperation (Instance, Status);\r
-  NET_RESTORE_TPL (OldTpl);\r
+  gBS->RestoreTPL (OldTpl);\r
 \r
   return Status;\r
 }\r