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

Prepare usage of the ACPI module. Actual code for getting PCI interrupt routing

Browse Source 
not yet done though.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28187 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2008-10-16 21:12:33 +00:00
parent 83d8936cff
commit d4c300d8f1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_int.c
+7
View File
@@ -28,6 +28,7 @@
#include "interrupts.h" #include "interrupts.h"
#include <ACPI.h>
#include <safemode.h> #include <safemode.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@@ -515,6 +516,7 @@ ioapic_init(kernel_args *args)
uint32 version; uint32 version;
uint64 targetAPIC; uint64 targetAPIC;
void *settings; void *settings;
acpi_module_info *acpi;
static interrupt_controller ioapicController = { static interrupt_controller ioapicController = {
"82093AA IOAPIC", "82093AA IOAPIC",
@@ -556,6 +558,10 @@ ioapic_init(kernel_args *args)
// TODO: remove when the PCI IRQ routing through ACPI is available below // TODO: remove when the PCI IRQ routing through ACPI is available below
return; return;
if (get_module(B_ACPI_MODULE_NAME, (module_info **)&acpi) != B_OK) {
dprintf("acpi module not available, not configuring ioapic\n");
return;
}
// map in the ioapic // map in the ioapic
sIOAPIC = (ioapic *)args->arch_args.ioapic; sIOAPIC = (ioapic *)args->arch_args.ioapic;
@@ -618,6 +624,7 @@ ioapic_init(kernel_args *args)
// routing. // routing.
// prefer the ioapic over the normal pic // prefer the ioapic over the normal pic
put_module(B_ACPI_MODULE_NAME);
dprintf("using ioapic for interrupt routing\n"); dprintf("using ioapic for interrupt routing\n");
sCurrentPIC = &ioapicController; sCurrentPIC = &ioapicController;
gUsingIOAPIC = true; gUsingIOAPIC = true;