diff options
author | gikidy <gikidy@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-12-07 05:55:07 +0000 |
---|---|---|
committer | gikidy <gikidy@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-12-07 05:55:07 +0000 |
commit | bd2057a846ee3b65e76b4398129cc02b93c46fbd (patch) | |
tree | 133769c253def65ea5e48d3339ce751e140c71a7 | |
parent | 56385d49874f4b7cee6c9a0652c6b7c10aff0e2f (diff) | |
download | edk2-bd2057a846ee3b65e76b4398129cc02b93c46fbd.zip edk2-bd2057a846ee3b65e76b4398129cc02b93c46fbd.tar.gz edk2-bd2057a846ee3b65e76b4398129cc02b93c46fbd.tar.bz2 |
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
-rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c | 12 | ||||
-rw-r--r-- | IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index 1d4b0f5..3fa24ad 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -505,6 +505,10 @@ CallDeviceManager ( //
if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) {
CallDriverHealth ();
+ //
+ // Force return to Device Manager
+ //
+ gCallbackKey = FRONT_PAGE_KEY_DEVICE_MANAGER;
}
//
@@ -849,7 +853,7 @@ CallDriverHealth ( // a target to display.
// Process the diver health status states here.
//
- if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY && gCallbackKey != FRONT_PAGE_KEY_DEVICE_MANAGER) {
+ if (gCallbackKey >= DRIVER_HEALTH_KEY_OFFSET && gCallbackKey != DRIVER_HEALTH_REPAIR_ALL_KEY) {
ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;
Link = GetFirstNode (&DriverHealthList);
@@ -938,12 +942,12 @@ CallDriverHealth ( HiiFreeOpCodeHandle (EndOpCodeHandleRepair);
if (gCallbackKey == DRIVER_HEALTH_RETURN_KEY) {
+ //
+ // Force return to Driver Health Form
+ //
gCallbackKey = DEVICE_MANAGER_KEY_DRIVER_HEALTH;
CallDriverHealth ();
}
- if (gCallbackKey == DEVICE_MANAGER_KEY_DRIVER_HEALTH) {
- CallDeviceManager();
- }
}
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c index b217d0a..55a9884 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c @@ -1054,7 +1054,7 @@ PlatformBdsEnterFrontPage ( //
// User chose to run the Boot Manager
//
- CallBootManager();
+ CallBootManager ();
break;
case FRONT_PAGE_KEY_DEVICE_MANAGER:
@@ -1062,7 +1062,7 @@ PlatformBdsEnterFrontPage ( // Display the Device Manager
//
do {
- CallDeviceManager();
+ CallDeviceManager ();
} while (gCallbackKey == FRONT_PAGE_KEY_DEVICE_MANAGER);
break;
|