UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / NetworkPkg / Ip6Dxe / Ip6NvData.h

diff --git a/NetworkPkg/Ip6Dxe/Ip6NvData.h b/NetworkPkg/Ip6Dxe/Ip6NvData.h
index 09177613fbc9e4b8e45efe035f3fe30b59f68dd1..d1c1c13345f7bdccc5e039dd86b7e8d284724c26 100644 (file)
--- a/NetworkPkg/Ip6Dxe/Ip6NvData.h
+++ b/NetworkPkg/Ip6Dxe/Ip6NvData.h
@@ -3,13 +3,7 @@
 \r
   Copyright (c) 2010 - 2013, Intel Corporation. All rights reserved.<BR>\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  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
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
@@ -18,35 +12,35 @@
 \r
 #include <Guid/Ip6ConfigHii.h>\r
 \r
-#define FORMID_MAIN_FORM          1\r
-#define FORMID_MANUAL_CONFIG_FORM 2\r
-#define FORMID_HEAD_FORM          3\r
-\r
-#define IP6_POLICY_AUTO           0\r
-#define IP6_POLICY_MANUAL         1\r
-#define DAD_MAX_TRANSMIT_COUNT    10\r
-\r
-#define KEY_INTERFACE_ID          0x101\r
-#define KEY_MANUAL_ADDRESS        0x102\r
-#define KEY_GATEWAY_ADDRESS       0x103\r
-#define KEY_DNS_ADDRESS           0x104\r
-#define KEY_SAVE_CHANGES          0x105\r
-#define KEY_SAVE_CONFIG_CHANGES   0x106\r
-#define KEY_IGNORE_CONFIG_CHANGES 0x107\r
-#define KEY_GET_CURRENT_SETTING   0x108\r
-\r
-#define HOST_ADDRESS_LABEL        0x9000\r
-#define ROUTE_TABLE_LABEL         0xa000\r
-#define GATEWAY_ADDRESS_LABEL     0xb000\r
-#define DNS_ADDRESS_LABEL         0xc000\r
-#define LABEL_END                 0xffff\r
-\r
-#define INTERFACE_ID_STR_MIN_SIZE 1\r
-#define INTERFACE_ID_STR_MAX_SIZE 23\r
-#define INTERFACE_ID_STR_STORAGE  25\r
-#define IP6_STR_MAX_SIZE          40\r
-#define ADDRESS_STR_MIN_SIZE      2\r
-#define ADDRESS_STR_MAX_SIZE      255\r
+#define FORMID_MAIN_FORM           1\r
+#define FORMID_MANUAL_CONFIG_FORM  2\r
+#define FORMID_HEAD_FORM           3\r
+\r
+#define IP6_POLICY_AUTO         0\r
+#define IP6_POLICY_MANUAL       1\r
+#define DAD_MAX_TRANSMIT_COUNT  10\r
+\r
+#define KEY_INTERFACE_ID           0x101\r
+#define KEY_MANUAL_ADDRESS         0x102\r
+#define KEY_GATEWAY_ADDRESS        0x103\r
+#define KEY_DNS_ADDRESS            0x104\r
+#define KEY_SAVE_CHANGES           0x105\r
+#define KEY_SAVE_CONFIG_CHANGES    0x106\r
+#define KEY_IGNORE_CONFIG_CHANGES  0x107\r
+#define KEY_GET_CURRENT_SETTING    0x108\r
+\r
+#define HOST_ADDRESS_LABEL     0x9000\r
+#define ROUTE_TABLE_LABEL      0xa000\r
+#define GATEWAY_ADDRESS_LABEL  0xb000\r
+#define DNS_ADDRESS_LABEL      0xc000\r
+#define LABEL_END              0xffff\r
+\r
+#define INTERFACE_ID_STR_MIN_SIZE  1\r
+#define INTERFACE_ID_STR_MAX_SIZE  23\r
+#define INTERFACE_ID_STR_STORAGE   25\r
+#define IP6_STR_MAX_SIZE           40\r
+#define ADDRESS_STR_MIN_SIZE       2\r
+#define ADDRESS_STR_MAX_SIZE       255\r
 \r
 ///\r
 /// IP6_CONFIG_IFR_NVDATA contains the IP6 configure\r
@@ -54,16 +48,15 @@
 ///\r
 #pragma pack(1)\r
 typedef struct {\r
-  UINT8           IfType;                                 ///< interface type\r
-  UINT8           Padding[3];\r
-  UINT32          Policy;                                 ///< manual or automatic\r
-  UINT32          DadTransmitCount;                       ///< dad transmits count\r
-  CHAR16          InterfaceId[INTERFACE_ID_STR_STORAGE];  ///< alternative interface id\r
-  CHAR16          ManualAddress[ADDRESS_STR_MAX_SIZE];    ///< IP addresses\r
-  CHAR16          GatewayAddress[ADDRESS_STR_MAX_SIZE];   ///< Gateway address\r
-  CHAR16          DnsAddress[ADDRESS_STR_MAX_SIZE];       ///< DNS server address\r
+  UINT8     IfType;                                       ///< interface type\r
+  UINT8     Padding[3];\r
+  UINT32    Policy;                                       ///< manual or automatic\r
+  UINT32    DadTransmitCount;                             ///< dad transmits count\r
+  CHAR16    InterfaceId[INTERFACE_ID_STR_STORAGE];        ///< alternative interface id\r
+  CHAR16    ManualAddress[ADDRESS_STR_MAX_SIZE];          ///< IP addresses\r
+  CHAR16    GatewayAddress[ADDRESS_STR_MAX_SIZE];         ///< Gateway address\r
+  CHAR16    DnsAddress[ADDRESS_STR_MAX_SIZE];             ///< DNS server address\r
 } IP6_CONFIG_IFR_NVDATA;\r
 #pragma pack()\r
 \r
 #endif\r
-\r