Adopt new IPv4/IPv6 device path for network modules.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiConfigNVDataStruc.h

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
index 7b77a19e78ad98d699c3c49f0d32eda84c8d43c8..7c2e4e65fa8e752a66f804f09310c9c2f35446dc 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -1,8 +1,8 @@
 /** @file\r
   Define NVData structures used by the iSCSI configuration component\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\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
@@ -15,10 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _ISCSI_NVDATASTRUC_H_\r
 #define _ISCSI_NVDATASTRUC_H_\r
 \r
-#define ISCSI_CONFIG_GUID \\r
-  { \\r
-    0x6456ed61, 0x3579, 0x41c9, { 0x8a, 0x26, 0x0a, 0x0b, 0xd6, 0x2b, 0x78, 0xfc } \\r
-  }\r
+#include <Guid/Ip4IScsiConfigHii.h>\r
 \r
 #define VAR_EQ_TEST_NAME    0x100\r
 \r
@@ -30,7 +27,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Vfr has a limit on the size, it's 255 bytes.\r
 //\r
-#define ISCSI_NAME_IFR_MAX_SIZE   126\r
+#define ISCSI_NAME_IFR_MIN_SIZE   4\r
+#define ISCSI_NAME_IFR_MAX_SIZE   223\r
 \r
 #define IP_MIN_SIZE               7\r
 #define IP_MAX_SIZE               15\r
@@ -62,17 +60,28 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define KEY_SAVE_CHANGES          0x10b\r
 #define KEY_TARGET_NAME           0x10c\r
 #define KEY_BOOT_LUN              0x10d\r
+#define KEY_CONFIG_ISID           0x10e\r
 \r
 #define KEY_DEVICE_ENTRY_BASE     0x1000\r
 \r
 #define ISCSI_LUN_STR_MAX_LEN     21\r
-#define ISCSI_CHAP_SECRET_MIN_LEN 13\r
-#define ISCSI_CHAP_SECRET_MAX_LEN 17\r
+#define ISCSI_CHAP_SECRET_MIN_LEN 12\r
+#define ISCSI_CHAP_SECRET_MAX_LEN 16\r
+//\r
+//  ISCSI_CHAP_SECRET_STORAGE = ISCSI_CHAP_SECRET_MAX_LEN + sizeof (NULL-Terminator)\r
+//\r
+#define ISCSI_CHAP_SECRET_STORAGE 17\r
+\r
 #define ISCSI_CHAP_NAME_MAX_LEN   126\r
+#define ISCSI_CHAP_NAME_STORAGE   127\r
+\r
+#define ISID_CONFIGURABLE_MIN_LEN 6\r
+#define ISID_CONFIGURABLE_MAX_LEN 12\r
+#define ISID_CONFIGURABLE_STORAGE 13\r
 \r
 #pragma pack(1)\r
 typedef struct {\r
-  CHAR16  InitiatorName[ISCSI_NAME_IFR_MAX_SIZE];\r
+  CHAR16  InitiatorName[ISCSI_NAME_MAX_SIZE];\r
 \r
   UINT8   Enabled;\r
 \r
@@ -81,17 +90,19 @@ typedef struct {
   CHAR16  SubnetMask[IP4_STR_MAX_SIZE];\r
   CHAR16  Gateway[IP4_STR_MAX_SIZE];\r
 \r
-  CHAR16  TargetName[ISCSI_NAME_IFR_MAX_SIZE];\r
+  CHAR16  TargetName[ISCSI_NAME_MAX_SIZE];\r
   CHAR16  TargetIp[IP4_STR_MAX_SIZE];\r
   UINT16  TargetPort;\r
   CHAR16  BootLun[ISCSI_LUN_STR_MAX_LEN];\r
   UINT8   TargetInfoFromDhcp;\r
 \r
   UINT8   CHAPType;\r
-  CHAR16  CHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
-  CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
+  CHAR16  CHAPName[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+  CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_STORAGE];\r
+  CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
+\r
+  CHAR16  IsId[ISID_CONFIGURABLE_STORAGE];\r
 } ISCSI_CONFIG_IFR_NVDATA;\r
 #pragma pack()\r
 \r