mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 07:17:35 +00:00
Kernel: Unbreak building with extra debug macros, part 1
This commit is contained in:
parent
8c1888811f
commit
eac3bbdcee
9 changed files with 24 additions and 14 deletions
|
@ -34,6 +34,8 @@
|
|||
#include <Kernel/VM/MemoryManager.h>
|
||||
#include <Kernel/VM/TypedMapping.h>
|
||||
|
||||
//#define IOAPIC_DEBUG
|
||||
|
||||
#define IOAPIC_REDIRECTION_ENTRY_OFFSET 0x10
|
||||
namespace Kernel {
|
||||
enum DeliveryMode {
|
||||
|
@ -319,7 +321,7 @@ void IOAPIC::write_register(u32 index, u32 value) const
|
|||
regs->select = index;
|
||||
regs->window = value;
|
||||
#ifdef IOAPIC_DEBUG
|
||||
dbg() << "IOAPIC Writing, Value 0x" << String::format("%x", regs.window) << " @ offset 0x" << String::format("%x", regs.select);
|
||||
dbg() << "IOAPIC Writing, Value 0x" << String::format("%x", regs->window) << " @ offset 0x" << String::format("%x", regs->select);
|
||||
#endif
|
||||
}
|
||||
u32 IOAPIC::read_register(u32 index) const
|
||||
|
@ -328,7 +330,7 @@ u32 IOAPIC::read_register(u32 index) const
|
|||
auto regs = map_typed_writable<ioapic_mmio_regs>(m_address);
|
||||
regs->select = index;
|
||||
#ifdef IOAPIC_DEBUG
|
||||
dbg() << "IOAPIC Reading, Value 0x" << String::format("%x", regs.window) << " @ offset 0x" << String::format("%x", regs.select);
|
||||
dbg() << "IOAPIC Reading, Value 0x" << String::format("%x", regs->window) << " @ offset 0x" << String::format("%x", regs->select);
|
||||
#endif
|
||||
return regs->window;
|
||||
}
|
||||
|
|
|
@ -42,7 +42,7 @@ void SharedIRQHandler::initialize(u8 interrupt_number)
|
|||
void SharedIRQHandler::register_handler(GenericInterruptHandler& handler)
|
||||
{
|
||||
#ifdef INTERRUPT_DEBUG
|
||||
klog() << "Interrupt Handler registered @ Shared Interrupt Handler " << m_interrupt_number;
|
||||
klog() << "Interrupt Handler registered @ Shared Interrupt Handler " << interrupt_number();
|
||||
#endif
|
||||
m_handlers.set(&handler);
|
||||
enable_interrupt_vector();
|
||||
|
@ -50,7 +50,7 @@ void SharedIRQHandler::register_handler(GenericInterruptHandler& handler)
|
|||
void SharedIRQHandler::unregister_handler(GenericInterruptHandler& handler)
|
||||
{
|
||||
#ifdef INTERRUPT_DEBUG
|
||||
klog() << "Interrupt Handler unregistered @ Shared Interrupt Handler " << m_interrupt_number;
|
||||
klog() << "Interrupt Handler unregistered @ Shared Interrupt Handler " << interrupt_number();
|
||||
#endif
|
||||
m_handlers.remove(&handler);
|
||||
if (m_handlers.is_empty())
|
||||
|
@ -71,7 +71,7 @@ SharedIRQHandler::SharedIRQHandler(u8 irq)
|
|||
, m_responsible_irq_controller(InterruptManagement::the().get_responsible_irq_controller(irq))
|
||||
{
|
||||
#ifdef INTERRUPT_DEBUG
|
||||
klog() << "Shared Interrupt Handler registered @ " << m_interrupt_number;
|
||||
klog() << "Shared Interrupt Handler registered @ " << interrupt_number();
|
||||
#endif
|
||||
disable_interrupt_vector();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue