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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Dhcp4Dxe / Dhcp4Io.h

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
index 5f8ac13e84ef03f88acb711083846d9fa0e3b0f9..faa5d435462c257cd0c354e5cd7c25ecf9347922 100644 (file)
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
@@ -1,7 +1,7 @@
 /** @file\r
   The DHCP4 protocol implementation.\r
   \r
-Copyright (c) 2006 - 2008, 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
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef __EFI_DHCP4_IO_H__\r
 #define __EFI_DHCP4_IO_H__\r
 \r
-#include <PiDxe.h>\r
+#include <Uefi.h>\r
 \r
 #include <Protocol/ServiceBinding.h>\r
 \r
@@ -31,36 +31,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define DHCP_SERVER_PORT                  67\r
 #define DHCP_CLIENT_PORT                  68\r
 \r
-typedef enum {\r
-  //\r
-  // BOOTP header "op" field\r
-  //\r
-  BOOTP_REQUEST           = 1,\r
-  BOOTP_REPLY             = 2\r
-} DHCP_OP_TYPE;\r
-\r
-typedef enum {\r
-  //\r
-  // DHCP message types\r
-  //\r
-  DHCP_MSG_DISCOVER       = 1,\r
-  DHCP_MSG_OFFER          = 2,\r
-  DHCP_MSG_REQUEST        = 3,\r
-  DHCP_MSG_DECLINE        = 4,\r
-  DHCP_MSG_ACK            = 5,\r
-  DHCP_MSG_NAK            = 6,\r
-  DHCP_MSG_RELEASE        = 7,\r
-  DHCP_MSG_INFORM         = 8\r
-} DHCP_MSG_TYPE;\r
-\r
-typedef enum {\r
-  //\r
-  // DHCP notify user type\r
-  //\r
-  DHCP_NOTIFY_COMPLETION  = 1,\r
-  DHCP_NOTIFY_RENEWREBIND,\r
-  DHCP_NOTIFY_ALL\r
-} DHCP_NOTIFY_TYPE;\r
+//\r
+// BOOTP header "op" field\r
+//\r
+#define BOOTP_REQUEST           1\r
+#define BOOTP_REPLY             2\r
+\r
+//\r
+// DHCP message types\r
+//\r
+#define DHCP_MSG_DISCOVER       1\r
+#define DHCP_MSG_OFFER          2\r
+#define DHCP_MSG_REQUEST        3\r
+#define DHCP_MSG_DECLINE        4\r
+#define DHCP_MSG_ACK            5\r
+#define DHCP_MSG_NAK            6\r
+#define DHCP_MSG_RELEASE        7\r
+#define DHCP_MSG_INFORM         8\r
+\r
+//\r
+// DHCP notify user type\r
+//\r
+#define DHCP_NOTIFY_COMPLETION  1\r
+#define DHCP_NOTIFY_RENEWREBIND 2\r
+#define DHCP_NOTIFY_ALL         3\r
 \r
 #define DHCP_IS_BOOTP(Parameter)  (((Parameter) == NULL) || ((Parameter)->DhcpType == 0))\r
 \r
@@ -140,15 +134,16 @@ DhcpOnTimerTick (
   state machine.\r
 \r
   @param  UdpPacket             The UDP packets received.\r
-  @param  Points                The local/remote UDP access points\r
+  @param  EndPoint              The local/remote UDP access point\r
   @param  IoStatus              The status of the UDP receive\r
   @param  Context               The opaque parameter to the function.\r
 \r
 **/\r
 VOID\r
+EFIAPI\r
 DhcpInput (\r
   NET_BUF                   *UdpPacket,\r
-  UDP_POINTS                *Points,\r
+  UDP_END_POINT             *EndPoint,\r
   EFI_STATUS                IoStatus,\r
   VOID                      *Context\r
   );\r
@@ -183,15 +178,16 @@ DhcpCleanLease (
   Release the net buffer when packet is sent.\r
 \r
   @param  UdpPacket             The UDP packets received.\r
-  @param  Points                The local/remote UDP access points\r
+  @param  EndPoint              The local/remote UDP access point\r
   @param  IoStatus              The status of the UDP receive\r
   @param  Context               The opaque parameter to the function.\r
 \r
 **/\r
 VOID\r
+EFIAPI\r
 DhcpOnPacketSent (\r
   NET_BUF                   *Packet,\r
-  UDP_POINTS                *Points,\r
+  UDP_END_POINT             *EndPoint,\r
   EFI_STATUS                IoStatus,\r
   VOID                      *Context\r
   );\r