sugar/linux
1
0
Fork 0
Code Activity

HID: hid-appletb-kbd: simplify logic used to switch between media and function keys on pressing fn key

Browse Source 
This commit simplifies the logic in appletb_kbd_inp_event used for
switching between the media and function keys on pressing the fn key.

We now also prevent touching the kbd->saved_mode variable in case the esc
key only mode is chosen.

The following small fixes have also been done in this patch:

- A small comment style error has been fixed
- Fixed spelling in MODULE_DESCRIPTION
- I have added myself to MODULE_AUTHOR

Signed-off-by: Aditya Garg <gargaditya08@live.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
This commit is contained in:
Aditya Garg
2025-02-17 04:43:56 +00:00
committed by Jiri Kosina
parent a4fa2e6bfe
commit 534bac4f12
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/hid/hid-appletb-kbd.c
View File

@@ -236,13 +236,13 @@ static void appletb_kbd_inp_event(struct input_handle *handle, unsigned int type
reset_inactivity_timer(kbd);
if (type == EV_KEY && code == KEY_FN && appletb_tb_fn_toggle) {
if (type == EV_KEY && code == KEY_FN && appletb_tb_fn_toggle &&
(kbd->current_mode == APPLETB_KBD_MODE_SPCL ||
kbd->current_mode == APPLETB_KBD_MODE_FN)) {
if (value == 1) {
kbd->saved_mode = kbd->current_mode;
if (kbd->current_mode == APPLETB_KBD_MODE_SPCL)
appletb_kbd_set_mode(kbd, APPLETB_KBD_MODE_FN);
else if (kbd->current_mode == APPLETB_KBD_MODE_FN)
appletb_kbd_set_mode(kbd, APPLETB_KBD_MODE_SPCL);
appletb_kbd_set_mode(kbd, kbd->current_mode == APPLETB_KBD_MODE_SPCL
? APPLETB_KBD_MODE_FN : APPLETB_KBD_MODE_SPCL);
} else if (value == 0) {
if (kbd->saved_mode != kbd->current_mode)
appletb_kbd_set_mode(kbd, kbd->saved_mode);
@@ -497,10 +497,11 @@ static struct hid_driver appletb_kbd_hid_driver = {
};
module_hid_driver(appletb_kbd_hid_driver);
/* The backlight driver should be loaded before the keyboard driver is initialised*/
/* The backlight driver should be loaded before the keyboard driver is initialised */
MODULE_SOFTDEP("pre: hid_appletb_bl");
MODULE_AUTHOR("Ronald Tschalär");
MODULE_AUTHOR("Kerem Karabay <kekrby@gmail.com>");
MODULE_DESCRIPTION("MacBookPro Touch Bar Keyboard Mode Driver");
MODULE_AUTHOR("Aditya Garg <gargaditya08@live.com>");
MODULE_DESCRIPTION("MacBook Pro Touch Bar Keyboard Mode driver");
MODULE_LICENSE("GPL");