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

Removing the acpi_avoid_full_init config option.

Browse Source 
I've never heard anyone that been helped by that setting.
This commit is contained in:
Fredrik Holmqvist
2012-09-09 13:13:53 +02:00
parent b772f88c88
commit 953ca70721
2 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/settings/kernel/drivers/kernel
-4
View File
@@ -60,10 +60,6 @@ load_symbols true
#acpi false #acpi false
# ACPI support, enabled by default # ACPI support, enabled by default
#acpi_avoid_full_init true
# Avoids running _INI and _STA methods and final object initialization,
# which may be used to for debugging ACPI issues, false by default
#disable_ioapic true #disable_ioapic true
# Disables IO-APIC support, enabled by default # Disables IO-APIC support, enabled by default
src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+1 -9
View File
@@ -88,18 +88,14 @@ acpi_std_ops(int32 op,...)
ACPI_STATUS status; ACPI_STATUS status;
ACPI_OBJECT arg; ACPI_OBJECT arg;
ACPI_OBJECT_LIST parameter; ACPI_OBJECT_LIST parameter;
uint32 flags;
void *settings; void *settings;
bool acpiDisabled = false; bool acpiDisabled = false;
bool acpiAvoidFullInit = false;
AcpiGbl_CopyDsdtLocally = true; AcpiGbl_CopyDsdtLocally = true;
settings = load_driver_settings("kernel"); settings = load_driver_settings("kernel");
if (settings != NULL) { if (settings != NULL) {
acpiDisabled = !get_driver_boolean_parameter(settings, "acpi", acpiDisabled = !get_driver_boolean_parameter(settings, "acpi",
true, true); true, true);
acpiAvoidFullInit = get_driver_boolean_parameter(settings,
"acpi_avoid_full_init", false, false);
unload_driver_settings(settings); unload_driver_settings(settings);
} }
@@ -186,10 +182,6 @@ acpi_std_ops(int32 op,...)
AcpiEvaluateObject(NULL, "\\_PIC", &parameter, NULL); AcpiEvaluateObject(NULL, "\\_PIC", &parameter, NULL);
flags = acpiAvoidFullInit ?
ACPI_NO_DEVICE_INIT | ACPI_NO_OBJECT_INIT :
ACPI_FULL_INITIALIZATION;
// FreeBSD seems to pass in the above flags here as // FreeBSD seems to pass in the above flags here as
// well but specs don't define ACPI_NO_DEVICE_INIT // well but specs don't define ACPI_NO_DEVICE_INIT
// and ACPI_NO_OBJECT_INIT here. // and ACPI_NO_OBJECT_INIT here.
@@ -200,7 +192,7 @@ acpi_std_ops(int32 op,...)
goto err; goto err;
} }
status = AcpiInitializeObjects(flags); status = AcpiInitializeObjects(ACPI_FULL_INITIALIZATION);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
ERROR("AcpiInitializeObjects failed (%s)\n", ERROR("AcpiInitializeObjects failed (%s)\n",
AcpiFormatException(status)); AcpiFormatException(status));