9 files changed, 13 insertions, 14 deletions

diff --git a/Kernel/ACPI/ACPIDynamicParser.cpp b/Kernel/ACPI/ACPIDynamicParser.cpp
index d69d521c73..c7bd536087 100644
--- a/Kernel/ACPI/ACPIDynamicParser.cpp
+++ b/Kernel/ACPI/ACPIDynamicParser.cpp
@@ -56,7 +56,7 @@ ACPIDynamicParser::ACPIDynamicParser(ACPI_RAW::RSDPDescriptor20& rsdp)
     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!
     ASSERT_NOT_REACHED();
diff --git a/Kernel/ACPI/ACPIDynamicParser.h b/Kernel/ACPI/ACPIDynamicParser.h
index d5a5344e55..4818df8450 100644
--- a/Kernel/ACPI/ACPIDynamicParser.h
+++ b/Kernel/ACPI/ACPIDynamicParser.h
@@ -28,7 +28,7 @@
 
 #include <AK/RefPtr.h>
 #include <Kernel/ACPI/ACPIStaticParser.h>
-#include <Kernel/IRQHandler.h>
+#include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Lock.h>
 #include <Kernel/VM/PhysicalPage.h>
 #include <LibBareMetal/Memory/PhysicalAddress.h>
@@ -54,7 +54,7 @@ protected:
 private:
     void build_namespace();
     // ^IRQHandler
-    virtual void handle_irq() override;
+    virtual void handle_irq(RegisterState&) override;
 
     OwnPtr<Region> m_acpi_namespace;
 };
diff --git a/Kernel/Devices/FloppyDiskDevice.cpp b/Kernel/Devices/FloppyDiskDevice.cpp
index 79d84c670e..9be3858530 100644
--- a/Kernel/Devices/FloppyDiskDevice.cpp
+++ b/Kernel/Devices/FloppyDiskDevice.cpp
@@ -347,7 +347,7 @@ bool FloppyDiskDevice::wait_for_irq()
     return true;
 }
 
-void FloppyDiskDevice::handle_irq()
+void FloppyDiskDevice::handle_irq(RegisterState&)
 {
     // The only thing we need to do is acknowledge the IRQ happened
     m_interrupted = true;
diff --git a/Kernel/Devices/FloppyDiskDevice.h b/Kernel/Devices/FloppyDiskDevice.h
index 578a4f0a0e..607b9d474e 100644
--- a/Kernel/Devices/FloppyDiskDevice.h
+++ b/Kernel/Devices/FloppyDiskDevice.h
@@ -99,7 +99,7 @@
 
 #include <AK/RefPtr.h>
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/IRQHandler.h>
+#include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Lock.h>
 #include <Kernel/VM/PhysicalPage.h>
 #include <LibBareMetal/Memory/PhysicalAddress.h>
@@ -177,7 +177,7 @@ protected:
 
 private:
     // ^IRQHandler
-    void handle_irq();
+    virtual void handle_irq(RegisterState&) override;
 
     // ^DiskDevice
     virtual const char* class_name() const override;
diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp
index 8b9071b708..8431041d8e 100644
--- a/Kernel/Devices/KeyboardDevice.cpp
+++ b/Kernel/Devices/KeyboardDevice.cpp
@@ -28,7 +28,6 @@
 #include <AK/ByteBuffer.h>
 #include <AK/Types.h>
 #include <Kernel/Arch/i386/CPU.h>
-#include <Kernel/Arch/i386/PIC.h>
 #include <Kernel/Devices/KeyboardDevice.h>
 #include <Kernel/TTY/VirtualConsole.h>
 #include <LibBareMetal/IO.h>
@@ -486,7 +485,7 @@ void KeyboardDevice::key_state_changed(u8 raw, bool pressed)
     m_has_e0_prefix = false;
 }
 
-void KeyboardDevice::handle_irq()
+void KeyboardDevice::handle_irq(RegisterState&)
 {
     for (;;) {
         u8 status = IO::in8(I8042_STATUS);
diff --git a/Kernel/Devices/KeyboardDevice.h b/Kernel/Devices/KeyboardDevice.h
index f25b47cf5d..8ea872ac0a 100644
--- a/Kernel/Devices/KeyboardDevice.h
+++ b/Kernel/Devices/KeyboardDevice.h
@@ -26,12 +26,12 @@
 
 #pragma once
 
-#include "IRQHandler.h"
 #include "KeyCode.h"
 #include <AK/CircularQueue.h>
 #include <AK/DoublyLinkedList.h>
 #include <AK/Types.h>
 #include <Kernel/Devices/CharacterDevice.h>
+#include <Kernel/Interrupts/IRQHandler.h>
 
 namespace Kernel {
 
@@ -59,7 +59,7 @@ public:
 
 private:
     // ^IRQHandler
-    virtual void handle_irq() override;
+    virtual void handle_irq(RegisterState&) override;
 
     // ^CharacterDevice
     virtual const char* class_name() const override { return "KeyboardDevice"; }
diff --git a/Kernel/Devices/PATADiskDevice.h b/Kernel/Devices/PATADiskDevice.h
index d145af0423..4e03f83fbd 100644
--- a/Kernel/Devices/PATADiskDevice.h
+++ b/Kernel/Devices/PATADiskDevice.h
@@ -31,7 +31,7 @@
 #pragma once
 
 #include <Kernel/Devices/BlockDevice.h>
-#include <Kernel/IRQHandler.h>
+#include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/Lock.h>
 
 namespace Kernel {
diff --git a/Kernel/Devices/PS2MouseDevice.cpp b/Kernel/Devices/PS2MouseDevice.cpp
index 71a6274cd2..a02fe689cc 100644
--- a/Kernel/Devices/PS2MouseDevice.cpp
+++ b/Kernel/Devices/PS2MouseDevice.cpp
@@ -129,7 +129,7 @@ void PS2MouseDevice::handle_vmmouse_absolute_pointer()
     m_queue.enqueue(packet);
 }
 
-void PS2MouseDevice::handle_irq()
+void PS2MouseDevice::handle_irq(RegisterState&)
 {
 
     if (VMWareBackdoor::the().vmmouse_is_absolute()) {
diff --git a/Kernel/Devices/PS2MouseDevice.h b/Kernel/Devices/PS2MouseDevice.h
index 22ad37dba6..39fa48a5fe 100644
--- a/Kernel/Devices/PS2MouseDevice.h
+++ b/Kernel/Devices/PS2MouseDevice.h
@@ -28,7 +28,7 @@
 
 #include <AK/CircularQueue.h>
 #include <Kernel/Devices/CharacterDevice.h>
-#include <Kernel/IRQHandler.h>
+#include <Kernel/Interrupts/IRQHandler.h>
 #include <Kernel/MousePacket.h>
 
 namespace Kernel {
@@ -49,8 +49,8 @@ public:
 
 private:
     // ^IRQHandler
-    virtual void handle_irq() override;
     void handle_vmmouse_absolute_pointer();
+    virtual void handle_irq(RegisterState&) override;
 
     // ^CharacterDevice
     virtual const char* class_name() const override { return "PS2MouseDevice"; }