From 68b08261075a85e5c54582d8decb4abaf63df43c Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Fri, 29 Dec 2023 21:46:34 +0100 Subject: [PATCH] Revert "Kernel: Add boot parameter to determine i8042 first port translation" This reverts commit 0379742d7ee7a8ca7cce54ad1fe587fa7a5c0f90. Commit 61a385fc019ed873a554d605a6561c30d8fe3903 breaks the shift and caps lock key, but depends on this one. --- Base/usr/share/man/man7/boot_parameters.md | 4 ---- Kernel/Boot/CommandLine.cpp | 10 ---------- Kernel/Boot/CommandLine.h | 1 - Kernel/Devices/HID/Management.cpp | 3 +-- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Base/usr/share/man/man7/boot_parameters.md b/Base/usr/share/man/man7/boot_parameters.md index 0f77ab50a30..6ecda181fa5 100644 --- a/Base/usr/share/man/man7/boot_parameters.md +++ b/Base/usr/share/man/man7/boot_parameters.md @@ -67,10 +67,6 @@ has set up before booting the Kernel, don't initialize any driver. **`none`** - Assume there's no i8042 controller in the system. **`force`** - Assume there's i8042 controller in the system. -* **`i8042_first_port_translation`** - This parameter expects **`on`** or **`off`** and is by default set to **`off`**. - When set to **`off`**, the kernel will not enable first PS2 port translation. - When set to **`on`**, the kernel will enable first PS2 port translation. - * **`panic`** - This parameter expects **`halt`** or **`shutdown`**. This is particularly useful in CI contexts. * **`pci`** - This parameter expects **`ecam`**, **`io`** or **`none`**. When selecting **`none`** diff --git a/Kernel/Boot/CommandLine.cpp b/Kernel/Boot/CommandLine.cpp index 221191eef5c..c5babbb8d38 100644 --- a/Kernel/Boot/CommandLine.cpp +++ b/Kernel/Boot/CommandLine.cpp @@ -131,16 +131,6 @@ UNMAP_AFTER_INIT bool CommandLine::is_early_boot_console_disabled() const PANIC("Unknown early_boot_console setting: {}", value); } -UNMAP_AFTER_INIT bool CommandLine::i8042_enable_first_port_translation() const -{ - auto value = lookup("i8042_first_port_translation"sv).value_or("off"sv); - if (value == "off"sv) - return false; - if (value == "on"sv) - return true; - PANIC("Unknown i8042_enable_first_port_translation setting: {}", value); -} - UNMAP_AFTER_INIT I8042PresenceMode CommandLine::i8042_presence_mode() const { auto value = lookup("i8042_presence_mode"sv).value_or("auto"sv); diff --git a/Kernel/Boot/CommandLine.h b/Kernel/Boot/CommandLine.h index 35fd26e7d86..180ddda3925 100644 --- a/Kernel/Boot/CommandLine.h +++ b/Kernel/Boot/CommandLine.h @@ -82,7 +82,6 @@ public: [[nodiscard]] bool is_pci_disabled() const; [[nodiscard]] bool is_legacy_time_enabled() const; [[nodiscard]] bool is_pc_speaker_enabled() const; - [[nodiscard]] bool i8042_enable_first_port_translation() const; [[nodiscard]] GraphicsSubsystemMode graphics_subsystem_mode() const; [[nodiscard]] I8042PresenceMode i8042_presence_mode() const; [[nodiscard]] bool is_force_pio() const; diff --git a/Kernel/Devices/HID/Management.cpp b/Kernel/Devices/HID/Management.cpp index 10c6119dfc5..912302abdc9 100644 --- a/Kernel/Devices/HID/Management.cpp +++ b/Kernel/Devices/HID/Management.cpp @@ -167,8 +167,7 @@ UNMAP_AFTER_INIT ErrorOr HIDManagement::enumerate() // Note: If we happen to not have i8042 just return "gracefully" for now. if (!has_i8042_controller) return {}; - auto i8042_enable_first_port_translation = kernel_command_line().i8042_enable_first_port_translation() ? I8042Controller::EnableKeyboardFirstPortTranslation::Yes : I8042Controller::EnableKeyboardFirstPortTranslation::No; - if (auto result_or_error = i8042_controller->detect_devices(i8042_enable_first_port_translation); result_or_error.is_error()) + if (auto result_or_error = i8042_controller->detect_devices(I8042Controller::EnableKeyboardFirstPortTranslation::No); result_or_error.is_error()) return {}; m_hid_serial_io_controllers.with([&](auto& list) { list.append(i8042_controller);