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

added B_SAFEMODE_DISABLE_APM

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25334 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2008-05-06 22:04:25 +00:00
parent 7a58a3ed3d
commit 7c8ddc9795
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/safemode.h
+1
View File
@@ -15,6 +15,7 @@
#define B_SAFEMODE_DISABLE_USER_ADD_ONS "disableuseraddons" #define B_SAFEMODE_DISABLE_USER_ADD_ONS "disableuseraddons"
#define B_SAFEMODE_DISABLE_IDE_DMA "disableidedma" #define B_SAFEMODE_DISABLE_IDE_DMA "disableidedma"
#define B_SAFEMODE_DISABLE_ACPI "disable_acpi" #define B_SAFEMODE_DISABLE_ACPI "disable_acpi"
#define B_SAFEMODE_DISABLE_APM "disable_apm"
#define B_SAFEMODE_DISABLE_SMP "disable_smp" #define B_SAFEMODE_DISABLE_SMP "disable_smp"
#define B_SAFEMODE_DISABLE_HYPER_THREADING "disable_hyperthreading" #define B_SAFEMODE_DISABLE_HYPER_THREADING "disable_hyperthreading"
#define B_SAFEMODE_FAIL_SAFE_VIDEO_MODE "fail_safe_video_mode" #define B_SAFEMODE_FAIL_SAFE_VIDEO_MODE "fail_safe_video_mode"
src/system/boot/platform/bios_ia32/menu.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ platform_add_menus(Menu *menu)
menu->AddItem(item = new(nothrow) MenuItem("Disable APM")); menu->AddItem(item = new(nothrow) MenuItem("Disable APM"));
item->SetType(MENU_ITEM_MARKABLE); item->SetType(MENU_ITEM_MARKABLE);
item->SetData("disable_apm"); item->SetData(B_SAFEMODE_DISABLE_APM);
item->SetHelpText("This overrides the APM setting in the kernel settings file"); item->SetHelpText("This overrides the APM setting in the kernel settings file");
menu->AddItem(item = new(nothrow) MenuItem("Disable ACPI")); menu->AddItem(item = new(nothrow) MenuItem("Disable ACPI"));
src/system/kernel/arch/x86/apm.cpp
+1 -1
View File
@@ -291,7 +291,7 @@ apm_init(kernel_args *args)
handle = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS); handle = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS);
if (handle != NULL) { if (handle != NULL) {
apm = !get_driver_boolean_parameter(handle, "disable_apm", !apm, !apm); apm = !get_driver_boolean_parameter(handle, B_SAFEMODE_DISABLE_APM, !apm, !apm);
unload_driver_settings(handle); unload_driver_settings(handle);
} }