Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extended and fix some of the debug output.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41436 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-05-11 11:16:10 +00:00
parent 7a8ce431b5
commit cdb247a328
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/system/kernel/arch/x86/ioapic.cpp
View File

@ -306,9 +306,10 @@ ioapic_map_ioapic(struct ioapic& ioapic, phys_addr_t physicalAddress)
ioapic.global_interrupt_last ioapic.global_interrupt_last
= ioapic.global_interrupt_base + ioapic.max_redirection_entry; = ioapic.global_interrupt_base + ioapic.max_redirection_entry;
dprintf("io-apic %u has range %u-%u, %u entries\n", ioapic.number, dprintf("io-apic %u has range %u-%u, %u entries, version 0x%08lx\n",
ioapic.global_interrupt_base, ioapic.global_interrupt_last, ioapic.number, ioapic.global_interrupt_base,
ioapic.max_redirection_entry + 1); ioapic.global_interrupt_last, ioapic.max_redirection_entry + 1,
version);
return B_OK; return B_OK;
} }
@ -372,12 +373,22 @@ acpi_enumerate_ioapics(acpi_module_info* acpi)
case ACPI_MADT_TYPE_IO_APIC: case ACPI_MADT_TYPE_IO_APIC:
{ {
acpi_madt_io_apic* info = (acpi_madt_io_apic*)apicEntry; acpi_madt_io_apic* info = (acpi_madt_io_apic*)apicEntry;
dprintf("found io-apic with address %lu and global interrupt " dprintf("found io-apic with address 0x%08lx and global "
"base %lu\n", (uint32)info->Address, "interrupt base %lu\n", (uint32)info->Address,
(uint32)info->GlobalIrqBase); (uint32)info->GlobalIrqBase);
if (find_ioapic((int32)info->GlobalIrqBase) != NULL) { struct ioapic* alreadyMapped
= find_ioapic((int32)info->GlobalIrqBase);
if (alreadyMapped != NULL) {
// we've already mapped this IO-APIC (at boot) // we've already mapped this IO-APIC (at boot)
dprintf("io-apic %u, already mapped at %p, range %u-%u, "
"%u entries, version 0x%08lx, apic-id %u\n",
alreadyMapped->number,
alreadyMapped->registers,
alreadyMapped->global_interrupt_base,
alreadyMapped->global_interrupt_last,
alreadyMapped->max_redirection_entry + 1,
ioapic_read_32(*alreadyMapped, IO_APIC_VERSION));
break; break;
} }