RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 07:17:35 +00:00
Code Issues Activity Actions

Kernel: Update system components to use the new IRQHandler class

Browse source
This commit is contained in:
Liav A 2020-02-22 19:53:03 +02:00 • committed by Andreas Kling
parent a46120b4a8
commit 740534cd67
9 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/ACPI/ACPIDynamicParser.cpp
View file

@ -56,7 +56,7 @@ ACPIDynamicParser::ACPIDynamicParser(ACPI_RAW::RSDPDescriptor20& rsdp)
kprintf("ACPI: Dynamic Parsing Enabled, Can parse AML\n"); kprintf("ACPI: Dynamic Parsing Enabled, Can parse AML\n");
} }
void ACPIDynamicParser::handle_irq() void ACPIDynamicParser::handle_irq(RegisterState&)
{ {
// FIXME: Implement IRQ handling of ACPI signals! // FIXME: Implement IRQ handling of ACPI signals!
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();

4
Kernel/ACPI/ACPIDynamicParser.h
View file

@ -28,7 +28,7 @@
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <Kernel/ACPI/ACPIStaticParser.h> #include <Kernel/ACPI/ACPIStaticParser.h>
#include <Kernel/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Lock.h> #include <Kernel/Lock.h>
#include <Kernel/VM/PhysicalPage.h> #include <Kernel/VM/PhysicalPage.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <LibBareMetal/Memory/PhysicalAddress.h>
@ -54,7 +54,7 @@ protected:
private: private:
void build_namespace(); void build_namespace();
// ^IRQHandler // ^IRQHandler
virtual void handle_irq() override; virtual void handle_irq(RegisterState&) override;
OwnPtr<Region> m_acpi_namespace; OwnPtr<Region> m_acpi_namespace;
}; };

2
Kernel/Devices/FloppyDiskDevice.cpp
View file

@ -347,7 +347,7 @@ bool FloppyDiskDevice::wait_for_irq()
return true; return true;
} }
void FloppyDiskDevice::handle_irq() void FloppyDiskDevice::handle_irq(RegisterState&)
{ {
// The only thing we need to do is acknowledge the IRQ happened // The only thing we need to do is acknowledge the IRQ happened
m_interrupted = true; m_interrupted = true;

4
Kernel/Devices/FloppyDiskDevice.h
View file

@ -99,7 +99,7 @@
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <Kernel/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Lock.h> #include <Kernel/Lock.h>
#include <Kernel/VM/PhysicalPage.h> #include <Kernel/VM/PhysicalPage.h>
#include <LibBareMetal/Memory/PhysicalAddress.h> #include <LibBareMetal/Memory/PhysicalAddress.h>
@ -177,7 +177,7 @@ protected:
private: private:
// ^IRQHandler // ^IRQHandler
void handle_irq(); virtual void handle_irq(RegisterState&) override;
// ^DiskDevice // ^DiskDevice
virtual const char* class_name() const override; virtual const char* class_name() const override;

3
Kernel/Devices/KeyboardDevice.cpp
View file

@ -28,7 +28,6 @@
#include <AK/ByteBuffer.h> #include <AK/ByteBuffer.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Arch/i386/CPU.h> #include <Kernel/Arch/i386/CPU.h>
#include <Kernel/Arch/i386/PIC.h>
#include <Kernel/Devices/KeyboardDevice.h> #include <Kernel/Devices/KeyboardDevice.h>
#include <Kernel/TTY/VirtualConsole.h> #include <Kernel/TTY/VirtualConsole.h>
#include <LibBareMetal/IO.h> #include <LibBareMetal/IO.h>
@ -486,7 +485,7 @@ void KeyboardDevice::key_state_changed(u8 raw, bool pressed)
m_has_e0_prefix = false; m_has_e0_prefix = false;
} }
void KeyboardDevice::handle_irq() void KeyboardDevice::handle_irq(RegisterState&)
{ {
for (;;) { for (;;) {
u8 status = IO::in8(I8042_STATUS); u8 status = IO::in8(I8042_STATUS);

4
Kernel/Devices/KeyboardDevice.h
View file

@ -26,12 +26,12 @@
#pragma once #pragma once
#include "IRQHandler.h"
#include "KeyCode.h" #include "KeyCode.h"
#include <AK/CircularQueue.h> #include <AK/CircularQueue.h>
#include <AK/DoublyLinkedList.h> #include <AK/DoublyLinkedList.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <Kernel/Devices/CharacterDevice.h> #include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/Interrupts/IRQHandler.h>
namespace Kernel { namespace Kernel {
@ -59,7 +59,7 @@ public:
private: private:
// ^IRQHandler // ^IRQHandler
virtual void handle_irq() override; virtual void handle_irq(RegisterState&) override;
// ^CharacterDevice // ^CharacterDevice
virtual const char* class_name() const override { return "KeyboardDevice"; } virtual const char* class_name() const override { return "KeyboardDevice"; }

2
Kernel/Devices/PATADiskDevice.h
View file

@ -31,7 +31,7 @@
#pragma once #pragma once
#include <Kernel/Devices/BlockDevice.h> #include <Kernel/Devices/BlockDevice.h>
#include <Kernel/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/Lock.h> #include <Kernel/Lock.h>
namespace Kernel { namespace Kernel {

2
Kernel/Devices/PS2MouseDevice.cpp
View file

@ -129,7 +129,7 @@ void PS2MouseDevice::handle_vmmouse_absolute_pointer()
m_queue.enqueue(packet); m_queue.enqueue(packet);
} }
void PS2MouseDevice::handle_irq() void PS2MouseDevice::handle_irq(RegisterState&)
{ {
if (VMWareBackdoor::the().vmmouse_is_absolute()) { if (VMWareBackdoor::the().vmmouse_is_absolute()) {

4
Kernel/Devices/PS2MouseDevice.h
View file

@ -28,7 +28,7 @@
#include <AK/CircularQueue.h> #include <AK/CircularQueue.h>
#include <Kernel/Devices/CharacterDevice.h> #include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/IRQHandler.h> #include <Kernel/Interrupts/IRQHandler.h>
#include <Kernel/MousePacket.h> #include <Kernel/MousePacket.h>
namespace Kernel { namespace Kernel {
@ -49,8 +49,8 @@ public:
private: private:
// ^IRQHandler // ^IRQHandler
virtual void handle_irq() override;
void handle_vmmouse_absolute_pointer(); void handle_vmmouse_absolute_pointer();
virtual void handle_irq(RegisterState&) override;
// ^CharacterDevice // ^CharacterDevice
virtual const char* class_name() const override { return "PS2MouseDevice"; } virtual const char* class_name() const override { return "PS2MouseDevice"; }