diff options
author | Liav A <liavalb@gmail.com> | 2020-03-05 19:13:55 +0200 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-03-06 11:19:51 +0100 |
commit | 773afefe7c44d8ebf75f9e3909c950214a3540f7 (patch) | |
tree | d304e12bbd03637969419af212ad67c798e38610 /Kernel/Arch/i386 | |
parent | 52954ccce6a44931d7454846d8730468dfdcb46a (diff) | |
download | serenity-773afefe7c44d8ebf75f9e3909c950214a3540f7.zip |
Kernel: Change HandlerPurpose to HandlerType
Also, GenericInterruptHandler class requires to implement two new
methods.
Diffstat (limited to 'Kernel/Arch/i386')
-rw-r--r-- | Kernel/Arch/i386/CPU.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Kernel/Arch/i386/CPU.cpp b/Kernel/Arch/i386/CPU.cpp index b399f12d0c..cfe1888f9a 100644 --- a/Kernel/Arch/i386/CPU.cpp +++ b/Kernel/Arch/i386/CPU.cpp @@ -410,17 +410,17 @@ static void revert_to_unused_handler(u8 interrupt_number) void register_generic_interrupt_handler(u8 interrupt_number, GenericInterruptHandler& handler) { if (s_interrupt_handler[interrupt_number] != nullptr) { - if (s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::UnhandledInterruptHandler) { + if (s_interrupt_handler[interrupt_number]->type() == HandlerType::UnhandledInterruptHandler) { s_interrupt_handler[interrupt_number] = &handler; return; } if (s_interrupt_handler[interrupt_number]->is_shared_handler() && !s_interrupt_handler[interrupt_number]->is_sharing_with_others()) { - ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::SharedIRQHandler); + ASSERT(s_interrupt_handler[interrupt_number]->type() == HandlerType::SharedIRQHandler); static_cast<SharedIRQHandler*>(s_interrupt_handler[interrupt_number])->register_handler(handler); return; } if (!s_interrupt_handler[interrupt_number]->is_shared_handler()) { - ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::IRQHandler); + ASSERT(s_interrupt_handler[interrupt_number]->type() == HandlerType::IRQHandler); auto& previous_handler = *s_interrupt_handler[interrupt_number]; s_interrupt_handler[interrupt_number] = nullptr; SharedIRQHandler::initialize(interrupt_number); @@ -437,12 +437,12 @@ void register_generic_interrupt_handler(u8 interrupt_number, GenericInterruptHan void unregister_generic_interrupt_handler(u8 interrupt_number, GenericInterruptHandler& handler) { ASSERT(s_interrupt_handler[interrupt_number] != nullptr); - if (s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::UnhandledInterruptHandler) { + if (s_interrupt_handler[interrupt_number]->type() == HandlerType::UnhandledInterruptHandler) { dbg() << "Trying to unregister unused handler (?)"; return; } if (s_interrupt_handler[interrupt_number]->is_shared_handler() && !s_interrupt_handler[interrupt_number]->is_sharing_with_others()) { - ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::SharedIRQHandler); + ASSERT(s_interrupt_handler[interrupt_number]->type() == HandlerType::SharedIRQHandler); static_cast<SharedIRQHandler*>(s_interrupt_handler[interrupt_number])->unregister_handler(handler); if (!static_cast<SharedIRQHandler*>(s_interrupt_handler[interrupt_number])->sharing_devices_count()) { revert_to_unused_handler(interrupt_number); @@ -450,7 +450,7 @@ void unregister_generic_interrupt_handler(u8 interrupt_number, GenericInterruptH return; } if (!s_interrupt_handler[interrupt_number]->is_shared_handler()) { - ASSERT(s_interrupt_handler[interrupt_number]->purpose() == HandlerPurpose::IRQHandler); + ASSERT(s_interrupt_handler[interrupt_number]->type() == HandlerType::IRQHandler); revert_to_unused_handler(interrupt_number); return; } |