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

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr b/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr
index 7247bbe99766b01c9f95c40265462c4ce3b8cc98..92474124e2d9233fa16c04335923199919e44114 100644 (file)
--- 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),\r
          flags = INTERACTIVE,\r
          key = FORM_TIME_OUT_ID;\r
+\r
+    subtitle text = STRING_TOKEN(STR_NULL_STRING);\r
+\r
+    text\r
+         help   = STRING_TOKEN(STR_RESET),\r
+         text   = STRING_TOKEN(STR_RESET),\r
+         flags  = INTERACTIVE,\r
+         key    = FORM_RESET;\r
          \r
     label LABEL_BMM_PLATFORM_INFORMATION;\r
     //\r

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c b/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
index aec6b85c2212caff9268b7909f6da52032cbfe1c..4f46ed69c06c1740c59c810d5685fbd3db9443ce 100644 (file)
--- 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;\r
 \r
       break;\r
+ \r
+    case FORM_RESET:\r
+      gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
+      return EFI_UNSUPPORTED;\r
 \r
     default:\r
       break;\r

diff --git a/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h b/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
index 4b1efb710969096c30f2a77c92a1ee3acb6627f1..2126b3d67a1a4ac387d116b495b7aca6acb6a769 100644 (file)
--- 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\r
 #define KEY_VALUE_NO_SAVE_AND_EXIT           0x110C\r
 #define KEY_VALUE_BOOT_FROM_FILE             0x110D\r
+#define FORM_RESET                           0x110E\r
 \r
 #define MAXIMUM_NORMAL_KEY_VALUE             0x11FF\r
 \r

diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/MdeModulePkg/Application/UiApp/FrontPage.c
index 4e80d7c6dac2025bf0c65fe7edbba2b0d706ee9a..7d1cf2a6334ee6a58ff02c520c17dd81402e04d5 100644 (file)
--- a/MdeModulePkg/Application/UiApp/FrontPage.c
+++ b/MdeModulePkg/Application/UiApp/FrontPage.c
@@ -449,14 +449,6 @@ FrontPageCallback (
       InitializeLanguage();\r
       break;\r
 \r
-\r
-    case FRONT_PAGE_KEY_RESET:\r
-      //\r
-      // Reset\r
-      //\r
-      gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
-      return EFI_UNSUPPORTED;\r
-\r
     default:\r
       break;\r
     }\r

diff --git a/MdeModulePkg/Application/UiApp/FrontPage.h b/MdeModulePkg/Application/UiApp/FrontPage.h
index 08d16929cfea0c1fe87fe9bfaacf86ab8b68c676..c5d4c427463f022d35196c174fa1d902efafcf45 100644 (file)
--- 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\r
 #define FRONT_PAGE_KEY_DEVICE_MANAGER  0x8567\r
 #define FRONT_PAGE_KEY_BOOT_MAINTAIN   0x9876\r
-#define FRONT_PAGE_KEY_RESET           0X7654\r
 \r
 #define LABEL_SELECT_LANGUAGE          0x1000\r
 #define LABEL_PLATFORM_INFORMATION     0x1001\r