mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 09:51:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Kernel: Propagate HIDManagement initialisation error to init

Browse source 
Initialisation errors for HIDManagement are now returned to the init. In
the init we assert by MUST if we get an error.
This commit is contained in:
Lorenz Steinert 2022-02-23 22:14:09 +01:00 • committed by Andreas Kling
parent d3ce97e8b2
commit 78f8821152
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Kernel/Devices/HID/HIDManagement.cpp
View file

@ -137,12 +137,11 @@ UNMAP_AFTER_INIT ErrorOr<void> HIDManagement::enumerate()
return {};
}
UNMAP_AFTER_INIT void HIDManagement::initialize()
UNMAP_AFTER_INIT ErrorOr<void> HIDManagement::initialize()
{
VERIFY(!s_the.is_initialized());
s_the.ensure_instance();
// FIXME: Propagate errors back to init to deal with them.
MUST(s_the->enumerate());
return s_the->enumerate();
}
HIDManagement& HIDManagement::the()

2
Kernel/Devices/HID/HIDManagement.h
View file

@ -35,7 +35,7 @@ class HIDManagement {
public:
HIDManagement();
static void initialize();
static ErrorOr<void> initialize();
static HIDManagement& the();
ErrorOr<void> enumerate();

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

@ -154,7 +154,6 @@ ErrorOr<u8> PS2MouseDevice::send_command(u8 command)
if (response != I8042Response::Acknowledge) {
dbgln("PS2MouseDevice: Command {} got {} but expected ack: {}", command, response, static_cast<u8>(I8042Response::Acknowledge));
// FIXME: Is this the correct errno value for this?
return Error::from_errno(EIO);
}
return response;
@ -165,7 +164,6 @@ ErrorOr<u8> PS2MouseDevice::send_command(u8 command, u8 data)
u8 response = TRY(m_i8042_controller->send_command(instrument_type(), command, data));
if (response != I8042Response::Acknowledge) {
dbgln("PS2MouseDevice: Command {} got {} but expected ack: {}", command, response, static_cast<u8>(I8042Response::Acknowledge));
// FIXME: Is this the correct errno value for this?
return Error::from_errno(EIO);
}
return response;

2
Kernel/init.cpp
View file

@ -326,7 +326,7 @@ void init_stage2(void*)
(void)SerialDevice::must_create(3).leak_ref();
VMWareBackdoor::the(); // don't wait until first mouse packet
HIDManagement::initialize();
MUST(HIDManagement::initialize());
GraphicsManagement::the().initialize();
ConsoleManagement::the().initialize();