MdePkg Base.h: Use correct style to check the defined macro

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

diff --git a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
index 417a6cdc2bfc56927bec5d66974d79763ca83cd0..2242a37ededb6d1c6ed8156972654f1522185ee9 100644 (file)
--- a/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
+++ b/MdePkg/Include/Protocol/NetworkInterfaceIdentifier.h
@@ -1,14 +1,8 @@
 /** @file\r
   EFI Network Interface Identifier Protocol.\r
 \r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
-This program and the accompanying materials are licensed and made available under\r
-the terms and conditions of the BSD License that accompanies this distribution.\r
-The full text of the license may be found at\r
-http://opensource.org/licenses/bsd-license.php.\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
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
   @par Revision Reference:\r
   This Protocol is introduced in EFI Specification 1.10.\r
@@ -34,7 +28,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     0x1ACED566, 0x76ED, 0x4218, {0xBC, 0x81, 0x76, 0x7F, 0x1F, 0x97, 0x7A, 0x89 } \\r
   }\r
 \r
-#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION    0x00010000\r
+//\r
+// Revision defined in UEFI Specification 2.4\r
+//\r
+#define EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_REVISION    0x00020000\r
+\r
 \r
 ///\r
 /// Revision defined in EFI1.1.\r
@@ -70,9 +68,9 @@ struct _EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL {
   UINT8     MajorVer;   ///< Major version number.\r
   UINT8     MinorVer;   ///< Minor version number.\r
   BOOLEAN   Ipv6Supported; ///< TRUE if the network interface supports IPv6; otherwise FALSE.\r
-  UINT8     IfNum;      ///< The network interface number that is being identified by this Network\r
-                        ///< Interface Identifier Protocol. This field must be less than or equal\r
-                        ///< to the IFcnt field in the !PXE structure.\r
+  UINT16    IfNum;      ///< The network interface number that is being identified by this Network\r
+                        ///< Interface Identifier Protocol. This field must be less than or\r
+                        ///< equal to the (IFcnt | IFcntExt <<8 ) fields in the !PXE structure.\r
 \r
 };\r
 \r
@@ -105,7 +103,7 @@ struct undiconfig_table {
   struct {\r
     VOID             *NII_InterfacePointer; ///< Pointer to the NII interface structure.\r
     VOID             *DevicePathPointer;    ///< Pointer to the device path for this NIC.\r
-  } NII_entry[1]; \r
+  } NII_entry[1];\r
 };\r
 \r
 extern EFI_GUID gEfiNetworkInterfaceIdentifierProtocolGuid;\r