From 218aaf536fdb933fe9a8a468f16e6df4342917ca Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Fri, 6 May 2011 02:01:09 +0000 Subject: [PATCH] * Prettify the printed routing table. * Remove wrong extra line when printing an irq_descriptor. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41339 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/arch/x86/irq_routing_table.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/system/kernel/arch/x86/irq_routing_table.cpp b/src/system/kernel/arch/x86/irq_routing_table.cpp index f145d4f1a9..8359b4edfa 100644 --- a/src/system/kernel/arch/x86/irq_routing_table.cpp +++ b/src/system/kernel/arch/x86/irq_routing_table.cpp @@ -39,15 +39,10 @@ irq_descriptor::irq_descriptor() void print_irq_descriptor(irq_descriptor* descriptor) { - for (int i = 0; i < 16; i++) { - if (descriptor->irq >> i & 0x01) - dprintf("interrupt: %i\n", i); - } - const char* activeHighString = "active high"; const char* activeLowString = " active low"; const char* levelTriggeredString = "level triggered"; - const char* edgeTriggeredString = " edge triggered"; + const char* edgeTriggeredString = "edge triggered"; dprintf("irq: %u, shareable: %u, polarity: %s, interrupt_mode: %s\n", descriptor->irq, descriptor->shareable, @@ -61,13 +56,14 @@ print_irq_descriptor(irq_descriptor* descriptor) void print_irq_routing_table(IRQRoutingTable* table) { - dprintf("Print table %i entries\n", (int)table->Count()); + dprintf("IRQ routing table with %i entries\n", (int)table->Count()); for (int i = 0; i < table->Count(); i++) { irq_routing_entry& entry = table->ElementAt(i); - dprintf("address: %x\n", entry.device_address); - dprintf("pin: %i\n", entry.pin); - dprintf("source: %x\n", int(entry.source)); - dprintf("source index: %i\n", entry.source_index); + dprintf("\tentry %i\n", i); + dprintf("\t\taddress: %x\n", entry.device_address); + dprintf("\t\tpin: %i\n", entry.pin); + dprintf("\t\tsource: 0x%x\n", int(entry.source)); + dprintf("\t\tsource index: %i\n", entry.source_index); } }