MdeModulePkg/UefiBootManagerLib: Generate boot description for NVME

[mirror_edk2.git] / NetworkPkg / IScsiDxe / IScsiConfigVfr.vfr

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 0cf4ffeed98eefa4430ea853832dc0344c7ca345..d401419a03d9a56c7f7c7ad6eb93d1bc29ca3c74 100644 (file)
--- a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
+++ b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
@@ -1,7 +1,7 @@
 /** @file\r
   VFR file used by the iSCSI configuration component.\r
   \r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2017, 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
@@ -20,8 +20,6 @@ formset
   guid     = ISCSI_CONFIG_GUID,\r
   title    = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_TITLE),\r
   help     = STRING_TOKEN(STR_ISCSI_CONFIG_FORM_HELP),\r
-  class    = EFI_NETWORK_DEVICE_CLASS,\r
-  subclass = 0x03,\r
 \r
   varstore ISCSI_CONFIG_IFR_NVDATA,\r
     varid = CONFIGURATION_VARSTORE_ID,\r
@@ -85,18 +83,17 @@ formset
     label ORDER_ENTRY_LABEL;\r
     label LABEL_END;\r
 \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+    text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_ORDER_CHANGES;\r
-      \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+\r
+    text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_ORDER_CHANGES;\r
-\r
   endform;\r
 \r
   form formid = FORMID_DELETE_FORM,\r
@@ -105,18 +102,17 @@ formset
     label DELETE_ENTRY_LABEL;\r
     label LABEL_END;\r
 \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+    text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_DELETE_ATTEMPT;\r
-      \r
-    goto FORMID_MAIN_FORM,\r
-      prompt = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+\r
+    text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
+      text   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = KEY_IGNORE_DELETE_ATTEMPT;\r
-      \r
   endform;    \r
 \r
   form formid = FORMID_ATTEMPT_FORM,\r
@@ -125,10 +121,10 @@ formset
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.AttemptName,\r
             prompt  = STRING_TOKEN(STR_ISCSI_ATTEMPT_NAME),\r
             help    = STRING_TOKEN(STR_ISCSI_ATTEMPT_NAME_HELP),\r
-            flags   = INTERACTIVE,\r
+            flags   = READ_ONLY,\r
             key     = KEY_ATTEMPT_NAME,\r
             minsize = 0,\r
-            maxsize = ATTEMPT_NAME_MAX_SIZE,\r
+            maxsize = ATTEMPT_NAME_SIZE,\r
     endstring;\r
 \r
     subtitle text = STRING_TOKEN(STR_NULL);\r
@@ -253,12 +249,12 @@ formset
     endstring;\r
 \r
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.TargetIp,\r
-            prompt  = STRING_TOKEN(STR_ISCSI_TARGET_IP_ADDRESS),\r
-            help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
+            prompt  = STRING_TOKEN(STR_ISCSI_TARGET_ADDRESS),\r
+            help    = STRING_TOKEN(STR_ISCSI_TARGET_ADDRESS_HELP),\r
             flags   = INTERACTIVE,\r
             key     = KEY_TARGET_IP,\r
-            minsize = IP_MIN_SIZE,\r
-            maxsize = IP_MAX_SIZE,\r
+            minsize = ISCSI_TARGET_URI_MIN_SIZE,\r
+            maxsize = ISCSI_TARGET_URI_MAX_SIZE,\r
     endstring;\r
 \r
     numeric varid   = ISCSI_CONFIG_IFR_NVDATA.TargetPort,\r
@@ -346,14 +342,56 @@ formset
 \r
     endif;\r
 \r
-    subtitle text = STRING_TOKEN(STR_NULL);\r
+    suppressif TRUE;\r
+\r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ISCSIMacAddr,\r
+            prompt  = STRING_TOKEN(STR_ISCSI_MAC_PROMPT),\r
+            help    = STRING_TOKEN(STR_ISCSI_MAC_PROMPT),\r
+            minsize = 0,\r
+            maxsize = ISCSI_MAX_MAC_STRING_LEN,\r
+    endstring;\r
+\r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ISCSIAttemptOrder,\r
+            prompt  = STRING_TOKEN(STR_ISCSI_ATTEMPT_ORDER),\r
+            help    = STRING_TOKEN(STR_ISCSI_ATTEMPT_ORDER),\r
+            minsize = 0,\r
+            maxsize = ATTEMPT_NAME_LIST_SIZE,\r
+    endstring;\r
 \r
-    goto FORMID_ATTEMPT_FORM,\r
-    prompt = STRING_TOKEN (STR_SAVE_CHANGES),\r
-    help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),\r
-    flags  = INTERACTIVE,\r
-    key    = KEY_SAVE_ATTEMPT_CONFIG;\r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ISCSIAddAttemptList,\r
+            prompt  = STRING_TOKEN(STR_ISCSI_ADD_ATTEMPTS),\r
+            help    = STRING_TOKEN(STR_ISCSI_ADD_ATTEMPTS),\r
+            minsize = 0,\r
+            maxsize = ATTEMPT_NAME_LIST_SIZE,\r
+    endstring;\r
 \r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ISCSIDeleteAttemptList,\r
+            prompt  = STRING_TOKEN(STR_ISCSI_DELETE_ATTEMPTS),\r
+            help    = STRING_TOKEN(STR_ISCSI_DELETE_ATTEMPTS),\r
+            minsize = 0,\r
+            maxsize = ATTEMPT_NAME_LIST_SIZE,\r
+    endstring;\r
+\r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.ISCSIDisplayAttemptList,\r
+            prompt  = STRING_TOKEN(STR_ISCSI_DISPLAY_ATTEMPTS),\r
+            help    = STRING_TOKEN(STR_ISCSI_DISPLAY_ATTEMPTS),\r
+            flags   = READ_ONLY,\r
+            minsize = 0,\r
+            maxsize = ATTEMPT_NAME_LIST_SIZE,\r
+    endstring;\r
+\r
+    label KEYWORD_ENTRY_LABEL;\r
+    label LABEL_END;\r
+    endif;\r
+\r
+    subtitle text = STRING_TOKEN(STR_NULL);\r
+\r
+    text\r
+      help   = STRING_TOKEN (STR_SAVE_CHANGES_HELP),\r
+      text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
+      flags  = INTERACTIVE,\r
+      key    = KEY_SAVE_ATTEMPT_CONFIG;\r
+      \r
     goto FORMID_MAIN_FORM,\r
     prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r
     help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r