diff options
| author | Andreas Kling <kling@serenityos.org> | 2020-01-22 22:23:50 +0100 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-01-22 22:27:06 +0100 |
| commit | e64c335e5afb8da4294c04c9fec9e7db9eff3a1c (patch) | |
| tree | fa6bae2f5acd30409ea31d821f32e2ebc1abe4b1 /Kernel/Devices/KeyboardDevice.cpp | |
| parent | 8e21e31b3ac994ebe69c2a6835a89852f82953b4 (diff) | |
| download | serenity-e64c335e5afb8da4294c04c9fec9e7db9eff3a1c.zip | |
Revert "Kernel: Replace IRQHandler with the new InterruptHandler class"
This reverts commit 6c72736b26a81a8f03d8dd47989bfffe26bb1c95.
I am unable to boot on my home machine with this change in the tree.
Diffstat (limited to 'Kernel/Devices/KeyboardDevice.cpp')
| -rw-r--r-- | Kernel/Devices/KeyboardDevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp index 5996e87566..86c862057e 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_interrupt() +void KeyboardDevice::handle_irq() { for (;;) { u8 status = IO::in8(I8042_STATUS); @@ -551,7 +551,7 @@ KeyboardDevice& KeyboardDevice::the() } KeyboardDevice::KeyboardDevice() - : InterruptHandler(IRQ_KEYBOARD) + : IRQHandler(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_interrupts(); + enable_irq(); } KeyboardDevice::~KeyboardDevice() |