1. Sync Tcp4 protocol definitions to match UEFI 2.1

[mirror_edk2.git] / MdePkg / Include / Protocol / IP4.h

diff --git a/MdePkg/Include/Protocol/IP4.h b/MdePkg/Include/Protocol/IP4.h
index 0decc176d4877c7070dd8b2d0d10ca8a851f863a..99885496458d945a4f3053e2ac9cc57ea4685fd4 100644 (file)
--- a/MdePkg/Include/Protocol/IP4.h
+++ b/MdePkg/Include/Protocol/IP4.h
@@ -8,13 +8,13 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r

-  Module Name:  IP4.h\r
-\r

 **/\r
 \r
 #ifndef __EFI_IP4_PROTOCOL_H__\r
 #define __EFI_IP4_PROTOCOL_H__\r
 \r
 **/\r
 \r
 #ifndef __EFI_IP4_PROTOCOL_H__\r
 #define __EFI_IP4_PROTOCOL_H__\r
 \r

+#include <Protocol/ManagedNetwork.h>\r
+\r

 #define EFI_IP4_SERVICE_BINDING_PROTOCOL_GUID \\r
   { \\r
     0xc51711e7, 0xb4bf, 0x404a, {0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4 } \\r
 #define EFI_IP4_SERVICE_BINDING_PROTOCOL_GUID \\r
   { \\r
     0xc51711e7, 0xb4bf, 0x404a, {0xbf, 0xb8, 0x0a, 0x04, 0x8e, 0xf1, 0xff, 0xe4 } \\r


@@ -28,6 +28,7 @@
 typedef struct _EFI_IP4_PROTOCOL EFI_IP4_PROTOCOL;\r
   \r
 typedef struct {\r
 typedef struct _EFI_IP4_PROTOCOL EFI_IP4_PROTOCOL;\r
   \r
 typedef struct {\r

+  EFI_HANDLE              InstanceHandle;\r

   EFI_IPv4_ADDRESS        Ip4Address;\r
   EFI_IPv4_ADDRESS        SubnetMask;\r
 } EFI_IP4_ADDRESS_PAIR; \r
   EFI_IPv4_ADDRESS        Ip4Address;\r
   EFI_IPv4_ADDRESS        SubnetMask;\r
 } EFI_IP4_ADDRESS_PAIR; \r


@@ -82,13 +83,8 @@ typedef struct {
 #pragma pack(1)\r
 \r
 typedef struct {\r
 #pragma pack(1)\r
 \r
 typedef struct {\r

-#ifdef EFI_NET_LITTLE_ENDIAN\r

   UINT8                   HeaderLength:4;\r
   UINT8                   Version:4;\r
   UINT8                   HeaderLength:4;\r
   UINT8                   Version:4;\r

-#else \r
-  UINT8                   Version:4;\r
-  UINT8                   HeaderLength:4;\r
-#endif\r

   UINT8                   TypeOfService;\r
   UINT16                  TotalLength;\r
   UINT16                  Identification;\r
   UINT8                   TypeOfService;\r
   UINT16                  TotalLength;\r
   UINT16                  Identification;\r


@@ -165,10 +161,10 @@ typedef struct {
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_GET_MODE_DATA) (\r
 typedef\r
 EFI_STATUS\r
 (EFIAPI *EFI_IP4_GET_MODE_DATA) (\r

-  IN  EFI_IP4_PROTOCOL                *This,\r
-  OUT EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
-  OUT EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
-  OUT EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r
+  IN CONST  EFI_IP4_PROTOCOL                *This,\r
+  OUT       EFI_IP4_MODE_DATA               *Ip4ModeData     OPTIONAL,\r
+  OUT       EFI_MANAGED_NETWORK_CONFIG_DATA *MnpConfigData   OPTIONAL,\r
+  OUT       EFI_SIMPLE_NETWORK_MODE         *SnpModeData     OPTIONAL\r

   )\r
 ;  \r
 \r
   )\r
 ;  \r
 \r