Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Set the actual default of the ACPI module to enabled instead of relying on the

Browse Source 
kernel settings file. As pointed out by Rene, there's otherwise no way to
  enable ACPI when the settings file is absent, as there's only a disable switch
  in the boot menu.
* Remove MADT dumping as it isn't really implemented. This info can actually be
  printed in the IO-APIC code now.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41497 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-05-14 16:28:43 +00:00
parent cf546fa0c3
commit 5316b696ae
2 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/settings/kernel/drivers/kernel
View File

@ -57,8 +57,8 @@ load_symbols true
#emergency_keys false
# Disables emergency keys (ie. Alt-SysReq+*), enabled by default
acpi true
# ACPI support, disabled by default
#acpi false
# ACPI support, enabled by default
#acpi_avoid_full_init true
# Avoids running _INI and _STA methods and final object initialization,

34
src/add-ons/kernel/bus_managers/acpi/acpi_busman.c
View File

@ -74,33 +74,6 @@ get_device_by_hid_callback(ACPI_HANDLE object, UINT32 depth, void* context,
}
static void dump_madt() {
ACPI_STATUS status;
ACPI_TABLE_HEADER *madt = NULL;
/* ACPI_SUBTABLE_HEADER *entry;
void *end; */
int madtCount = -1;
while (true) {
status = AcpiGetTable (ACPI_SIG_MADT, ++madtCount, &madt);
if (status != AE_OK) break;
/*
dprintf("acpi: MADT TABLE:\n");
AcpiDmDumpDataTable( madt );
entry = madt + 44;
end = madt + madt->Header.Length;
while (entry < end) {
dprintf("\t\tType: %d\n", entry->Type);
entry += entry->Length;
};
*/
};
dprintf("acpi: You have %d MADT tables.\n", madtCount);
}
// #pragma mark - ACPI bus manager API
@ -117,16 +90,13 @@ acpi_std_ops(int32 op,...)
void *settings;
bool acpiDisabled = false;
bool acpiAvoidFullInit = false;
bool acpiDumpMADT = false;
settings = load_driver_settings("kernel");
if (settings != NULL) {
acpiDisabled = !get_driver_boolean_parameter(settings, "acpi",
false, false);
true, true);
acpiAvoidFullInit = get_driver_boolean_parameter(settings,
"acpi_avoid_full_init", false, false);
acpiDumpMADT = get_driver_boolean_parameter(settings,
"acpi_dump_MADT", false, false);
unload_driver_settings(settings);
}
@ -180,8 +150,6 @@ acpi_std_ops(int32 op,...)
goto err;
}
if (acpiDumpMADT) dump_madt();
/* Install the default address space handlers. */
status = AcpiInstallAddressSpaceHandler(ACPI_ROOT_OBJECT,
ACPI_ADR_SPACE_SYSTEM_MEMORY, ACPI_DEFAULT_HANDLER, NULL, NULL);