X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FNetwork%2FDhcp4Dxe%2FDhcp4Io.h;h=01283e5e17b940045085121a65859653a3b78c2d;hp=5f8ac13e84ef03f88acb711083846d9fa0e3b0f9;hb=c0fd7f734e2d33e22215899b40a47b843129541d;hpb=3e8c18da0441069591e5aa218f378001b29512dd

diff --git a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
index 5f8ac13e84..01283e5e17 100644
--- a/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
+++ b/MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Io.h
@@ -1,21 +1,15 @@
 /** @file
   The DHCP4 protocol implementation.
-  
-Copyright (c) 2006 - 2008, Intel Corporation.<BR>
-All rights reserved. This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution.  The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
 
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #ifndef __EFI_DHCP4_IO_H__
 #define __EFI_DHCP4_IO_H__
 
-#include <PiDxe.h>
+#include <Uefi.h>
 
 #include <Protocol/ServiceBinding.h>
 
@@ -31,36 +25,30 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define DHCP_SERVER_PORT                  67
 #define DHCP_CLIENT_PORT                  68
 
-typedef enum {
-  //
-  // BOOTP header "op" field
-  //
-  BOOTP_REQUEST           = 1,
-  BOOTP_REPLY             = 2
-} DHCP_OP_TYPE;
-
-typedef enum {
-  //
-  // DHCP message types
-  //
-  DHCP_MSG_DISCOVER       = 1,
-  DHCP_MSG_OFFER          = 2,
-  DHCP_MSG_REQUEST        = 3,
-  DHCP_MSG_DECLINE        = 4,
-  DHCP_MSG_ACK            = 5,
-  DHCP_MSG_NAK            = 6,
-  DHCP_MSG_RELEASE        = 7,
-  DHCP_MSG_INFORM         = 8
-} DHCP_MSG_TYPE;
-
-typedef enum {
-  //
-  // DHCP notify user type
-  //
-  DHCP_NOTIFY_COMPLETION  = 1,
-  DHCP_NOTIFY_RENEWREBIND,
-  DHCP_NOTIFY_ALL
-} DHCP_NOTIFY_TYPE;
+//
+// BOOTP header "op" field
+//
+#define BOOTP_REQUEST           1
+#define BOOTP_REPLY             2
+
+//
+// DHCP message types
+//
+#define DHCP_MSG_DISCOVER       1
+#define DHCP_MSG_OFFER          2
+#define DHCP_MSG_REQUEST        3
+#define DHCP_MSG_DECLINE        4
+#define DHCP_MSG_ACK            5
+#define DHCP_MSG_NAK            6
+#define DHCP_MSG_RELEASE        7
+#define DHCP_MSG_INFORM         8
+
+//
+// DHCP notify user type
+//
+#define DHCP_NOTIFY_COMPLETION  1
+#define DHCP_NOTIFY_RENEWREBIND 2
+#define DHCP_NOTIFY_ALL         3
 
 #define DHCP_IS_BOOTP(Parameter)  (((Parameter) == NULL) || ((Parameter)->DhcpType == 0))
 
@@ -140,15 +128,16 @@ DhcpOnTimerTick (
   state machine.
 
   @param  UdpPacket             The UDP packets received.
-  @param  Points                The local/remote UDP access points
+  @param  EndPoint              The local/remote UDP access point
   @param  IoStatus              The status of the UDP receive
   @param  Context               The opaque parameter to the function.
 
 **/
 VOID
+EFIAPI
 DhcpInput (
   NET_BUF                   *UdpPacket,
-  UDP_POINTS                *Points,
+  UDP_END_POINT             *EndPoint,
   EFI_STATUS                IoStatus,
   VOID                      *Context
   );
@@ -183,15 +172,16 @@ DhcpCleanLease (
   Release the net buffer when packet is sent.
 
   @param  UdpPacket             The UDP packets received.
-  @param  Points                The local/remote UDP access points
+  @param  EndPoint              The local/remote UDP access point
   @param  IoStatus              The status of the UDP receive
   @param  Context               The opaque parameter to the function.
 
 **/
 VOID
+EFIAPI
 DhcpOnPacketSent (
   NET_BUF                   *Packet,
-  UDP_POINTS                *Points,
+  UDP_END_POINT             *EndPoint,
   EFI_STATUS                IoStatus,
   VOID                      *Context
   );