diff options
| author | Eric Dong <eric.dong@intel.com> | 2015-07-31 02:14:26 +0000 |
|---|---|---|
| committer | ydong10 <ydong10@Edk2> | 2015-07-31 02:14:26 +0000 |
| commit | 00db1dfca269f861c5dde055b1ac7129ea99e1b8 (patch) | |
| tree | 912f9c44d1caebb58a3e1ea984493b3cb3cc1ea0 /MdeModulePkg | |
| parent | b44b55a2dfc554015215919bf98f03d8fb386d34 (diff) | |
| download | edk2-00db1dfca269f861c5dde055b1ac7129ea99e1b8.tar.gz edk2-00db1dfca269f861c5dde055b1ac7129ea99e1b8.tar.bz2 edk2-00db1dfca269f861c5dde055b1ac7129ea99e1b8.zip | |
UiApp: Move reset menu from Front Page to BMM Page.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18121 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
| -rw-r--r-- | MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c | 4 | ||||
| -rw-r--r-- | MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h | 1 | ||||
| -rw-r--r-- | MdeModulePkg/Application/UiApp/FrontPage.c | 8 | ||||
| -rw-r--r-- | MdeModulePkg/Application/UiApp/FrontPage.h | 1 |
5 files changed, 13 insertions, 9 deletions
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr b/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr index 7247bbe997..92474124e2 100644 --- a/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr +++ b/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr @@ -77,6 +77,14 @@ formset help = STRING_TOKEN(STR_FORM_TIME_OUT_HELP),
flags = INTERACTIVE,
key = FORM_TIME_OUT_ID;
+
+ subtitle text = STRING_TOKEN(STR_NULL_STRING);
+
+ text
+ help = STRING_TOKEN(STR_RESET),
+ text = STRING_TOKEN(STR_RESET),
+ flags = INTERACTIVE,
+ key = FORM_RESET;
label LABEL_BMM_PLATFORM_INFORMATION;
//
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c b/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c index aec6b85c22..4f46ed69c0 100644 --- a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c +++ b/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c @@ -602,6 +602,10 @@ BootMaintCallback ( *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
break;
+
+ case FORM_RESET:
+ gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
+ return EFI_UNSUPPORTED;
default:
break;
diff --git a/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h b/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h index 4b1efb7109..2126b3d67a 100644 --- a/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h +++ b/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h @@ -69,6 +69,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #define KEY_VALUE_SAVE_AND_EXIT 0x110B
#define KEY_VALUE_NO_SAVE_AND_EXIT 0x110C
#define KEY_VALUE_BOOT_FROM_FILE 0x110D
+#define FORM_RESET 0x110E
#define MAXIMUM_NORMAL_KEY_VALUE 0x11FF
diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/MdeModulePkg/Application/UiApp/FrontPage.c index 4e80d7c6da..7d1cf2a633 100644 --- a/MdeModulePkg/Application/UiApp/FrontPage.c +++ b/MdeModulePkg/Application/UiApp/FrontPage.c @@ -449,14 +449,6 @@ FrontPageCallback ( InitializeLanguage();
break;
-
- case FRONT_PAGE_KEY_RESET:
- //
- // Reset
- //
- gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
- return EFI_UNSUPPORTED;
-
default:
break;
}
diff --git a/MdeModulePkg/Application/UiApp/FrontPage.h b/MdeModulePkg/Application/UiApp/FrontPage.h index 08d16929cf..c5d4c42746 100644 --- a/MdeModulePkg/Application/UiApp/FrontPage.h +++ b/MdeModulePkg/Application/UiApp/FrontPage.h @@ -56,7 +56,6 @@ extern BOOLEAN gConnectAllHappened; #define FRONT_PAGE_KEY_BOOT_MANAGER 0x1064
#define FRONT_PAGE_KEY_DEVICE_MANAGER 0x8567
#define FRONT_PAGE_KEY_BOOT_MAINTAIN 0x9876
-#define FRONT_PAGE_KEY_RESET 0X7654
#define LABEL_SELECT_LANGUAGE 0x1000
#define LABEL_PLATFORM_INFORMATION 0x1001
|