From b22ea6300c8d25180762372c27587d632826e767 Mon Sep 17 00:00:00 2001 From: Clemens Zeidler Date: Sun, 4 Jul 2010 02:57:40 +0000 Subject: [PATCH] Disable io apic for now. Fix irq argument for ioapic_configure_io_interrupt. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37384 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/kernel/arch/x86/arch_int.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/system/kernel/arch/x86/arch_int.cpp b/src/system/kernel/arch/x86/arch_int.cpp index a8e03569a9..37d49235de 100644 --- a/src/system/kernel/arch/x86/arch_int.cpp +++ b/src/system/kernel/arch/x86/arch_int.cpp @@ -589,6 +589,9 @@ ioapic_init(kernel_args* args) return; } +// disable io apic for now +return; + // load acpi module status_t status; acpi_module_info* acpiModule; @@ -670,7 +673,15 @@ ioapic_init(kernel_args* args) uint32 config = 0; config |= irqDescriptor.polarity; config |= irqDescriptor.interrupt_mode; - ioapic_configure_io_interrupt(irqDescriptor.irq, config); + + int32 num = -1; + for (int a = 0; a < 16; a++) { + if (irqDescriptor.irq >> i & 0x01) { + num = a; + break; + } + } + ioapic_configure_io_interrupt(num, config); } // prefer the ioapic over the normal pic