Revision: 18121
http://sourceforge.net/p/edk2/code/18121
Author: ydong10
Date: 2015-07-31 02:14:26 +0000 (Fri, 31 Jul 2015)
Log Message:
-----------
UiApp: Move reset menu from Front Page to BMM Page.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eric Dong <[email protected]>
Reviewed-by: Ruiyu Ni <[email protected]>
Modified Paths:
--------------
trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr
trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.c
trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.h
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr 2015-07-31
02:12:54 UTC (rev 18120)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/Bm.vfr 2015-07-31
02:14:26 UTC (rev 18121)
@@ -77,6 +77,14 @@
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;
//
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
2015-07-31 02:12:54 UTC (rev 18120)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/BootMaint.c
2015-07-31 02:14:26 UTC (rev 18121)
@@ -602,6 +602,10 @@
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;
break;
+
+ case FORM_RESET:
+ gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
+ return EFI_UNSUPPORTED;
default:
break;
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
2015-07-31 02:12:54 UTC (rev 18120)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/BootMaint/FormGuid.h
2015-07-31 02:14:26 UTC (rev 18121)
@@ -69,6 +69,7 @@
#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
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.c
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.c 2015-07-31
02:12:54 UTC (rev 18120)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.c 2015-07-31
02:14:26 UTC (rev 18121)
@@ -449,14 +449,6 @@
InitializeLanguage();
break;
-
- case FRONT_PAGE_KEY_RESET:
- //
- // Reset
- //
- gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
- return EFI_UNSUPPORTED;
-
default:
break;
}
Modified: trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.h
===================================================================
--- trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.h 2015-07-31
02:12:54 UTC (rev 18120)
+++ trunk/edk2/MdeModulePkg/Application/UiApp/FrontPage.h 2015-07-31
02:14:26 UTC (rev 18121)
@@ -56,7 +56,6 @@
#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
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
