Enhance iSCSI ibft table for copy oemid and oemtableID from acpi tables.

[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 eb9e7dc3c24066aa636fe1173458f13155f472aa..2e9736ec3271fbf33d851aaab0b54365b3ae9ffb 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigNVDataStruc.h
@@ -30,7 +30,7 @@ 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_MAX_SIZE   223\r
 \r
 #define IP_MIN_SIZE               7\r
 #define IP_MAX_SIZE               15\r
@@ -47,6 +47,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define TARGET_PORT_MAX_NUM       65535\r
 \r
 #define DEVICE_ENTRY_LABEL        0x1234\r
+#define LABEL_END                 0xffff\r
 \r
 #define KEY_INITIATOR_NAME        0x101\r
 #define KEY_DHCP_ENABLE           0x102\r
@@ -65,8 +66,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #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
 \r
 #pragma pack(1)\r
@@ -88,9 +94,9 @@ typedef struct {
 \r
   UINT8   CHAPType;\r
   CHAR16  CHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
+  CHAR16  CHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
   CHAR16  ReverseCHAPName[ISCSI_CHAP_NAME_MAX_LEN];\r
-  CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_MAX_LEN];\r
+  CHAR16  ReverseCHAPSecret[ISCSI_CHAP_SECRET_STORAGE];\r
 } ISCSI_CONFIG_IFR_NVDATA;\r
 #pragma pack()\r
 \r