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

[mirror_edk2.git] / MdeModulePkg / Universal / Network / Ip4ConfigDxe / Ip4ConfigDxe.vfr

diff --git a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
index de971962b68a90aca7e60809a2988713705de9a2..661f6262c97dbd15ce67d249ccd13a1d9d04ab2c 100644 (file)
--- a/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
+++ b/MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.vfr
@@ -1,8 +1,8 @@
 /** @file\r
   Vfr file for IP4 config.\r
 \r
-Copyright (c) 2009, Intel Corporation.<BR>\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2009 - 2010, 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
@@ -29,55 +29,62 @@ formset
   form formid = FORMID_MAIN_FORM,\r
     title  = STRING_TOKEN(STR_IP4_DEVICE_FORM_TITLE);\r
 \r
-    checkbox varid = EfiNicIp4ConfigVariable.DhcpEnable,\r
-            prompt = STRING_TOKEN(STR_IP4_ENABLE_DHCP),\r
-            help   = STRING_TOKEN(STR_IP4_ENABLE_DHCP),\r
+    checkbox varid = EfiNicIp4ConfigVariable.Configure,\r
+            prompt = STRING_TOKEN(STR_IP4_CONFIGURE),\r
+            help   = STRING_TOKEN(STR_IP4_CONFIGURE),\r
             flags  = INTERACTIVE,\r
-            key    = KEY_DHCP_ENABLE,\r
+            key    = KEY_ENABLE,\r
     endcheckbox;\r
 \r
-    suppressif ideqval EfiNicIp4ConfigVariable.DhcpEnable == 0x01;\r
-    string  varid   = EfiNicIp4ConfigVariable.StationAddress,\r
-            prompt  = STRING_TOKEN(STR_IP4_LOCAL_IP_ADDRESS),\r
-            help    = STRING_TOKEN(STR_IP4_IP_ADDRESS_HELP),\r
-            flags   = INTERACTIVE,\r
-            key     = KEY_LOCAL_IP,\r
-            minsize = IP_MIN_SIZE,\r
-            maxsize = IP_MAX_SIZE,\r
-    endstring;\r
-\r
-    string  varid   = EfiNicIp4ConfigVariable.SubnetMask,\r
-            prompt  = STRING_TOKEN(STR_IP4_LOCAL_MASK),\r
-            help    = STRING_TOKEN(STR_IP4_IP_ADDRESS_HELP),\r
-            flags   = INTERACTIVE,\r
-            key     = KEY_SUBNET_MASK,\r
-            minsize = IP_MIN_SIZE,\r
-           maxsize = IP_MAX_SIZE,\r
-    endstring;\r
-\r
-    string  varid   = EfiNicIp4ConfigVariable.GatewayAddress,\r
-            prompt  = STRING_TOKEN(STR_IP4_LOCAL_GATEWAY),\r
-            help    = STRING_TOKEN(STR_IP4_IP_ADDRESS_HELP),\r
-            flags   = INTERACTIVE,\r
-            key     = KEY_GATE_WAY,\r
-            minsize = IP_MIN_SIZE,\r
-            maxsize = IP_MAX_SIZE,\r
-    endstring;\r
-    endif;\r
+    suppressif ideqval EfiNicIp4ConfigVariable.Configure == 0x00;\r
 \r
-    subtitle text = STRING_TOKEN(STR_NULL);\r
+      checkbox varid = EfiNicIp4ConfigVariable.DhcpEnable,\r
+              prompt = STRING_TOKEN(STR_IP4_ENABLE_DHCP),\r
+              help   = STRING_TOKEN(STR_IP4_ENABLE_DHCP),\r
+              flags  = INTERACTIVE,\r
+              key    = KEY_DHCP_ENABLE,\r
+      endcheckbox;\r
+    endif;\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
+    suppressif ideqval EfiNicIp4ConfigVariable.DhcpEnable == 0x01 OR ideqval EfiNicIp4ConfigVariable.Configure == 0x00;\r
+\r
+      string  varid   = EfiNicIp4ConfigVariable.StationAddress,\r
+              prompt  = STRING_TOKEN(STR_IP4_LOCAL_IP_ADDRESS),\r
+              help    = STRING_TOKEN(STR_IP4_IP_ADDRESS_HELP),\r
+              flags   = INTERACTIVE,\r
+              key     = KEY_LOCAL_IP,\r
+              minsize = IP_MIN_SIZE,\r
+              maxsize = IP_MAX_SIZE,\r
+      endstring;\r
+\r
+      string  varid   = EfiNicIp4ConfigVariable.SubnetMask,\r
+              prompt  = STRING_TOKEN(STR_IP4_LOCAL_MASK),\r
+              help    = STRING_TOKEN(STR_IP4_IP_ADDRESS_HELP),\r
+              flags   = INTERACTIVE,\r
+              key     = KEY_SUBNET_MASK,\r
+              minsize = IP_MIN_SIZE,\r
+             maxsize = IP_MAX_SIZE,\r
+      endstring;\r
+\r
+      string  varid   = EfiNicIp4ConfigVariable.GatewayAddress,\r
+              prompt  = STRING_TOKEN(STR_IP4_LOCAL_GATEWAY),\r
+              help    = STRING_TOKEN(STR_IP4_IP_ADDRESS_HELP),\r
+              flags   = INTERACTIVE,\r
+              key     = KEY_GATE_WAY,\r
+              minsize = IP_MIN_SIZE,\r
+              maxsize = IP_MAX_SIZE,\r
+      endstring;\r
 \r
-    goto FORMID_MAIN_FORM,\r
-    prompt = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r
-    help   = STRING_TOKEN (STR_RETURN_MAIN_FORM),\r
-    flags  = 0;\r
+    endif;\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
   endform;\r
 \r
 endformset;\r