[haiku-commits] r37384 - haiku/trunk/src/system/kernel/arch/x86
- From: clemens.zeidler@xxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 4 Jul 2010 04:57:40 +0200 (CEST)
Author: czeidler
Date: 2010-07-04 04:57:40 +0200 (Sun, 04 Jul 2010)
New Revision: 37384
Changeset: http://dev.haiku-os.org/changeset/37384/haiku
Modified:
haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp
Log:
Disable io apic for now. Fix irq argument for ioapic_configure_io_interrupt.
Modified: haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp 2010-07-04 01:34:40 UTC
(rev 37383)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_int.cpp 2010-07-04 02:57:40 UTC
(rev 37384)
@@ -589,6 +589,9 @@
return;
}
+// disable io apic for now
+return;
+
// load acpi module
status_t status;
acpi_module_info* acpiModule;
@@ -670,7 +673,15 @@
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
Other related posts:
