From f833cffef35c782a6f3f1d9f600f69083a4e1701 Mon Sep 17 00:00:00 2001 From: Tyler Wang Date: Tue, 30 Jul 2024 13:47:07 +0800 Subject: [PATCH] acpi/acpigen_ps2_keybd: Move KEY_DELETE to rest_of_keymaps This patch supports keyboards that have delete key but without numpad. To prevent KEY_DELETE be defined twice, move it from numeric_keypad_keymaps to rest_of_keymaps. BUG=b:345231373 TEST=Build and test on Riven/Craaskino, delete key function works Change-Id: Ib922a2b52fa7152ba3d9deb44e2c8200b2a3802c Signed-off-by: Tyler Wang Reviewed-on: https://review.coreboot.org/c/coreboot/+/83684 Reviewed-by: Dinesh Gehlot Reviewed-by: David Wu Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai Reviewed-by: Subrata Banik --- src/acpi/acpigen_ps2_keybd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/acpi/acpigen_ps2_keybd.c b/src/acpi/acpigen_ps2_keybd.c index 43a1eced59..869120714c 100644 --- a/src/acpi/acpigen_ps2_keybd.c +++ b/src/acpi/acpigen_ps2_keybd.c @@ -69,7 +69,6 @@ static uint32_t numeric_keypad_keymaps[] = { KEYMAP(0xc7, KEY_HOME), KEYMAP(0xcf, KEY_END), /* Row-1 */ - KEYMAP(0xd3, KEY_DELETE), KEYMAP(0xb5, KEY_KPSLASH), KEYMAP(0x37, KEY_KPASTERISK), KEYMAP(0x4a, KEY_KPMINUS), @@ -99,6 +98,7 @@ static uint32_t numeric_keypad_keymaps[] = { static uint32_t rest_of_keymaps[] = { /* Row-0 */ KEYMAP(0x01, KEY_ESC), + KEYMAP(0xd3, KEY_DELETE), /* Row-1 */ KEYMAP(0x29, KEY_GRAVE), KEYMAP(0x02, KEY_1),