From: Hilton Chain <hako@ultrarare.space>
To: "José Expósito" <jose.exposito89@gmail.com>
Cc: bryancain3@gmail.com, jikos@kernel.org,
benjamin.tissoires@redhat.com, linux-kernel@vger.kernel.org,
linux-input@vger.kernel.org
Subject: [PATCH] HID: apple: Properly handle function keys on misset non-apple keyboards
Date: Mon, 30 May 2022 09:42:15 +0800 [thread overview]
Message-ID: <20220530094215.646432cd@ultrarare.space> (raw)
In-Reply-To: <20220530083752.1973a905@ultrarare.space>
This commit extends fa33382c7f74 ("HID: apple: Properly handle function
keys on Keychron keyboards") to support all misset non-apple keyboards.
Signed-off-by: Hilton Chain <hako@ultrarare.space>
---
drivers/hid/hid-apple.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 42a568902f49..3b15753be467 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -36,7 +36,7 @@
#define APPLE_NUMLOCK_EMULATION BIT(8)
#define APPLE_RDESC_BATTERY BIT(9)
#define APPLE_BACKLIGHT_CTL BIT(10)
-#define APPLE_IS_KEYCHRON BIT(11)
+#define APPLE_IS_BAD_APPLE BIT(11)
#define APPLE_FLAG_FKEY 0x01
@@ -363,7 +363,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
}
if (fnmode == 3) {
- real_fnmode = (asc->quirks & APPLE_IS_KEYCHRON) ? 2 : 1;
+ real_fnmode = (asc->quirks & APPLE_IS_BAD_APPLE) ? 2 : 1;
} else {
real_fnmode = fnmode;
}
@@ -669,9 +669,9 @@ static int apple_input_configured(struct hid_device *hdev,
asc->quirks &= ~APPLE_HAS_FN;
}
- if (strncmp(hdev->name, "Keychron", 8) == 0) {
- hid_info(hdev, "Keychron keyboard detected; function keys will default to fnmode=2 behavior\n");
- asc->quirks |= APPLE_IS_KEYCHRON;
+ if (strncmp(hdev->name, "Apple", 5)) {
+ hid_info(hdev, "Non-apple keyboard detected; function keys will default to fnmode=2 behavior\n");
+ asc->quirks |= APPLE_IS_BAD_APPLE;
}
return 0;
base-commit: b00ed48bb0a7c295facf9036135a573a5cdbe7de
--
2.36.1
next prev parent reply other threads:[~2022-05-30 1:42 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-29 10:02 [PATCH] HID: apple: Reset quirks when Fn key is not found Hilton Chain
2022-05-29 18:20 ` José Expósito
2022-05-30 0:42 ` Hilton Chain
2022-05-30 1:42 ` Hilton Chain [this message]
2022-05-30 6:18 ` José Expósito
2022-05-31 14:11 ` Hilton Chain
2022-05-31 14:33 ` [PATCH v2] HID: apple: Workaround for non-Apple keyboards Hilton Chain
2022-05-31 17:20 ` José Expósito
2022-05-31 19:50 ` Bryan Cain
2022-05-31 23:13 ` hako
2022-05-31 23:26 ` [PATCH v3] HID: apple: Properly handle function keys on non-Apple keyboard Hilton Chain
2022-06-01 4:17 ` [PATCH v4] " Hilton Chain
2022-06-01 17:49 ` José Expósito
2022-06-02 8:12 ` [PATCH v5] " Hilton Chain
2022-06-02 21:00 ` Bryan Cain
2022-06-03 17:53 ` José Expósito
2022-06-08 9:54 ` Jiri Kosina
2022-06-18 13:51 ` [PATCH v6] " Hilton Chain
2022-06-02 0:35 ` [PATCH v3] " Bryan Cain
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220530094215.646432cd@ultrarare.space \
--to=hako@ultrarare.space \
--cc=benjamin.tissoires@redhat.com \
--cc=bryancain3@gmail.com \
--cc=jikos@kernel.org \
--cc=jose.exposito89@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®