Fixed GCC 4.4 build issues due to EFIAPI not being used when required.

[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 cb39da48c8d451349d76a03e00d4a85e4c4ec5d3..9e91ebf124a8980aa9dda00a72fe6656c6476ca3 100644 (file)
--- a/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
+++ b/MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Wrq.c
@@ -1,7 +1,7 @@
 /** @file\r
   Routines to process Wrq (upload).\r
   \r
-Copyright (c) 2006, Intel Corporation<BR>\r
+Copyright (c) 2006 - 2009, Intel Corporation<BR>\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
@@ -52,6 +52,7 @@ Mtftp4WrqSendBlock (
   }\r
 \r
   Packet = (EFI_MTFTP4_PACKET *) NetbufAllocSpace (UdpPacket, MTFTP4_DATA_HEAD_LEN, FALSE);\r
+  ASSERT (Packet != NULL);\r
 \r
   Packet->Data.OpCode = HTONS (EFI_MTFTP4_OPCODE_DATA);\r
   Packet->Data.Block  = HTONS (BlockNum);\r
@@ -90,7 +91,7 @@ Mtftp4WrqSendBlock (
 \r
     if (EFI_ERROR (Status) || (DataLen > Instance->BlkSize)) {\r
       if (DataBuf != NULL) {\r
-        gBS->FreePool (DataBuf);\r
+        FreePool (DataBuf);\r
       }\r
 \r
       Mtftp4SendError (\r
@@ -110,7 +111,7 @@ Mtftp4WrqSendBlock (
     if (DataLen > 0) {\r
       NetbufAllocSpace (UdpPacket, DataLen, FALSE);\r
       CopyMem (Packet->Data.Data, DataBuf, DataLen);\r
-      gBS->FreePool (DataBuf);\r
+      FreePool (DataBuf);\r
     }\r
   }\r
 \r
@@ -328,15 +329,16 @@ Mtftp4WrqHandleOack (
   The input process routine for MTFTP upload.\r
 \r
   @param  UdpPacket             The received MTFTP packet.\r
-  @param  Points                The local/remote access point\r
+  @param  EndPoint              The local/remote access point\r
   @param  IoStatus              The result of the packet receiving\r
   @param  Context               Opaque parameter for the callback, which is the\r
                                 MTFTP session.\r
 **/\r
 VOID\r
+EFIAPI\r
 Mtftp4WrqInput (\r
   IN NET_BUF                *UdpPacket,\r
-  IN UDP_POINTS             *Points,\r
+  IN UDP_END_POINT          *EndPoint,\r
   IN EFI_STATUS             IoStatus,\r
   IN VOID                   *Context\r
   )\r
@@ -370,11 +372,11 @@ Mtftp4WrqInput (
   // Client send initial request to server's listening port. Server\r
   // will select a UDP port to communicate with the client.\r
   //\r
-  if (Points->RemotePort != Instance->ConnectedPort) {\r
+  if (EndPoint->RemotePort != Instance->ConnectedPort) {\r
     if (Instance->ConnectedPort != 0) {\r
       goto ON_EXIT;\r
     } else {\r
-      Instance->ConnectedPort = Points->RemotePort;\r
+      Instance->ConnectedPort = EndPoint->RemotePort;\r
     }\r
   }\r
 \r
@@ -461,7 +463,7 @@ ON_EXIT:
   // restart the receive, otherwise end the session.\r
   //\r
   if ((Packet != NULL) && (UdpPacket->BlockOpNum > 1)) {\r
-    gBS->FreePool (Packet);\r
+    FreePool (Packet);\r
   }\r
 \r
   if (UdpPacket != NULL) {\r