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

Disable io apic for now. Fix irq argument for ioapic_configure_io_interrupt.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37384 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Clemens Zeidler
2010-07-04 02:57:40 +00:00
parent 4f153c5b74
commit b22ea6300c
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/arch/x86/arch_int.cpp
+12 -1
View File
@@ -589,6 +589,9 @@ ioapic_init(kernel_args* args)
return; return;
} }
// disable io apic for now
return;
// load acpi module // load acpi module
status_t status; status_t status;
acpi_module_info* acpiModule; acpi_module_info* acpiModule;
@@ -670,7 +673,15 @@ ioapic_init(kernel_args* args)
uint32 config = 0; uint32 config = 0;
config |= irqDescriptor.polarity; config |= irqDescriptor.polarity;
config |= irqDescriptor.interrupt_mode; 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 // prefer the ioapic over the normal pic