From 7c8ddc9795f3fdabed1327aa579971bc486f6a22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 6 May 2008 22:04:25 +0000 Subject: [PATCH] added B_SAFEMODE_DISABLE_APM git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25334 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/kernel/safemode.h | 1 + src/system/boot/platform/bios_ia32/menu.cpp | 2 +- src/system/kernel/arch/x86/apm.cpp | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/headers/private/kernel/safemode.h b/headers/private/kernel/safemode.h index cac1d882f7..2300e4f841 100644 --- a/headers/private/kernel/safemode.h +++ b/headers/private/kernel/safemode.h @@ -15,6 +15,7 @@ #define B_SAFEMODE_DISABLE_USER_ADD_ONS "disableuseraddons" #define B_SAFEMODE_DISABLE_IDE_DMA "disableidedma" #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_HYPER_THREADING "disable_hyperthreading" #define B_SAFEMODE_FAIL_SAFE_VIDEO_MODE "fail_safe_video_mode" diff --git a/src/system/boot/platform/bios_ia32/menu.cpp b/src/system/boot/platform/bios_ia32/menu.cpp index d50074a085..6db4d25fbc 100644 --- a/src/system/boot/platform/bios_ia32/menu.cpp +++ b/src/system/boot/platform/bios_ia32/menu.cpp @@ -35,7 +35,7 @@ platform_add_menus(Menu *menu) menu->AddItem(item = new(nothrow) MenuItem("Disable APM")); 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"); menu->AddItem(item = new(nothrow) MenuItem("Disable ACPI")); diff --git a/src/system/kernel/arch/x86/apm.cpp b/src/system/kernel/arch/x86/apm.cpp index 9e25b88533..01c81f969e 100644 --- a/src/system/kernel/arch/x86/apm.cpp +++ b/src/system/kernel/arch/x86/apm.cpp @@ -291,7 +291,7 @@ apm_init(kernel_args *args) handle = load_driver_settings(B_SAFEMODE_DRIVER_SETTINGS); 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); }