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

Kernel/HID: Don't use *LockRefPtrs in the I8042Controller code

Browse source
This commit is contained in:
Liav A 2023-04-15 09:22:31 +03:00 • committed by Andreas Kling
parent 747efc5265
commit 32557be930
4 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Kernel/Devices/HID/Controller.h
View file

@ -8,6 +8,8 @@
#include <AK/AtomicRefCounted.h>
#include <AK/IntrusiveList.h>
#include <AK/NonnullRefPtr.h>
#include <AK/RefPtr.h>
namespace Kernel {
@ -22,7 +24,7 @@ protected:
HIDController() = default;
private:
IntrusiveListNode<HIDController, NonnullLockRefPtr<HIDController>> m_list_node;
IntrusiveListNode<HIDController, NonnullRefPtr<HIDController>> m_list_node;
};
}

2
Kernel/Devices/HID/Management.cpp
View file

@ -123,7 +123,7 @@ UNMAP_AFTER_INIT ErrorOr<void> HIDManagement::enumerate()
// set to emulate PS/2, we should not initialize the PS/2 controller.
#if ARCH(X86_64)
auto has_i8042_controller = false;
auto i8042_controller = I8042Controller::initialize();
auto i8042_controller = TRY(I8042Controller::create());
switch (kernel_command_line().i8042_presence_mode()) {
case I8042PresenceMode::Automatic: {
// Note: If ACPI is disabled or doesn't indicate that we have an i8042, we