BaseTools: Replace BSD License with BSD+Patent License

[mirror_edk2.git] / BaseTools / Source / C / Include / Protocol / DevicePath.h

diff --git a/BaseTools/Source/C/Include/Protocol/DevicePath.h b/BaseTools/Source/C/Include/Protocol/DevicePath.h
index a5d8eea9bc2b1924344a2e5b6fe8bce2fd572b56..e3571ef0f363114f03e7b3fd3c9ebff2422937b4 100644 (file)
--- a/BaseTools/Source/C/Include/Protocol/DevicePath.h
+++ b/BaseTools/Source/C/Include/Protocol/DevicePath.h
@@ -5,14 +5,8 @@
   from a software point of view. The path must persist from boot to boot, so\r
   it can not contain things like PCI bus numbers that change from boot to boot.\r
 \r
-Copyright (c) 2017, 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) 2017 - 2018, Intel Corporation. All rights reserved.<BR>\r
+SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -38,6 +32,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #pragma pack(1)\r
 \r
+#if defined(_MSC_EXTENSIONS)\r
+//\r
+// Disable warning when last field of data structure is a zero sized array.\r
+//\r
+#pragma warning ( disable : 4200 )\r
+#endif\r
+\r
 /**\r
   This protocol can be used on any device handle to obtain generic path/location\r
   information concerning the physical device or logical device. If the handle does\r
@@ -830,7 +831,7 @@ typedef struct {
   ///\r
   /// Instance of the DNS server address.\r
   ///\r
-  EFI_IP_ADDRESS                  DnsServerIp[1024];\r
+  EFI_IP_ADDRESS                  DnsServerIp[];\r
 } DNS_DEVICE_PATH;\r
 \r
 ///\r
@@ -842,7 +843,7 @@ typedef struct {
   ///\r
   /// Instance of the URI pursuant to RFC 3986.\r
   ///\r
-  CHAR8                           Uri[1024];\r
+  CHAR8                           Uri[];\r
 } URI_DEVICE_PATH;\r
 \r
 ///\r
@@ -1373,7 +1374,7 @@ extern EFI_GUID  gEfiDebugPortVariableGuid;
 // DebugPort device path definitions...\r
 //\r
 #define DEVICE_PATH_MESSAGING_DEBUGPORT EFI_DEBUGPORT_PROTOCOL_GUID\r
-extern EFI_GUID  gEfiDebugPortDevicePathGuid;\r
+extern EFI_GUID  gEfiDebugPortProtocolGuid;\r
 \r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r