1.Refine all the goto and action opcode. When the menu link to the sub form, use...

2.update the front page info. move down one line.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11335 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
index 77e1e801ac334d432cf82266ec5a76a77253e487..fd14a7714eb24f494c65b6bf666f1559e868227c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Bm.vfr
@@ -55,12 +55,11 @@ formset
 \r
     subtitle text = STRING_TOKEN(STR_NULL_STRING);\r
 \r
-    text\r
+    goto FORM_CON_MAIN_ID,\r
+         prompt = STRING_TOKEN(STR_BOOT_FROM_FILE),\r
          help   = STRING_TOKEN(STR_BOOT_FROM_FILE_HELP),\r
-         text   = STRING_TOKEN(STR_BOOT_FROM_FILE),\r
-         text   = STRING_TOKEN(STR_NULL_STRING),\r
-         flags  = INTERACTIVE,\r
-         key    = KEY_VALUE_BOOT_FROM_FILE;\r
+         flags = INTERACTIVE,\r
+         key = KEY_VALUE_BOOT_FROM_FILE;\r
 \r
     subtitle text = STRING_TOKEN(STR_NULL_STRING);\r
 \r
@@ -80,11 +79,12 @@ formset
 \r
     subtitle text = STRING_TOKEN(STR_NULL_STRING);\r
 \r
-    goto FORM_MAIN_ID,\r
-         prompt = STRING_TOKEN(STR_RESET),\r
-         help = STRING_TOKEN(STR_RESET),\r
-         flags = INTERACTIVE,\r
-         key = FORM_RESET;\r
+    text\r
+         help   = STRING_TOKEN(STR_RESET),\r
+         text   = STRING_TOKEN(STR_RESET),\r
+         text   = STRING_TOKEN(STR_NULL_STRING),\r
+         flags  = INTERACTIVE,\r
+         key    = FORM_RESET;\r
 \r
   endform;\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index dfc1b887a7acbca3c346e994f150ce43ba826a90..7da685103330c26c7f0369034122e418e6e49e56 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -883,13 +883,13 @@ CallDeviceManager (
         //\r
         if (!AddNetworkMenu) {\r
           AddNetworkMenu = TRUE;\r
-          HiiCreateActionOpCode (\r
+          HiiCreateGotoOpCode (\r
             StartOpCodeHandle,\r
-            (EFI_QUESTION_ID) QUESTION_NETWORK_DEVICE_ID,\r
+            DEVICE_MANAGER_FORM_ID,\r
             STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_TITLE),\r
             STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_HELP),\r
             EFI_IFR_FLAG_CALLBACK,\r
-            0\r
+            (EFI_QUESTION_ID) QUESTION_NETWORK_DEVICE_ID\r
             );\r
         }\r
       } else if (mNextShowFormId == NETWORK_DEVICE_LIST_FORM_ID) {\r
@@ -897,13 +897,13 @@ CallDeviceManager (
         // In network device list form, same mac address device only show one menu.\r
         //\r
         while (AddItemCount > 0) {\r
-            HiiCreateActionOpCode (\r
+            HiiCreateGotoOpCode (\r
               StartOpCodeHandle,\r
-              mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].QuestionId,\r
+              NETWORK_DEVICE_LIST_FORM_ID,\r
               mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].PromptId,\r
               STRING_TOKEN (STR_NETWORK_DEVICE_HELP),\r
               EFI_IFR_FLAG_CALLBACK,\r
-              0\r
+              mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].QuestionId\r
               );\r
             AddItemCount -= 1;\r
           }\r
@@ -911,13 +911,13 @@ CallDeviceManager (
         //\r
         // In network device form, only the selected mac address device need to be show.\r
         //\r
-        HiiCreateActionOpCode (\r
+        HiiCreateGotoOpCode (\r
           StartOpCodeHandle,\r
-          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),\r
+          NETWORK_DEVICE_FORM_ID,\r
           Token,\r
           TokenHelp,\r
           EFI_IFR_FLAG_CALLBACK,\r
-          0\r
+          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)\r
           );\r
       }\r
     } else {\r
@@ -926,13 +926,13 @@ CallDeviceManager (
       // Not network device process, only need to show at device manger form.\r
       //\r
       if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {\r
-        HiiCreateActionOpCode (\r
+        HiiCreateGotoOpCode (\r
           StartOpCodeHandle,\r
-          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),\r
+          DEVICE_MANAGER_FORM_ID,\r
           Token,\r
           TokenHelp,\r
           EFI_IFR_FLAG_CALLBACK,\r
-          0\r
+          (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)\r
           );\r
       }\r
     }\r
@@ -954,14 +954,14 @@ CallDeviceManager (
     // If driver health protocol is installed, create Driver Health subtitle and entry\r
     //\r
     HiiCreateSubTitleOpCode (StartOpCodeHandle, STRING_TOKEN (STR_DM_DRIVER_HEALTH_TITLE), 0, 0, 0);\r
-    HiiCreateActionOpCode (\r
-      StartOpCodeHandle,                                // Container for dynamic created opcodes\r
-      DEVICE_MANAGER_KEY_DRIVER_HEALTH,                 // Question ID\r
+    HiiCreateGotoOpCode (\r
+      StartOpCodeHandle,\r
+      DRIVER_HEALTH_FORM_ID,\r
       STRING_TOKEN(STR_DRIVER_HEALTH_ALL_HEALTHY),      // Prompt text\r
       STRING_TOKEN(STR_DRIVER_HEALTH_STATUS_HELP),      // Help text\r
-      EFI_IFR_FLAG_CALLBACK,                            // Question flag\r
-      0                                                 // Action String ID\r
-    );\r
+      EFI_IFR_FLAG_CALLBACK,\r
+      DEVICE_MANAGER_KEY_DRIVER_HEALTH                  // Question ID\r
+      );\r
 \r
     //\r
     // Check All Driver health status\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index 9a71f09538eec7370259524ad2e0c93b990b59eb..ebb70dd67f55c1f62692533e6c50b3a17ff77359 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -49,27 +49,27 @@ formset
 \r
     banner\r
       title = STRING_TOKEN(STR_FRONT_PAGE_COMPUTER_MODEL),\r
-      line  0,\r
+      line  1,\r
       align left;\r
 \r
     banner\r
       title = STRING_TOKEN(STR_FRONT_PAGE_CPU_MODEL),\r
-      line  1,\r
+      line  2,\r
       align left;\r
 \r
     banner\r
       title = STRING_TOKEN(STR_FRONT_PAGE_CPU_SPEED),\r
-      line  1,\r
+      line  2,\r
       align right;\r
 \r
     banner\r
       title = STRING_TOKEN(STR_FRONT_PAGE_BIOS_VERSION),\r
-      line  2,\r
+      line  3,\r
       align left;\r
 \r
     banner\r
       title = STRING_TOKEN(STR_FRONT_PAGE_MEMORY_SIZE),\r
-      line  2,\r
+      line  3,\r
       align right;\r
 \r
 //    banner\r
@@ -102,9 +102,11 @@ formset
 //      line  3,\r
 //      align left;\r
 \r
-    goto FRONT_PAGE_ITEM_ONE,\r
-      prompt  = STRING_TOKEN(STR_CONTINUE_PROMPT),\r
+\r
+    text\r
       help    = STRING_TOKEN(STR_CONTINUE_HELP),\r
+      text    = STRING_TOKEN(STR_CONTINUE_PROMPT),\r
+      text    = STRING_TOKEN(STR_NULL_STRING),\r
       flags   = INTERACTIVE,\r
       key     = FRONT_PAGE_KEY_CONTINUE;\r
 \r