Remove Framework HII "class\subclass" in all VFR

[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 1de7db75ad6e72ea9114bb0cb3fedf6a697faabf..2456c51c8c33a05ad9dd9286883290a858499779 100644 (file)
--- a/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/IScsiDxe/IScsiConfigDxe.vfr
@@ -1,8 +1,8 @@
 /** @file\r
-  Vfr file for IScsi config.\r
+  Vfr file for iSCSI config.\r
   \r
-Copyright (c) 2004 - 2008, 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
@@ -16,18 +16,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IScsiConfigNVDataStruc.h"\r
 #define EFI_NETWORK_DEVICE_CLASS  0x04\r
 \r
-#define LABEL_END                 0xffff\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
-  subclass = 0x03,\r
 \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
@@ -36,7 +32,7 @@ formset
             help    = STRING_TOKEN(STR_ISCSI_CONFIG_INIT_NAME_HELP),\r
             flags   = INTERACTIVE,\r
             key     = KEY_INITIATOR_NAME,\r
-            minsize = 8,\r
+            minsize = ISCSI_NAME_IFR_MIN_SIZE,\r
             maxsize = ISCSI_NAME_IFR_MAX_SIZE,\r
     endstring;\r
 \r
@@ -107,7 +103,7 @@ formset
             help    = STRING_TOKEN(STR_ISCSI_TARGET_NAME),\r
             flags   = INTERACTIVE,\r
             key     = KEY_TARGET_NAME,\r
-            minsize = 8,\r
+            minsize = ISCSI_NAME_IFR_MIN_SIZE,\r
             maxsize = ISCSI_NAME_IFR_MAX_SIZE,\r
     endstring;\r
 \r
@@ -195,12 +191,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