Refine code make callback logic same with frontPage.

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

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 1d4b0f525653dc74d6c9be8caf1753f8b2ba2daf..3fa24ad6d527eaaa85a9a1cdea993d2731a9479d 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -505,6 +505,10 @@ CallDeviceManager (
   //\r
   if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) {\r
     CallDriverHealth ();\r
+    //\r
+    // Force return to Device Manager\r
+    //\r
+    gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;\r
   }\r
 \r
   //\r
@@ -849,7 +853,7 @@ CallDriverHealth (
   // a target to display.\r
   // Process the diver health status states here.\r
   // \r
-  if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY && gCallbackKey != FRONT_PAGE_KEY_DEVICE_MANAGER) {\r
+  if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY) {\r
     ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
 \r
     Link = GetFirstNode (&DriverHealthList);\r
@@ -938,12 +942,12 @@ CallDriverHealth (
   HiiFreeOpCodeHandle (EndOpCodeHandleRepair); \r
 \r
   if (gCallbackKey == DRIVER_HEALTH_RETURN_KEY) {\r
+    //\r
+    // Force return to Driver Health Form\r
+    //\r
     gCallbackKey = DEVICE_MANAGER_KEY_DRIVER_HEALTH;\r
     CallDriverHealth ();\r
   }\r
-  if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) {\r
-    CallDeviceManager();\r
-  }\r
 }\r
 \r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index b217d0a9b9d51facc012d27ed2f024323c0a66df..55a988467f9c87a51b9cffcab521abbcb19171ee 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -1054,7 +1054,7 @@ PlatformBdsEnterFrontPage (
       //\r
       // User chose to run the Boot Manager\r
       //\r
-      CallBootManager();\r
+      CallBootManager ();\r
       break;\r
 \r
     case FRONT_PAGE_KEY_DEVICE_MANAGER:\r
@@ -1062,7 +1062,7 @@ PlatformBdsEnterFrontPage (
       // Display the Device Manager\r
       //\r
       do {\r
-        CallDeviceManager();\r
+        CallDeviceManager ();\r
       } while (gCallbackKey == FRONT_PAGE_KEY_DEVICE_MANAGER);\r
       break;\r
 \r