forked from SerenityOS/serenity
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Kernel: Introduce a new HID subsystem
The end goal of this commit is to allow to boot on bare metal with no PS/2 device connected to the system. It turned out that the original code relied on the existence of the PS/2 keyboard, so VirtualConsole called it even though ACPI indicated the there's no i8042 controller on my real machine because I didn't plug any PS/2 device. The code is much more flexible, so adding HID support for other type of hardware (e.g. USB HID) could be much simpler. Briefly describing the change, we have a new singleton called HIDManagement, which is responsible to initialize the i8042 controller if exists, and to enumerate its devices. I also abstracted a bit things, so now every Human interface device is represented with the HIDDevice class. Then, there are 2 types of it - the MouseDevice and KeyboardDevice classes; both are responsible to handle the interface in the DevFS. PS2KeyboardDevice, PS2MouseDevice and VMWareMouseDevice classes are responsible for handling the hardware-specific interface they are assigned to. Therefore, they are inheriting from the IRQHandler class.
- Loading branch information
1 parent
32dd9c5
commit 8e3e3a7
Showing
23 changed files
with
942 additions
and
410 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/* | ||
* Copyright (c) 2021, Liav A. <[email protected]> | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, this | ||
* list of conditions and the following disclaimer. | ||
* | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||
* this list of conditions and the following disclaimer in the documentation | ||
* and/or other materials provided with the distribution. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include <Kernel/Devices/CharacterDevice.h> | ||
#include <Kernel/Random.h> | ||
|
||
namespace Kernel { | ||
|
||
class HIDDevice : public CharacterDevice { | ||
public: | ||
enum class Type { | ||
Unknown = 0, | ||
Keyboard, | ||
Mouse, | ||
}; | ||
|
||
virtual Type instrument_type() const = 0; | ||
virtual void enable_interrupts() = 0; | ||
|
||
protected: | ||
HIDDevice(unsigned major, unsigned minor) | ||
: CharacterDevice(major, minor) | ||
{ | ||
} | ||
|
||
EntropySource m_entropy_source; | ||
}; | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,150 @@ | ||
/* | ||
* Copyright (c) 2021, Liav A. <[email protected]> | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, this | ||
* list of conditions and the following disclaimer. | ||
* | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||
* this list of conditions and the following disclaimer in the documentation | ||
* and/or other materials provided with the distribution. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
#include <AK/Singleton.h> | ||
#include <Kernel/ACPI/Parser.h> | ||
#include <Kernel/Devices/HID/HIDManagement.h> | ||
#include <Kernel/Devices/HID/I8042Controller.h> | ||
|
||
namespace Kernel { | ||
|
||
static AK::Singleton<HIDManagement> s_the; | ||
|
||
// clang-format off | ||
static const Keyboard::CharacterMapData DEFAULT_CHARACTER_MAP = | ||
{ | ||
.map = { | ||
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08, | ||
'\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', | ||
0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0, | ||
'\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0, '*', 0, | ||
' ', 0, 0, | ||
//60 70 80 | ||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, '\\', 0, 0, 0, | ||
|
||
}, | ||
|
||
.shift_map = { | ||
0, '\033', '!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', 0x08, | ||
'\t', 'Q', 'W', 'E', 'R', 'T', 'Y', 'U', 'I', 'O', 'P', '{', '}', '\n', | ||
0, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', 'L', ':', '"', '~', 0, | ||
'|', 'Z', 'X', 'C', 'V', 'B', 'N', 'M', '<', '>', '?', 0, '*', 0, | ||
' ', 0, 0, | ||
//60 70 80 | ||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, '|', 0, 0, 0, | ||
|
||
}, | ||
|
||
.alt_map = { | ||
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08, | ||
'\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', | ||
0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0, | ||
'\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0, '*', 0, | ||
' ', 0, 0, | ||
|
||
//60 70 80 | ||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, '\\', 0, 0, 0, | ||
|
||
}, | ||
|
||
.altgr_map = { | ||
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08, | ||
'\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', | ||
0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0, | ||
'\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0, '*', 0, | ||
' ', 0, 0, | ||
//60 70 80 | ||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, '\\', 0, 0, 0, | ||
}, | ||
|
||
.shift_altgr_map = { | ||
0, '\033', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '-', '=', 0x08, | ||
'\t', 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i', 'o', 'p', '[', ']', '\n', | ||
0, 'a', 's', 'd', 'f', 'g', 'h', 'j', 'k', 'l', ';', '\'', '`', 0, | ||
'\\', 'z', 'x', 'c', 'v', 'b', 'n', 'm', ',', '.', '/', 0, '*', 0, | ||
' ', 0, 0, | ||
//60 70 80 | ||
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '0', '.', 0, 0, '\\', 0, 0, 0, | ||
}, | ||
}; | ||
// clang-format on | ||
|
||
KeyboardClient::~KeyboardClient() | ||
{ | ||
} | ||
|
||
size_t HIDManagement::generate_minor_device_number_for_mouse() | ||
{ | ||
// FIXME: Lock this to prevent race conditions with hot-plugging devices! | ||
return m_mouse_minor_number++; | ||
} | ||
size_t HIDManagement::generate_minor_device_number_for_keyboard() | ||
{ | ||
// FIXME: Lock this to prevent race conditions with hot-plugging devices! | ||
return m_keyboard_minor_number++; | ||
} | ||
|
||
UNMAP_AFTER_INIT HIDManagement::HIDManagement() | ||
: m_character_map("en-us", DEFAULT_CHARACTER_MAP) | ||
{ | ||
} | ||
|
||
void HIDManagement::set_maps(const Keyboard::CharacterMapData& character_map_data, const String& character_map_name) | ||
{ | ||
m_character_map.set_character_map_data(character_map_data); | ||
m_character_map.set_character_map_name(character_map_name); | ||
dbgln("New Character map '{}' passed in by client.", character_map_name); | ||
} | ||
|
||
UNMAP_AFTER_INIT void HIDManagement::enumerate() | ||
{ | ||
// FIXME: When we have USB HID support, we should ensure that we disable | ||
// emulation of the PS/2 controller if it was set by the BIOS. | ||
// If ACPI indicates we have an i8042 controller and the USB controller was | ||
// set to emulate PS/2, we should not initialize the PS/2 controller. | ||
if (!ACPI::Parser::the()->have_8042()) | ||
return; | ||
m_i8042_controller = I8042Controller::initialize(); | ||
m_i8042_controller->detect_devices(); | ||
if (m_i8042_controller->mouse()) | ||
m_hid_devices.append(m_i8042_controller->mouse().release_nonnull()); | ||
if (m_i8042_controller->keyboard()) | ||
m_hid_devices.append(m_i8042_controller->keyboard().release_nonnull()); | ||
} | ||
|
||
UNMAP_AFTER_INIT void HIDManagement::initialize() | ||
{ | ||
VERIFY(!s_the.is_initialized()); | ||
s_the.ensure_instance(); | ||
s_the->enumerate(); | ||
} | ||
|
||
HIDManagement& HIDManagement::the() | ||
{ | ||
return *s_the; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/* | ||
* Copyright (c) 2021, Liav A. <[email protected]> | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without | ||
* modification, are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, this | ||
* list of conditions and the following disclaimer. | ||
* | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, | ||
* this list of conditions and the following disclaimer in the documentation | ||
* and/or other materials provided with the distribution. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
#pragma once | ||
|
||
#include <AK/CircularQueue.h> | ||
#include <AK/NonnullRefPtrVector.h> | ||
#include <AK/RefPtr.h> | ||
#include <AK/Time.h> | ||
#include <AK/Types.h> | ||
#include <Kernel/API/KeyCode.h> | ||
#include <Kernel/API/MousePacket.h> | ||
#include <Kernel/KResult.h> | ||
#include <Kernel/SpinLock.h> | ||
#include <Kernel/UnixTypes.h> | ||
#include <LibKeyboard/CharacterMap.h> | ||
|
||
namespace Kernel { | ||
|
||
class HIDDevice; | ||
class I8042Controller; | ||
class MouseDevice; | ||
class KeyboardDevice; | ||
class KeyboardClient; | ||
class HIDManagement { | ||
friend class KeyboardDevice; | ||
friend class MouseDevice; | ||
AK_MAKE_ETERNAL; | ||
|
||
public: | ||
HIDManagement(); | ||
static void initialize(); | ||
static HIDManagement& the(); | ||
|
||
void enumerate(); | ||
|
||
const String& keymap_name() const { return m_character_map.character_map_name(); } | ||
const Keyboard::CharacterMapData& character_maps() const { return m_character_map.character_map_data(); } | ||
const Keyboard::CharacterMap& character_map() const { return m_character_map; } | ||
void set_client(KeyboardClient* client) { m_client = client; } | ||
void set_maps(const Keyboard::CharacterMapData& character_map, const String& character_map_name); | ||
|
||
private: | ||
size_t generate_minor_device_number_for_mouse(); | ||
size_t generate_minor_device_number_for_keyboard(); | ||
|
||
size_t m_mouse_minor_number { 0 }; | ||
size_t m_keyboard_minor_number { 0 }; | ||
Keyboard::CharacterMap m_character_map; | ||
KeyboardClient* m_client { nullptr }; | ||
RefPtr<I8042Controller> m_i8042_controller; | ||
NonnullRefPtrVector<HIDDevice> m_hid_devices; | ||
}; | ||
|
||
class KeyboardClient { | ||
public: | ||
virtual ~KeyboardClient(); | ||
virtual void on_key_pressed(KeyEvent) = 0; | ||
}; | ||
|
||
} |
Oops, something went wrong.