MdeModulePkg/FrameBufferBltLib: Fix copying of unaligned memory

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

diff --git a/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr b/NetworkPkg/IScsiDxe/IScsiConfigVfr.vfr
index 4a322cfd69f9387b4fc1f5b376dfd6627b9e7ceb..35e8f9a2751ba25ac19bc002df826db61dd2c9d1 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
@@ -88,14 +86,12 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = 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
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = 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
   endform;\r
@@ -109,14 +105,12 @@ formset
     text\r
       help   = STRING_TOKEN (STR_SAVE_AND_EXIT),\r
       text   = 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
     text\r
       help   = STRING_TOKEN (STR_NO_SAVE_AND_EXIT),\r
       text   = 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
   endform;    \r
@@ -127,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
@@ -197,9 +191,10 @@ formset
     endcheckbox;\r
     endif;\r
 \r
-    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01 OR\r
-               ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_IP6 OR \r
+    suppressif ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_IP6 OR \r
                ideqval ISCSI_CONFIG_IFR_NVDATA.IpMode == IP_MODE_AUTOCONFIG;\r
+               \r
+    grayoutif ideqval ISCSI_CONFIG_IFR_NVDATA.InitiatorInfoFromDhcp == 0x01;\r
     string  varid   = ISCSI_CONFIG_IFR_NVDATA.LocalIp,\r
             prompt  = STRING_TOKEN(STR_ISCSI_LOCAL_IP_ADDRESS),\r
             help    = STRING_TOKEN(STR_ISCSI_IP_ADDRESS_HELP),\r
@@ -226,6 +221,7 @@ formset
             minsize = IP4_MIN_SIZE,\r
             maxsize = IP4_MAX_SIZE,\r
     endstring;\r
+    endif;\r
     \r
     endif;\r
 \r
@@ -255,12 +251,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
@@ -348,12 +344,53 @@ formset
 \r
     endif;\r
 \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
+    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
-        text   = STRING_TOKEN (STR_SAVE_CHANGES),\r
       flags  = INTERACTIVE,\r
       key    = KEY_SAVE_ATTEMPT_CONFIG;\r
       \r