1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Efi / Protocol / Dhcp4 / Dhcp4.h

diff --git a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h
index 3409ca06cbf431854593ec0e559b26f527cf4bcd..a0205caf554cba90a759af11430efb7ee924c58a 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h
+++ b/EdkCompatibilityPkg/Foundation/Efi/Protocol/Dhcp4/Dhcp4.h
@@ -88,18 +88,18 @@ typedef enum{
   Dhcp4SendDiscover   = 0x01,\r
   Dhcp4RcvdOffer      = 0x02,\r
   Dhcp4SelectOffer    = 0x03,\r
-  Dhcp4SendRequest    = 0x05,\r
-  Dhcp4RcvdAck        = 0x06,\r
-  Dhcp4RcvdNak        = 0x07,\r
-  Dhcp4SendDecline    = 0x08,\r
-  Dhcp4BoundCompleted = 0x09,\r
-  Dhcp4EnterRenewing  = 0x0a,\r
-  Dhcp4EnterRebinding = 0x0b,\r
-  Dhcp4AddressLost    = 0x0c,\r
-  Dhcp4Fail           = 0x0d\r
+  Dhcp4SendRequest    = 0x04,\r
+  Dhcp4RcvdAck        = 0x05,\r
+  Dhcp4RcvdNak        = 0x06,\r
+  Dhcp4SendDecline    = 0x07,\r
+  Dhcp4BoundCompleted = 0x08,\r
+  Dhcp4EnterRenewing  = 0x09,\r
+  Dhcp4EnterRebinding = 0x0a,\r
+  Dhcp4AddressLost    = 0x0b,\r
+  Dhcp4Fail           = 0x0c\r
 } EFI_DHCP4_EVENT;\r
 \r
-typedef EFI_STATUS (*EFI_DHCP4_CALLBACK)(\r
+typedef EFI_STATUS (*EFI_DHCP4_CALLBACK) (\r
   IN EFI_DHCP4_PROTOCOL   *This,\r
   IN VOID                 *Context,\r
   IN EFI_DHCP4_STATE      CurrentState,\r
@@ -139,23 +139,22 @@ typedef struct {
 } EFI_DHCP4_LISTEN_POINT;\r
 \r
 typedef struct {\r
-  OUT EFI_STATUS            Status;\r
-  IN EFI_EVENT              CompletionEvent;\r
-  IN EFI_IPv4_ADDRESS       RemoteAddress;\r
-  IN UINT16                 RemotePort;\r
-  IN EFI_IPv4_ADDRESS       GatewayAddress;\r
-  IN UINT32                 ListenPointCount;\r
-  IN EFI_DHCP4_LISTEN_POINT *ListenPoints;\r
-  IN UINT32                 TimeoutValue;\r
-  IN EFI_DHCP4_PACKET       *Packet;\r
-  OUT UINT32                ResponseCount;\r
-  OUT EFI_DHCP4_PACKET      *ResponseList;   \r
-}EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN;\r
-\r
+  EFI_STATUS              Status;\r
+  EFI_EVENT               CompletionEvent;\r
+  EFI_IPv4_ADDRESS        RemoteAddress;\r
+  UINT16                  RemotePort;\r
+  EFI_IPv4_ADDRESS        GatewayAddress;\r
+  UINT32                  ListenPointCount;\r
+  EFI_DHCP4_LISTEN_POINT  *ListenPoints;\r
+  UINT32                  TimeoutValue;\r
+  EFI_DHCP4_PACKET        *Packet;\r
+  UINT32                  ResponseCount;\r
+  EFI_DHCP4_PACKET        *ResponseList;\r
+} EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN;\r
 \r
 typedef \r
 EFI_STATUS \r
-(EFIAPI *EFI_DHCP4_GET_MODE_DATA)(\r
+(EFIAPI *EFI_DHCP4_GET_MODE_DATA) (\r
   IN EFI_DHCP4_PROTOCOL     *This,\r
   OUT EFI_DHCP4_MODE_DATA   *Dhcp4ModeData\r
 );\r
@@ -176,8 +175,8 @@ typedef EFI_STATUS
 \r
 typedef\r
 EFI_STATUS\r
-(EFIAPI *EFI_DHCP4_RENEW) (\r
-  IN EFI_DHCP4_PROTOCOL      *This,\r
+(EFIAPI *EFI_DHCP4_RENEW_REBIND) (\r
+  IN EFI_DHCP4_PROTOCOL     *This,\r
   IN BOOLEAN                RebindRequest,\r
   IN EFI_EVENT              CompletionEvent    OPTIONAL\r
 );\r
@@ -201,7 +200,7 @@ EFI_STATUS
   IN UINT32                   DeleteCount,\r
   IN UINT8                    *DeleteList        OPTIONAL,\r
   IN UINT32                   AppendCount,\r
-  IN EFI_DHCP4_PACKET_OPTION  *AppendList[]       OPTIONAL,\r
+  IN EFI_DHCP4_PACKET_OPTION  *AppendList[]      OPTIONAL,\r
   OUT EFI_DHCP4_PACKET        **NewPacket\r
 );\r
 \r
@@ -212,7 +211,6 @@ EFI_STATUS
   IN EFI_DHCP4_TRANSMIT_RECEIVE_TOKEN  *Token\r
 );\r
 \r
-\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_DHCP4_PARSE) (\r
@@ -226,7 +224,7 @@ typedef struct _EFI_DHCP4_PROTOCOL {
   EFI_DHCP4_GET_MODE_DATA      GetModeData;\r
   EFI_DHCP4_CONFIGURE          Configure;\r
   EFI_DHCP4_START              Start;\r
-  EFI_DHCP4_RENEW              RenewRebind;\r
+  EFI_DHCP4_RENEW_REBIND       RenewRebind;\r
   EFI_DHCP4_RELEASE            Release;\r
   EFI_DHCP4_STOP               Stop;\r
   EFI_DHCP4_BUILD              Build;\r