Clean up the code. Action statement should not have text two opcode.

[mirror_edk2.git] / MdeModulePkg / Universal / Network / IScsiDxe / IScsiConfigDxe.vfr

diff --git a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
index 101902b7e9f16b757e76f603204572bbaa7a1491..018fe059880988440acf50f37fe7702bea1c1179 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -1,7 +1,7 @@
 /** @file\r
   Vfr file for iSCSI config.\r
   \r
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\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
@@ -17,7 +17,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define EFI_NETWORK_DEVICE_CLASS  0x04\r
 \r
 formset \r
-  guid     = ISCSI_CONFIG_GUID,\r
+  guid     = IP4_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
@@ -25,7 +25,7 @@ formset
 \r
   varstore ISCSI_CONFIG_IFR_NVDATA,\r
     name = ISCSI_CONFIG_IFR_NVDATA,\r
-    guid = ISCSI_CONFIG_GUID;\r
+    guid = IP4_ISCSI_CONFIG_GUID;\r
   form formid = FORMID_MAIN_FORM,\r
     title  = STRING_TOKEN(STR_ISCSI_MAIN_FORM_TITLE);\r
 \r
@@ -193,12 +193,23 @@ formset
 \r
     subtitle text = STRING_TOKEN(STR_NULL); \r
 \r
-    goto FORMID_DEVICE_FORM,  \r
-    prompt = STRING_TOKEN (STR_SAVE_CHANGES),\r
-    help   = STRING_TOKEN (STR_SAVE_CHANGES),\r
-    flags  = INTERACTIVE,\r
-    key    = KEY_SAVE_CHANGES;\r
+    string  varid   = ISCSI_CONFIG_IFR_NVDATA.IsId, \r
+            prompt  = STRING_TOKEN(STR_ISCSI_CONFIG_ISID),\r
+            help    = STRING_TOKEN(STR_ISCSI_CONFIG_ISID_HELP),\r
+            flags   = INTERACTIVE,\r
+            key     = KEY_CONFIG_ISID,\r
+            minsize = ISID_CONFIGURABLE_MIN_LEN,\r
+            maxsize = ISID_CONFIGURABLE_MAX_LEN,\r
+    endstring;\r
 \r
+    subtitle text = STRING_TOKEN(STR_NULL); \r
+\r
+    text\r
+      help   = STRING_TOKEN (STR_SAVE_CHANGES),\r
+      text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
+      flags  = INTERACTIVE,\r
+      key    = KEY_SAVE_CHANGES;\r
+      \r
     goto FORMID_MAIN_FORM, \r
     prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM), \r
     help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r