Skip to content
Snippets Groups Projects
Commit 8c351e07 authored by Jacob Lorentzon's avatar Jacob Lorentzon
Browse files

Use the I/O APIC when applicable.

parent 45fe0406
No related branches found
No related tags found
1 merge request!117Support the I/O APIC alongside the 8259 PIC
...@@ -306,12 +306,15 @@ pub unsafe fn init(active_table: &mut ActivePageTable) { ...@@ -306,12 +306,15 @@ pub unsafe fn init(active_table: &mut ActivePageTable) {
_ => (), _ => (),
} }
} }
<<<<<<< HEAD
/* /*
let namespace_guard = crate::acpi::ACPI_TABLE.namespace.read(); let namespace_guard = crate::acpi::ACPI_TABLE.namespace.read();
for (k, v) in namespace_guard.as_ref().unwrap().iter() { for (k, v) in namespace_guard.as_ref().unwrap().iter() {
println!("{} = {:?}", k, v); println!("{} = {:?}", k, v);
} }
*/ */
=======
>>>>>>> c723256... Use the I/O APIC when applicable.
} }
println!("I/O APICs: {:?}, overrides: {:?}", ioapics(), src_overrides()); println!("I/O APICs: {:?}, overrides: {:?}", ioapics(), src_overrides());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment