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

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

diff --git a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
index 5ac5dc8ec020472ab4fab7b531dbb01518115ae0..12b4c4a4a15d81f0f82abc5075ad9f0a2c753e55 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -131,7 +131,7 @@ Mtftp4WrqSendBlock (
 \r
     if (DataLen > 0) {\r
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);\r
-      NetCopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);\r
+      CopyMem (Packet->Data.Data, (UINT8 *) Token->Buffer + Start, DataLen);\r
     }\r
 \r
   } else {\r
@@ -139,7 +139,7 @@ Mtftp4WrqSendBlock (
     // Get data from PacketNeeded\r
     //\r
     DataBuf = NULL;\r
-    Status  = Token->PacketNeeded (&Instance->Mtftp4, Token, &DataLen, &DataBuf);\r
+    Status  = Token->PacketNeeded (&Instance->Mtftp4, Token, &DataLen, (VOID **) &DataBuf);\r
 \r
     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {\r
       if (DataBuf != NULL) {\r
@@ -149,7 +149,7 @@ Mtftp4WrqSendBlock (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-        "User aborted the transfer"\r
+        (UINT8 *) "User aborted the transfer"\r
         );\r
 \r
       return EFI_ABORTED;\r
@@ -162,7 +162,7 @@ Mtftp4WrqSendBlock (
 \r
     if (DataLen > 0) {\r
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);\r
-      NetCopyMem (Packet->Data.Data, DataBuf, DataLen);\r
+      CopyMem (Packet->Data.Data, DataBuf, DataLen);\r
       gBS->FreePool (DataBuf);\r
     }\r
   }\r
@@ -235,7 +235,7 @@ Mtftp4WrqHandleAck (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-        "Block number rolls back, not supported, try blksize option"\r
+        (UINT8 *) "Block number rolls back, not supported, try blksize option"\r
         );\r
 \r
       return EFI_TFTP_ERROR;\r
@@ -327,7 +327,7 @@ Mtftp4WrqHandleOack (
   //\r
   // Parse and validate the options from server\r
   //\r
-  NetZeroMem (&Reply, sizeof (MTFTP4_OPTION));\r
+  ZeroMem (&Reply, sizeof (MTFTP4_OPTION));\r
   Status = Mtftp4ParseOptionOack (Packet, Len, &Reply);\r
 \r
   if (EFI_ERROR (Status) || !Mtftp4WrqOackValid (&Reply, &Instance->RequestOption)) {\r
@@ -339,7 +339,7 @@ Mtftp4WrqHandleOack (
       Mtftp4SendError (\r
         Instance,\r
         EFI_MTFTP4_ERRORCODE_ILLEGAL_OPERATION,\r
-        "Mal-formated OACK packet"\r
+        (UINT8 *) "Mal-formated OACK packet"\r
         );\r
     }\r
 \r
@@ -428,7 +428,7 @@ Mtftp4WrqInput (
   Len = UdpPacket->TotalSize;\r
 \r
   if (UdpPacket->BlockOpNum > 1) {\r
-    Packet = NetAllocatePool (Len);\r
+    Packet = AllocatePool (Len);\r
 \r
     if (Packet == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
@@ -465,7 +465,7 @@ Mtftp4WrqInput (
         Mtftp4SendError (\r
           Instance,\r
           EFI_MTFTP4_ERRORCODE_REQUEST_DENIED,\r
-          "User aborted the transfer"\r
+          (UINT8 *) "User aborted the transfer"\r
           );\r
       }\r
 \r
@@ -502,7 +502,7 @@ ON_EXIT:
   // restart the receive, otherwise end the session.\r
   //\r
   if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {\r
-    NetFreePool (Packet);\r
+    gBS->FreePool (Packet);\r
   }\r
 \r
   if (UdpPacket != NULL) {\r