From c1e2b152896dee2ace6304bf2f0a752c86b37b02 Mon Sep 17 00:00:00 2001
From: ydong10 <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 23 Feb 2011 05:08:04 +0000
Subject: 1.Refine all the goto and action opcode. When the menu link to the
 sub form, use the goto opcode and show the arrow. Others use the action
 opcode. 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
---
 .../Universal/BdsDxe/DeviceMngr/DeviceManager.c    | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c')

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