From 6c72736b26a81a8f03d8dd47989bfffe26bb1c95 Mon Sep 17 00:00:00 2001 From: Liav A Date: Tue, 21 Jan 2020 13:23:03 +0200 Subject: Kernel: Replace IRQHandler with the new InterruptHandler class System components that need an IRQ handling are now inheriting the InterruptHandler class. In addition to that, the initialization process of PATAChannel was changed to fit the changes. PATAChannel, E1000NetworkAdapter and RTL8139NetworkAdapter are now inheriting from PCI::Device instead of InterruptHandler directly. --- Kernel/Devices/KeyboardDevice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Kernel/Devices/KeyboardDevice.cpp') diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp index 86c862057e..5996e87566 100644 --- a/Kernel/Devices/KeyboardDevice.cpp +++ b/Kernel/Devices/KeyboardDevice.cpp @@ -483,7 +483,7 @@ void KeyboardDevice::key_state_changed(u8 raw, bool pressed) m_has_e0_prefix = false; } -void KeyboardDevice::handle_irq() +void KeyboardDevice::handle_interrupt() { for (;;) { u8 status = IO::in8(I8042_STATUS); @@ -551,7 +551,7 @@ KeyboardDevice& KeyboardDevice::the() } KeyboardDevice::KeyboardDevice() - : IRQHandler(IRQ_KEYBOARD) + : InterruptHandler(IRQ_KEYBOARD) , CharacterDevice(85, 1) { s_the = this; @@ -563,7 +563,7 @@ KeyboardDevice::KeyboardDevice() while (IO::in8(I8042_STATUS) & I8042_BUFFER_FULL) IO::in8(I8042_BUFFER); - enable_irq(); + enable_interrupts(); } KeyboardDevice::~KeyboardDevice() -- cgit v1.2.3