i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Added warm reboot functionality based on a patch by Grey, thanks! It can be

Browse Source 
invoked using the 'w' key.
* Checking allocations doesn't hurt.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36311 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-04-15 18:10:00 +00:00
parent 868aa7a0e0
commit e3ce6e4be5
1 changed files with 70 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/bios_ia32/menu.cpp
+51 -9
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2009, Axel Dörfler, [email protected]. * Copyright 2004-2010, Axel Dörfler, [email protected].
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
*/ */
@@ -12,6 +12,27 @@
#include <safemode.h> #include <safemode.h>
static void
warm_reboot(char key)
{
asm(" cli ;"
" movl $0x11, %eax ;"
" movl %eax, %cr0 ;"
" movl $0x0, %eax ;"
" movl %eax, %cr3 ;"
" movl $0x200, %eax ;"
" movl %eax, %cr4 ;"
" lidt saved_idt ;"
" call switch_to_real_mode ;"
" int $0x19 ;"
" .p2align 4 ;"
"saved_idt: ;"
" .short 0x7ff ;"
" .long 0x0 ;"
" .long 0x0 ;");
}
void void
platform_add_menus(Menu* menu) platform_add_menus(Menu* menu)
{ {
@@ -19,35 +40,56 @@ platform_add_menus(Menu *menu)
switch (menu->Type()) { switch (menu->Type()) {
case MAIN_MENU: case MAIN_MENU:
menu->AddItem(item = new(nothrow) MenuItem("Select fail-safe video mode", video_mode_menu())); item = new(std::nothrow) MenuItem("Select fail-safe video mode",
video_mode_menu());
if (item != NULL) {
menu->AddItem(item);
item->SetTarget(video_mode_hook); item->SetTarget(video_mode_hook);
item->SetShortcut('v');
}
menu->AddShortcut('w', warm_reboot);
break; break;
case SAFE_MODE_MENU: case SAFE_MODE_MENU:
menu->AddItem(item = new(nothrow) MenuItem("Use fail-safe video mode")); item = new(std::nothrow) MenuItem("Use fail-safe video mode");
if (item != NULL) {
menu->AddItem(item);
item->SetType(MENU_ITEM_MARKABLE); item->SetType(MENU_ITEM_MARKABLE);
item->SetData(B_SAFEMODE_FAIL_SAFE_VIDEO_MODE); item->SetData(B_SAFEMODE_FAIL_SAFE_VIDEO_MODE);
item->SetHelpText("The system will use VESA mode " item->SetHelpText("The system will use VESA mode "
"and won't try to use any video graphics drivers."); "and won't try to use any video graphics drivers.");
}
smp_add_safemode_menus(menu); smp_add_safemode_menus(menu);
menu->AddItem(item = new(nothrow) MenuItem("Don't call the BIOS")); item = new(std::nothrow) MenuItem("Don't call the BIOS");
item->SetHelpText("Stops the system from calling BIOS functions."); if (item != NULL) {
menu->AddItem(item);
item->SetHelpText("Stops the system from calling BIOS "
"functions.");
item->SetType(MENU_ITEM_MARKABLE); item->SetType(MENU_ITEM_MARKABLE);
}
menu->AddItem(item = new(nothrow) MenuItem("Disable APM")); item = new(std::nothrow) MenuItem("Disable APM");
if (item != NULL) {
menu->AddItem(item);
item->SetType(MENU_ITEM_MARKABLE); item->SetType(MENU_ITEM_MARKABLE);
item->SetData(B_SAFEMODE_DISABLE_APM); item->SetData(B_SAFEMODE_DISABLE_APM);
item->SetHelpText("Disables Advanced Power Management hardware " item->SetHelpText("Disables Advanced Power Management hardware "
"support, overriding the APM setting in the kernel settings " "support, overriding the APM setting in the kernel "
"file."); "settings file.");
}
menu->AddItem(item = new(nothrow) MenuItem("Disable ACPI")); item = new(std::nothrow) MenuItem("Disable ACPI");
if (item != NULL) {
menu->AddItem(item);
item->SetType(MENU_ITEM_MARKABLE); item->SetType(MENU_ITEM_MARKABLE);
item->SetData(B_SAFEMODE_DISABLE_ACPI); item->SetData(B_SAFEMODE_DISABLE_ACPI);
item->SetHelpText("Disables Advanced Configuration and Power " item->SetHelpText("Disables Advanced Configuration and Power "
"Interface hardware support, overriding the ACPI setting " "Interface hardware support, overriding the ACPI setting "
"in the kernel settings file."); "in the kernel settings file.");
}
break; break;
default: default: