diff --git a/src/system/kernel/arch/x86/arch_int.cpp b/src/system/kernel/arch/x86/arch_int.cpp index e389d02e6e..94a0ba8322 100644 --- a/src/system/kernel/arch/x86/arch_int.cpp +++ b/src/system/kernel/arch/x86/arch_int.cpp @@ -667,7 +667,7 @@ ioapic_init(kernel_args* args) return; } - print_irq_routing_table(&table); + print_irq_routing_table(table); status = enable_irq_routing(acpiModule, table); if (status != B_OK) { diff --git a/src/system/kernel/arch/x86/irq_routing_table.cpp b/src/system/kernel/arch/x86/irq_routing_table.cpp index ff66b059ce..968c7d548a 100644 --- a/src/system/kernel/arch/x86/irq_routing_table.cpp +++ b/src/system/kernel/arch/x86/irq_routing_table.cpp @@ -45,7 +45,7 @@ irq_descriptor::irq_descriptor() void -print_irq_descriptor(irq_descriptor* descriptor) +print_irq_descriptor(const irq_descriptor& descriptor) { const char* activeHighString = "active high"; const char* activeLowString = " active low"; @@ -53,10 +53,10 @@ print_irq_descriptor(irq_descriptor* descriptor) const char* edgeTriggeredString = "edge triggered"; dprintf("irq: %u, shareable: %u, polarity: %s, trigger_mode: %s\n", - descriptor->irq, descriptor->shareable, - descriptor->polarity == B_HIGH_ACTIVE_POLARITY ? activeHighString + descriptor.irq, descriptor.shareable, + descriptor.polarity == B_HIGH_ACTIVE_POLARITY ? activeHighString : activeLowString, - descriptor->trigger_mode == B_LEVEL_TRIGGERED ? levelTriggeredString + descriptor.trigger_mode == B_LEVEL_TRIGGERED ? levelTriggeredString : edgeTriggeredString); } @@ -79,11 +79,11 @@ print_irq_routing_entry(const irq_routing_entry& entry) void -print_irq_routing_table(IRQRoutingTable* table) +print_irq_routing_table(const IRQRoutingTable& table) { - dprintf("IRQ routing table with %i entries\n", (int)table->Count()); - for (int i = 0; i < table->Count(); i++) - print_irq_routing_entry(table->ElementAt(i)); + dprintf("IRQ routing table with %i entries\n", (int)table.Count()); + for (int i = 0; i < table.Count(); i++) + print_irq_routing_entry(table.ElementAt(i)); } diff --git a/src/system/kernel/arch/x86/irq_routing_table.h b/src/system/kernel/arch/x86/irq_routing_table.h index 96d52436d0..a77fa49eb2 100644 --- a/src/system/kernel/arch/x86/irq_routing_table.h +++ b/src/system/kernel/arch/x86/irq_routing_table.h @@ -68,8 +68,8 @@ struct link_device { }; -void print_irq_descriptor(irq_descriptor* descriptor); -void print_irq_routing_table(IRQRoutingTable* table); +void print_irq_descriptor(const irq_descriptor& descriptor); +void print_irq_routing_table(const IRQRoutingTable& table); status_t prepare_irq_routing(acpi_module_info* acpi, IRQRoutingTable& table,