Skip to content

Commit

Permalink
Kernel: Use a const reference to RegisterState in IRQ handling
Browse files Browse the repository at this point in the history
  • Loading branch information
supercomputer7 authored and awesomekling committed Mar 19, 2020
1 parent aa43314 commit e880fe0
Show file tree
Hide file tree
Showing 26 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion Kernel/ACPI/ACPIDynamicParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace ACPI {
klog() << "ACPI: Dynamic Parsing Enabled, Can parse AML";
}

void DynamicParser::handle_irq(RegisterState&)
void DynamicParser::handle_irq(const RegisterState&)
{
// FIXME: Implement IRQ handling of ACPI signals!
ASSERT_NOT_REACHED();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/ACPI/ACPIDynamicParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace ACPI {
private:
void build_namespace();
// ^IRQHandler
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;

OwnPtr<Region> m_acpi_namespace;
};
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/FloppyDiskDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ bool FloppyDiskDevice::wait_for_irq()
return true;
}

void FloppyDiskDevice::handle_irq(RegisterState&)
void FloppyDiskDevice::handle_irq(const RegisterState&)
{
// The only thing we need to do is acknowledge the IRQ happened
m_interrupted = true;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/FloppyDiskDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ class FloppyDiskDevice final

private:
// ^IRQHandler
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;

// ^DiskDevice
virtual const char* class_name() const override;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/KeyboardDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ void KeyboardDevice::key_state_changed(u8 raw, bool pressed)
m_has_e0_prefix = false;
}

void KeyboardDevice::handle_irq(RegisterState&)
void KeyboardDevice::handle_irq(const RegisterState&)
{
for (;;) {
u8 status = IO::in8(I8042_STATUS);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/KeyboardDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class KeyboardDevice final : public IRQHandler

private:
// ^IRQHandler
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;

// ^CharacterDevice
virtual const char* class_name() const override { return "KeyboardDevice"; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/PATAChannel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ void PATAChannel::wait_for_irq()
disable_irq();
}

void PATAChannel::handle_irq(RegisterState&)
void PATAChannel::handle_irq(const RegisterState&)
{
u8 status = m_io_base.offset(ATA_REG_STATUS).in<u8>();
if (status & ATA_SR_ERR) {
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/PATAChannel.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class PATAChannel final : public PCI::Device {

private:
//^ IRQHandler
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;

void initialize(bool force_pio);
void detect_disks();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/PS2MouseDevice.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void PS2MouseDevice::handle_vmmouse_absolute_pointer()
m_queue.enqueue(packet);
}

void PS2MouseDevice::handle_irq(RegisterState&)
void PS2MouseDevice::handle_irq(const RegisterState&)
{

if (VMWareBackdoor::the().vmmouse_is_absolute()) {
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/PS2MouseDevice.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class PS2MouseDevice final : public IRQHandler
private:
// ^IRQHandler
void handle_vmmouse_absolute_pointer();
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;

// ^CharacterDevice
virtual const char* class_name() const override { return "PS2MouseDevice"; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/SB16.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ void SB16::dma_start(uint32_t length)
IO::out8(0xd4, (channel % 4));
}

void SB16::handle_irq(RegisterState&)
void SB16::handle_irq(const RegisterState&)
{
// Stop sound output ready for the next block.
dsp_write(0xd5);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Devices/SB16.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class SB16 final : public IRQHandler

private:
// ^IRQHandler
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;

// ^CharacterDevice
virtual const char* class_name() const override { return "SB16"; }
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Interrupts/GenericInterruptHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class GenericInterruptHandler {
public:
static GenericInterruptHandler& from(u8 interrupt_number);
virtual ~GenericInterruptHandler();
virtual void handle_interrupt(RegisterState& regs) = 0;
virtual void handle_interrupt(const RegisterState& regs) = 0;

u8 interrupt_number() const { return m_interrupt_number; }

Expand Down
4 changes: 2 additions & 2 deletions Kernel/Interrupts/IRQHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ class IRQHandler : public GenericInterruptHandler {
public:
virtual ~IRQHandler();

virtual void handle_interrupt(RegisterState& regs) { handle_irq(regs); }
virtual void handle_irq(RegisterState&) = 0;
virtual void handle_interrupt(const RegisterState& regs) { handle_irq(regs); }
virtual void handle_irq(const RegisterState&) = 0;

void enable_irq();
void disable_irq();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Interrupts/SharedIRQHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ SharedIRQHandler::~SharedIRQHandler()
disable_interrupt_vector();
}

void SharedIRQHandler::handle_interrupt(RegisterState& regs)
void SharedIRQHandler::handle_interrupt(const RegisterState& regs)
{
ASSERT_INTERRUPTS_DISABLED();
increment_invoking_counter();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Interrupts/SharedIRQHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SharedIRQHandler final : public GenericInterruptHandler {
public:
static void initialize(u8 interrupt_number);
virtual ~SharedIRQHandler();
virtual void handle_interrupt(RegisterState& regs) override;
virtual void handle_interrupt(const RegisterState& regs) override;

void register_handler(GenericInterruptHandler&);
void unregister_handler(GenericInterruptHandler&);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Interrupts/SpuriousInterruptHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ SpuriousInterruptHandler::~SpuriousInterruptHandler()
{
}

void SpuriousInterruptHandler::handle_interrupt(RegisterState&)
void SpuriousInterruptHandler::handle_interrupt(const RegisterState&)
{
// FIXME: Actually check if IRQ7 or IRQ15 are spurious, and if not, call the real handler to handle the IRQ.
klog() << "Spurious Interrupt, vector " << interrupt_number();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Interrupts/SpuriousInterruptHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SpuriousInterruptHandler final : public GenericInterruptHandler {
public:
static void initialize(u8 interrupt_number);
virtual ~SpuriousInterruptHandler();
virtual void handle_interrupt(RegisterState& regs) override;
virtual void handle_interrupt(const RegisterState& regs) override;

void register_handler(GenericInterruptHandler&);
void unregister_handler(GenericInterruptHandler&);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Interrupts/UnhandledInterruptHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ UnhandledInterruptHandler::UnhandledInterruptHandler(u8 interrupt_vector)
{
}

void UnhandledInterruptHandler::handle_interrupt(RegisterState&)
void UnhandledInterruptHandler::handle_interrupt(const RegisterState&)
{
dbg() << "Interrupt: Unhandled vector " << interrupt_number() << " was invoked for handle_interrupt(RegisterState&).";
hang();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Interrupts/UnhandledInterruptHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class UnhandledInterruptHandler final : public GenericInterruptHandler {
explicit UnhandledInterruptHandler(u8 interrupt_vector);
virtual ~UnhandledInterruptHandler();

virtual void handle_interrupt(RegisterState&) override;
virtual void handle_interrupt(const RegisterState&) override;

virtual bool eoi() override;

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/E1000NetworkAdapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ E1000NetworkAdapter::~E1000NetworkAdapter()
{
}

void E1000NetworkAdapter::handle_irq(RegisterState&)
void E1000NetworkAdapter::handle_irq(const RegisterState&)
{
out32(REG_IMASK, 0x1);

Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/E1000NetworkAdapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class E1000NetworkAdapter final : public NetworkAdapter
virtual const char* purpose() const override { return class_name(); }

private:
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;
virtual const char* class_name() const override { return "E1000NetworkAdapter"; }

struct [[gnu::packed]] e1000_rx_desc
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/RTL8139NetworkAdapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ RTL8139NetworkAdapter::~RTL8139NetworkAdapter()
{
}

void RTL8139NetworkAdapter::handle_irq(RegisterState&)
void RTL8139NetworkAdapter::handle_irq(const RegisterState&)
{
for (;;) {
int status = in16(REG_ISR);
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Net/RTL8139NetworkAdapter.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class RTL8139NetworkAdapter final : public NetworkAdapter
virtual const char* purpose() const override { return class_name(); }

private:
virtual void handle_irq(RegisterState&) override;
virtual void handle_irq(const RegisterState&) override;
virtual const char* class_name() const override { return "RTL8139NetworkAdapter"; }

void reset();
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Scheduler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ void Scheduler::initialize()
load_task_register(s_redirection.selector);
}

void Scheduler::timer_tick(RegisterState& regs)
void Scheduler::timer_tick(const RegisterState& regs)
{
if (!Thread::current)
return;
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Scheduler.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ extern SchedulerData* g_scheduler_data;
class Scheduler {
public:
static void initialize();
static void timer_tick(RegisterState&);
static void timer_tick(const RegisterState&);
static bool pick_next();
static void pick_next_and_switch_now();
static void switch_now();
Expand Down

0 comments on commit e880fe0

Please sign in to comment.