summaryrefslogtreecommitdiff
path: root/Kernel/Interrupts
diff options
context:
space:
mode:
Diffstat (limited to 'Kernel/Interrupts')
-rw-r--r--Kernel/Interrupts/APIC.cpp24
-rw-r--r--Kernel/Interrupts/APIC.h4
-rw-r--r--Kernel/Interrupts/GenericInterruptHandler.h2
-rw-r--r--Kernel/Interrupts/IOAPIC.cpp8
-rw-r--r--Kernel/Interrupts/IOAPIC.h8
-rw-r--r--Kernel/Interrupts/IRQController.h8
-rw-r--r--Kernel/Interrupts/IRQHandler.h4
-rw-r--r--Kernel/Interrupts/InterruptManagement.h2
-rw-r--r--Kernel/Interrupts/PIC.cpp8
-rw-r--r--Kernel/Interrupts/PIC.h8
-rw-r--r--Kernel/Interrupts/SharedIRQHandler.cpp2
-rw-r--r--Kernel/Interrupts/SharedIRQHandler.h2
-rw-r--r--Kernel/Interrupts/SpuriousInterruptHandler.cpp2
-rw-r--r--Kernel/Interrupts/SpuriousInterruptHandler.h2
-rw-r--r--Kernel/Interrupts/UnhandledInterruptHandler.cpp2
-rw-r--r--Kernel/Interrupts/UnhandledInterruptHandler.h2
16 files changed, 44 insertions, 44 deletions
diff --git a/Kernel/Interrupts/APIC.cpp b/Kernel/Interrupts/APIC.cpp
index b1244e2ab8..e54437c1fd 100644
--- a/Kernel/Interrupts/APIC.cpp
+++ b/Kernel/Interrupts/APIC.cpp
@@ -75,7 +75,7 @@ public:
handler->register_interrupt_handler();
}
- virtual bool handle_interrupt(const RegisterState&) override;
+ virtual bool handle_interrupt(RegisterState const&) override;
virtual bool eoi() override;
@@ -106,7 +106,7 @@ public:
handler->register_interrupt_handler();
}
- virtual bool handle_interrupt(const RegisterState&) override;
+ virtual bool handle_interrupt(RegisterState const&) override;
virtual bool eoi() override;
@@ -145,7 +145,7 @@ PhysicalAddress APIC::get_base()
return PhysicalAddress(base & 0xfffff000);
}
-void APIC::set_base(const PhysicalAddress& base)
+void APIC::set_base(PhysicalAddress const& base)
{
MSR msr(APIC_BASE_MSR);
u64 flags = 1 << 11;
@@ -160,7 +160,7 @@ void APIC::write_register(u32 offset, u32 value)
MSR msr(APIC_REGS_MSR_BASE + (offset >> 4));
msr.set(value);
} else {
- *reinterpret_cast<volatile u32*>(m_apic_base->vaddr().offset(offset).as_ptr()) = value;
+ *reinterpret_cast<u32 volatile*>(m_apic_base->vaddr().offset(offset).as_ptr()) = value;
}
}
@@ -170,7 +170,7 @@ u32 APIC::read_register(u32 offset)
MSR msr(APIC_REGS_MSR_BASE + (offset >> 4));
return (u32)msr.get();
}
- return *reinterpret_cast<volatile u32*>(m_apic_base->vaddr().offset(offset).as_ptr());
+ return *reinterpret_cast<u32 volatile*>(m_apic_base->vaddr().offset(offset).as_ptr());
}
void APIC::set_lvt(u32 offset, u8 interrupt)
@@ -190,7 +190,7 @@ void APIC::wait_for_pending_icr()
}
}
-void APIC::write_icr(const ICRReg& icr)
+void APIC::write_icr(ICRReg const& icr)
{
if (m_is_x2) {
MSR msr(APIC_REGS_MSR_BASE + (APIC_REG_ICR_LOW >> 4));
@@ -236,7 +236,7 @@ u8 APIC::spurious_interrupt_vector()
}
#define APIC_INIT_VAR_PTR(tpe, vaddr, varname) \
- reinterpret_cast<volatile tpe*>(reinterpret_cast<ptrdiff_t>(vaddr) \
+ reinterpret_cast<tpe volatile*>(reinterpret_cast<ptrdiff_t>(vaddr) \
+ reinterpret_cast<ptrdiff_t>(&varname) \
- reinterpret_cast<ptrdiff_t>(&apic_ap_start))
@@ -349,7 +349,7 @@ UNMAP_AFTER_INIT void APIC::setup_ap_boot_environment()
VERIFY(apic_startup_region_size < USER_RANGE_BASE);
auto apic_startup_region = create_identity_mapped_region(PhysicalAddress(apic_startup_region_base), apic_startup_region_size);
u8* apic_startup_region_ptr = apic_startup_region->vaddr().as_ptr();
- memcpy(apic_startup_region_ptr, reinterpret_cast<const void*>(apic_ap_start), apic_ap_start_size);
+ memcpy(apic_startup_region_ptr, reinterpret_cast<void const*>(apic_ap_start), apic_ap_start_size);
// Allocate enough stacks for all APs
m_ap_temporary_boot_stacks.ensure_capacity(aps_to_enable);
@@ -387,9 +387,9 @@ UNMAP_AFTER_INIT void APIC::setup_ap_boot_environment()
*APIC_INIT_VAR_PTR(FlatPtr, apic_startup_region_ptr, ap_cpu_init_cr3) = MM.kernel_page_directory().cr3();
// Store the BSP's GDT and IDT for the APs to use
- const auto& gdtr = Processor::current().get_gdtr();
+ auto const& gdtr = Processor::current().get_gdtr();
*APIC_INIT_VAR_PTR(FlatPtr, apic_startup_region_ptr, ap_cpu_gdtr) = FlatPtr(&gdtr);
- const auto& idtr = get_idtr();
+ auto const& idtr = get_idtr();
*APIC_INIT_VAR_PTR(FlatPtr, apic_startup_region_ptr, ap_cpu_idtr) = FlatPtr(&idtr);
#if ARCH(X86_64)
@@ -656,7 +656,7 @@ u32 APIC::get_timer_divisor()
return 16;
}
-bool APICIPIInterruptHandler::handle_interrupt(const RegisterState&)
+bool APICIPIInterruptHandler::handle_interrupt(RegisterState const&)
{
dbgln_if(APIC_SMP_DEBUG, "APIC IPI on CPU #{}", Processor::current_id());
return true;
@@ -669,7 +669,7 @@ bool APICIPIInterruptHandler::eoi()
return true;
}
-bool APICErrInterruptHandler::handle_interrupt(const RegisterState&)
+bool APICErrInterruptHandler::handle_interrupt(RegisterState const&)
{
dbgln("APIC: SMP error on CPU #{}", Processor::current_id());
return true;
diff --git a/Kernel/Interrupts/APIC.h b/Kernel/Interrupts/APIC.h
index adcc64f6b8..f64bca7844 100644
--- a/Kernel/Interrupts/APIC.h
+++ b/Kernel/Interrupts/APIC.h
@@ -102,13 +102,13 @@ private:
bool m_is_x2 { false };
static PhysicalAddress get_base();
- void set_base(const PhysicalAddress& base);
+ void set_base(PhysicalAddress const& base);
void write_register(u32 offset, u32 value);
u32 read_register(u32 offset);
void set_lvt(u32 offset, u8 interrupt);
void set_siv(u32 offset, u8 interrupt);
void wait_for_pending_icr();
- void write_icr(const ICRReg& icr);
+ void write_icr(ICRReg const& icr);
void do_boot_aps();
};
diff --git a/Kernel/Interrupts/GenericInterruptHandler.h b/Kernel/Interrupts/GenericInterruptHandler.h
index 109c378fee..e2c3716294 100644
--- a/Kernel/Interrupts/GenericInterruptHandler.h
+++ b/Kernel/Interrupts/GenericInterruptHandler.h
@@ -28,7 +28,7 @@ public:
}
// Note: this method returns boolean value, to indicate if the handler handled
// the interrupt or not. This is useful for shared handlers mostly.
- virtual bool handle_interrupt(const RegisterState& regs) = 0;
+ virtual bool handle_interrupt(RegisterState const& regs) = 0;
void will_be_destroyed();
bool is_registered() const { return m_registered; }
diff --git a/Kernel/Interrupts/IOAPIC.cpp b/Kernel/Interrupts/IOAPIC.cpp
index abc052ccd0..f17be74382 100644
--- a/Kernel/Interrupts/IOAPIC.cpp
+++ b/Kernel/Interrupts/IOAPIC.cpp
@@ -102,7 +102,7 @@ bool IOAPIC::is_enabled() const
return !is_hard_disabled();
}
-void IOAPIC::spurious_eoi(const GenericInterruptHandler& handler) const
+void IOAPIC::spurious_eoi(GenericInterruptHandler const& handler) const
{
InterruptDisabler disabler;
VERIFY(handler.type() == HandlerType::SpuriousInterruptHandler);
@@ -241,7 +241,7 @@ Optional<int> IOAPIC::find_redirection_entry_by_vector(u8 vector) const
return {};
}
-void IOAPIC::disable(const GenericInterruptHandler& handler)
+void IOAPIC::disable(GenericInterruptHandler const& handler)
{
InterruptDisabler disabler;
VERIFY(!is_hard_disabled());
@@ -256,7 +256,7 @@ void IOAPIC::disable(const GenericInterruptHandler& handler)
mask_redirection_entry(found_index.value());
}
-void IOAPIC::enable(const GenericInterruptHandler& handler)
+void IOAPIC::enable(GenericInterruptHandler const& handler)
{
InterruptDisabler disabler;
VERIFY(!is_hard_disabled());
@@ -271,7 +271,7 @@ void IOAPIC::enable(const GenericInterruptHandler& handler)
unmask_redirection_entry(found_index.value());
}
-void IOAPIC::eoi(const GenericInterruptHandler& handler) const
+void IOAPIC::eoi(GenericInterruptHandler const& handler) const
{
InterruptDisabler disabler;
VERIFY(!is_hard_disabled());
diff --git a/Kernel/Interrupts/IOAPIC.h b/Kernel/Interrupts/IOAPIC.h
index 4977668664..2c11987905 100644
--- a/Kernel/Interrupts/IOAPIC.h
+++ b/Kernel/Interrupts/IOAPIC.h
@@ -40,11 +40,11 @@ private:
class IOAPIC final : public IRQController {
public:
IOAPIC(PhysicalAddress, u32 gsi_base);
- virtual void enable(const GenericInterruptHandler&) override;
- virtual void disable(const GenericInterruptHandler&) override;
+ virtual void enable(GenericInterruptHandler const&) override;
+ virtual void disable(GenericInterruptHandler const&) override;
virtual void hard_disable() override;
- virtual void eoi(const GenericInterruptHandler&) const override;
- virtual void spurious_eoi(const GenericInterruptHandler&) const override;
+ virtual void eoi(GenericInterruptHandler const&) const override;
+ virtual void spurious_eoi(GenericInterruptHandler const&) const override;
virtual bool is_vector_enabled(u8 number) const override;
virtual bool is_enabled() const override;
virtual u16 get_isr() const override;
diff --git a/Kernel/Interrupts/IRQController.h b/Kernel/Interrupts/IRQController.h
index 89af65922a..016fc80d23 100644
--- a/Kernel/Interrupts/IRQController.h
+++ b/Kernel/Interrupts/IRQController.h
@@ -20,14 +20,14 @@ class IRQController : public RefCounted<IRQController> {
public:
virtual ~IRQController() = default;
- virtual void enable(const GenericInterruptHandler&) = 0;
- virtual void disable(const GenericInterruptHandler&) = 0;
+ virtual void enable(GenericInterruptHandler const&) = 0;
+ virtual void disable(GenericInterruptHandler const&) = 0;
virtual void hard_disable() { m_hard_disabled = true; }
virtual bool is_vector_enabled(u8 number) const = 0;
virtual bool is_enabled() const = 0;
bool is_hard_disabled() const { return m_hard_disabled; }
- virtual void eoi(const GenericInterruptHandler&) const = 0;
- virtual void spurious_eoi(const GenericInterruptHandler&) const = 0;
+ virtual void eoi(GenericInterruptHandler const&) const = 0;
+ virtual void spurious_eoi(GenericInterruptHandler const&) const = 0;
virtual size_t interrupt_vectors_count() const = 0;
virtual u32 gsi_base() const = 0;
virtual u16 get_isr() const = 0;
diff --git a/Kernel/Interrupts/IRQHandler.h b/Kernel/Interrupts/IRQHandler.h
index a5c6175570..15661618e8 100644
--- a/Kernel/Interrupts/IRQHandler.h
+++ b/Kernel/Interrupts/IRQHandler.h
@@ -17,8 +17,8 @@ class IRQHandler : public GenericInterruptHandler {
public:
virtual ~IRQHandler();
- virtual bool handle_interrupt(const RegisterState& regs) override { return handle_irq(regs); }
- virtual bool handle_irq(const RegisterState&) = 0;
+ virtual bool handle_interrupt(RegisterState const& regs) override { return handle_irq(regs); }
+ virtual bool handle_irq(RegisterState const&) = 0;
void enable_irq();
void disable_irq();
diff --git a/Kernel/Interrupts/InterruptManagement.h b/Kernel/Interrupts/InterruptManagement.h
index b17bbabd8d..8d20b05e6a 100644
--- a/Kernel/Interrupts/InterruptManagement.h
+++ b/Kernel/Interrupts/InterruptManagement.h
@@ -56,7 +56,7 @@ public:
RefPtr<IRQController> get_responsible_irq_controller(u8 interrupt_vector);
RefPtr<IRQController> get_responsible_irq_controller(IRQControllerType controller_type, u8 interrupt_vector);
- const Vector<ISAInterruptOverrideMetadata>& isa_overrides() const { return m_isa_interrupt_overrides; }
+ Vector<ISAInterruptOverrideMetadata> const& isa_overrides() const { return m_isa_interrupt_overrides; }
u8 get_mapped_interrupt_vector(u8 original_irq);
u8 get_irq_vector(u8 mapped_interrupt_vector);
diff --git a/Kernel/Interrupts/PIC.cpp b/Kernel/Interrupts/PIC.cpp
index 03fe0034bc..906cdc2018 100644
--- a/Kernel/Interrupts/PIC.cpp
+++ b/Kernel/Interrupts/PIC.cpp
@@ -45,7 +45,7 @@ bool PIC::is_enabled() const
return !is_all_masked(m_cached_irq_mask) && !is_hard_disabled();
}
-void PIC::disable(const GenericInterruptHandler& handler)
+void PIC::disable(GenericInterruptHandler const& handler)
{
InterruptDisabler disabler;
VERIFY(!is_hard_disabled());
@@ -71,7 +71,7 @@ UNMAP_AFTER_INIT PIC::PIC()
initialize();
}
-void PIC::spurious_eoi(const GenericInterruptHandler& handler) const
+void PIC::spurious_eoi(GenericInterruptHandler const& handler) const
{
VERIFY(handler.type() == HandlerType::SpuriousInterruptHandler);
if (handler.interrupt_number() == 7)
@@ -87,7 +87,7 @@ bool PIC::is_vector_enabled(u8 irq) const
return m_cached_irq_mask & (1 << irq);
}
-void PIC::enable(const GenericInterruptHandler& handler)
+void PIC::enable(GenericInterruptHandler const& handler)
{
InterruptDisabler disabler;
VERIFY(!is_hard_disabled());
@@ -114,7 +114,7 @@ void PIC::enable_vector(u8 irq)
m_cached_irq_mask &= ~(1 << irq);
}
-void PIC::eoi(const GenericInterruptHandler& handler) const
+void PIC::eoi(GenericInterruptHandler const& handler) const
{
InterruptDisabler disabler;
VERIFY(!is_hard_disabled());
diff --git a/Kernel/Interrupts/PIC.h b/Kernel/Interrupts/PIC.h
index 933d7aa28d..2e540e2991 100644
--- a/Kernel/Interrupts/PIC.h
+++ b/Kernel/Interrupts/PIC.h
@@ -17,13 +17,13 @@ static constexpr size_t pic_disabled_vector_end = 0x2f;
class PIC final : public IRQController {
public:
PIC();
- virtual void enable(const GenericInterruptHandler&) override;
- virtual void disable(const GenericInterruptHandler&) override;
+ virtual void enable(GenericInterruptHandler const&) override;
+ virtual void disable(GenericInterruptHandler const&) override;
virtual void hard_disable() override;
- virtual void eoi(const GenericInterruptHandler&) const override;
+ virtual void eoi(GenericInterruptHandler const&) const override;
virtual bool is_vector_enabled(u8 number) const override;
virtual bool is_enabled() const override;
- virtual void spurious_eoi(const GenericInterruptHandler&) const override;
+ virtual void spurious_eoi(GenericInterruptHandler const&) const override;
virtual u16 get_isr() const override;
virtual u16 get_irr() const override;
virtual u32 gsi_base() const override { return 0; }
diff --git a/Kernel/Interrupts/SharedIRQHandler.cpp b/Kernel/Interrupts/SharedIRQHandler.cpp
index b35bba7ec6..995a13309e 100644
--- a/Kernel/Interrupts/SharedIRQHandler.cpp
+++ b/Kernel/Interrupts/SharedIRQHandler.cpp
@@ -62,7 +62,7 @@ SharedIRQHandler::~SharedIRQHandler()
disable_interrupt_vector();
}
-bool SharedIRQHandler::handle_interrupt(const RegisterState& regs)
+bool SharedIRQHandler::handle_interrupt(RegisterState const& regs)
{
VERIFY_INTERRUPTS_DISABLED();
diff --git a/Kernel/Interrupts/SharedIRQHandler.h b/Kernel/Interrupts/SharedIRQHandler.h
index 6c7c65b13e..95623957aa 100644
--- a/Kernel/Interrupts/SharedIRQHandler.h
+++ b/Kernel/Interrupts/SharedIRQHandler.h
@@ -18,7 +18,7 @@ class SharedIRQHandler final : public GenericInterruptHandler {
public:
static void initialize(u8 interrupt_number);
virtual ~SharedIRQHandler();
- virtual bool handle_interrupt(const RegisterState& regs) override;
+ virtual bool handle_interrupt(RegisterState const& regs) override;
void register_handler(GenericInterruptHandler&);
void unregister_handler(GenericInterruptHandler&);
diff --git a/Kernel/Interrupts/SpuriousInterruptHandler.cpp b/Kernel/Interrupts/SpuriousInterruptHandler.cpp
index 0b2d3adbe8..6e78212a10 100644
--- a/Kernel/Interrupts/SpuriousInterruptHandler.cpp
+++ b/Kernel/Interrupts/SpuriousInterruptHandler.cpp
@@ -69,7 +69,7 @@ SpuriousInterruptHandler::SpuriousInterruptHandler(u8 irq)
SpuriousInterruptHandler::~SpuriousInterruptHandler() = default;
-bool SpuriousInterruptHandler::handle_interrupt(const RegisterState& state)
+bool SpuriousInterruptHandler::handle_interrupt(RegisterState const& state)
{
// Actually check if IRQ7 or IRQ15 are spurious, and if not, call the real handler to handle the IRQ.
if (m_responsible_irq_controller->get_isr() & (1 << interrupt_number())) {
diff --git a/Kernel/Interrupts/SpuriousInterruptHandler.h b/Kernel/Interrupts/SpuriousInterruptHandler.h
index 9a7aafa55e..f1c1e1ac54 100644
--- a/Kernel/Interrupts/SpuriousInterruptHandler.h
+++ b/Kernel/Interrupts/SpuriousInterruptHandler.h
@@ -19,7 +19,7 @@ public:
static void initialize_for_disabled_master_pic();
static void initialize_for_disabled_slave_pic();
virtual ~SpuriousInterruptHandler();
- virtual bool handle_interrupt(const RegisterState& regs) override;
+ virtual bool handle_interrupt(RegisterState const& regs) override;
void register_handler(GenericInterruptHandler&);
void unregister_handler(GenericInterruptHandler&);
diff --git a/Kernel/Interrupts/UnhandledInterruptHandler.cpp b/Kernel/Interrupts/UnhandledInterruptHandler.cpp
index ee46a493c3..17571047d3 100644
--- a/Kernel/Interrupts/UnhandledInterruptHandler.cpp
+++ b/Kernel/Interrupts/UnhandledInterruptHandler.cpp
@@ -13,7 +13,7 @@ UnhandledInterruptHandler::UnhandledInterruptHandler(u8 interrupt_vector)
{
}
-bool UnhandledInterruptHandler::handle_interrupt(const RegisterState&)
+bool UnhandledInterruptHandler::handle_interrupt(RegisterState const&)
{
PANIC("Interrupt: Unhandled vector {} was invoked for handle_interrupt(RegisterState&).", interrupt_number());
}
diff --git a/Kernel/Interrupts/UnhandledInterruptHandler.h b/Kernel/Interrupts/UnhandledInterruptHandler.h
index 2508b3e35a..134ea32ec4 100644
--- a/Kernel/Interrupts/UnhandledInterruptHandler.h
+++ b/Kernel/Interrupts/UnhandledInterruptHandler.h
@@ -15,7 +15,7 @@ public:
explicit UnhandledInterruptHandler(u8 interrupt_vector);
virtual ~UnhandledInterruptHandler();
- virtual bool handle_interrupt(const RegisterState&) override;
+ virtual bool handle_interrupt(RegisterState const&) override;
[[noreturn]] virtual bool eoi() override;