From patchwork Fri Feb 14 10:05:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 865206 Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazolkn19010013.outbound.protection.outlook.com [52.103.67.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8939122CBDC; Fri, 14 Feb 2025 10:05:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.13 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739527535; cv=fail; b=jS6qWni2K9SfJu2uvgGSZ/cYIKerfuFr84T7Vd7kNZosCFl5pw/u5Kq7iC5uJhqslcsPR0f0S7vJZUV7P6cWZ8TaEbBl4L/8hLJ0i6ohTez8CSWQ/JT5ZQj285u1+ZMztfRGdJEIadpXDqhsU9TVlJbKZPbQjtdIO+kfzdS39/c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739527535; c=relaxed/simple; bh=XTvodwTinyy2+ufmtzjWRABOtKUW6/pPNJ9zKENxV3M=; h=From:To:CC:Subject:Date:Message-ID:Content-Type:MIME-Version; b=uDUS8hAu0eGokkShiEHwTs+pcAYfL6lAgtFUFi/FgrsyC2cKvcMhzM6UWQjs/uzmvRFxByW313yEb32Lm7v8Ddvlf25KlRPR4fSoCotxpqFvH6+TRPKJJQH4CdZAOxheOCq66FSj6QBIL2/sGUsKc5xgqSJDTgixrdRucdIhHFs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=RmCQZCF4; arc=fail smtp.client-ip=52.103.67.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="RmCQZCF4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wgcBekfqQBc8p6UjB4xbBVhGTaE39bi6jpGLq4EKRJgp1a1yKHqlLVKwE9tHOX3i8VfR6bv2OlSx8Q6yWlDLq+//wH2ZiJCLMTPySdUlQB4FbC7Fm3nVfIo4g3kzzevRdzsTQej+sf5uj012BoSCpLoNcqUFJ1grB0Y6RJ7CeMT2ESvTqGeM4c9tPYwME2XqC3T6M9e5+6Z3Ra3tu3+pGERQLpnWaJru+58U8dLptTAQctaHwrZMKbKHGtz/o+e4bjRNL+7d8RKGkF/Zde4dK1uZZvOb+1hO1Coi8OxjX36RoPToiJwA1v6bOQ1TBdybrlPSJcbV/v/Fgx83CEkfkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZA6Bom3p67Ta/H6JO3JSBAAEHBKQlpKnv0VULtfz1bE=; b=zAZAffkVTZGoLW6LuoR7+dNaLIbk1UljQGbVq6633+8sd0xz9qRLaaio3axYriQdYupUcDZK2yOB2gsyQfjoV4NDp1XXpPGVofRnuHLuan4Stg+CH5s/dl3STbqSpzmgQcQpzA1NWj8tyMPizoOKbR/Z0X1Rw+95ToQTSdaxMrhOoLiaqJDKucW4CLNhvsOiQeJsozMK7qmCMYno2Z4I8/WKiFpum0xbGrMnW2o+R5DvpRU8IVVVnzxOmJOlbKPqqVcl9aZVHGZZBwJjjiYm4iZ/gvZvxbRY/lKDlBZ8ilF1hqXnq2gzQcthE0su537RZ33GFTLZxCxVb99+ddO3nA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZA6Bom3p67Ta/H6JO3JSBAAEHBKQlpKnv0VULtfz1bE=; b=RmCQZCF4/em6TJ76vlMnq8sKpvhjU5nupaADgbZlJEyEzE+yqq7LgTMReZuB9MLZB7pjaKq6uitmrDcCbkIRgY2DSAZSRis8Cuor3+E3UxDl+oolPLtmxHPR5fK8dkV2bZxWaxO/bLVXdn68Ku4uLdpJtW0nM/TbpteNgv90kClyoxoWl32JUP731YpVObOhhwfDG+njnJFRyxo85cB97LZFwS25aEikqFG/dpH8a+X4tpIgAW7lYHbMJlCmjA+li/PeVrs8rq/Z0cinOAP5cfYlzRDzNgh4kxIchrHiY0N65awyecDSco/QOwdXTu7RitKCUU2n+aNMLY6YLHtOEA== Received: from PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:107::8) by MA0PR01MB10024.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ea::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.15; Fri, 14 Feb 2025 10:05:28 +0000 Received: from PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM ([fe80::8bdf:4c57:be81:7866]) by PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM ([fe80::8bdf:4c57:be81:7866%3]) with mapi id 15.20.8445.016; Fri, 14 Feb 2025 10:05:28 +0000 From: Aditya Garg To: Jiri Kosina , "jkosina@suse.com" , "jkosina@suse.cz" , Benjamin Tissoires , "bentiss@kernel.org" CC: Alex Henrie , "jose.exposito89@gmail.com" , "bruners@gmail.com" , "seobrien@chromium.org" , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH v2 1/4] HID: apple: Use common table for MacBook Pro fn mapping Thread-Topic: [PATCH v2 1/4] HID: apple: Use common table for MacBook Pro fn mapping Thread-Index: AQHbfsf5UD5NJWu4E0KLZernE2BrTw== Date: Fri, 14 Feb 2025 10:05:28 +0000 Message-ID: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9615:EE_|MA0PR01MB10024:EE_ x-ms-office365-filtering-correlation-id: 66005162-e7f5-4287-be60-08dd4cdf1b91 x-microsoft-antispam: BCL:0; ARA:14566002|19110799003|8062599003|8060799006|461199028|7092599003|15080799006|440099028|3412199025|102099032; x-microsoft-antispam-message-info: dtoUMI2oXONv6G0thEzCUWWx8xIepNdCeA8bcw4GyawbzuKqiqrKAOgd4+7Qi4k1olX9BwDxEGifucSBXvXEKiKmvOOmXPHSgRuM9h1DLWmwWI5TxRVaqd8P6x+4jcarN0Nd2szZoScHkxEaZeTlXaHw1UnOZ+6/QbM23LXqKCSuFwIi2T9isQ42Rh699sqQ7XgRaZPfQQnbVrdRcfAwMQiwol0VTBpRYBUYS8N61A/IPoHmBXmGww2J2jtS3rNPyaCaPyISMDxDrJKwPgXFovOrEw4M39MwD2UMdkwZxyxhqsfl5lPLv0D5jkk6piCVMgF1B5x1t+Ju5CYxcILKYtOKaYezvO7oFfsCmk2tuwGEVT/V8OSh4ZNPV5UMDNs/6Tws1+1H/UoR+/6v4sB7nD7zJJZ7fVPkwFMSA4swiDlJ17DjUVuBoqjvoQ9TncPkKx+xXWnGteX/5xJ5Fpec+vAEuSk4fR74YU2FcKOca3PWpX0SYlKviRfXKH+kKy2m0jEDq0/kECBDlzYKjppwqzcZochOpMvYSG4vtWkzMSKqARfncYnT3T/TVjSmz/3QHft0qLKq5Wm1wMdQaE3KhXlWh4R4sC0eioAxD5OC8l5Be0aOVqGgiq6jS066pWmycVTCnkRfm/+WQ85j1U+0EugYRg3psnUtS9ZWSNINfXQvu68QyHQVINYu4KrhE4yyfxWaIy5UrFCnE4weaumujXiZ3VSahgs59HGxgtdmrpc0wkWJHuEx0AnDYBP2n+pneyh7lR2s1nM76SltbI2SXzdpLF9bqt8RoAOhyZUh0EklphwGNRWqdHbD+d1b2ivJ5yiz+NkEwuzjiGnF88C3uxpFBurPt/Z2cZ7kxu9wojhmc4/SHHPjV9YMx3jZzb/o7XE3uk5WYm8/Qp+bItHMFe9g6d4BMsLa85xmvsyEd8/LWYKitIRlnq3+ppNWWXC+qKQnPFeQQJAU884J5qyPpN3/2tRPuHlIPI66s8LGty87DrDmJOzB1gpa1U2cA1l2XgRIXtEoE8syeaLxr7ifI8vSGuAoA5nNPzaJ2/by1IDmAd3CiCQ+tqMDE8H257xXyr66cxCOCzsVKOhwlRhZxQ== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: BGTD9oTCuvaYtKHHlL34MlSdOTqVYczP1z/dh40gRaLOCu551M837y7z8ktxkpZsp86JJcZtxNpeeGksxzaq8VUJVqn4hnnOTEbCnPmLE/WgbC2vsyQ965JnWGEm34UCo0TlkHAwLKOdAPk4/jYlqEFQDAhqCUcXoXby7dukv+Lg8RZnzCuMCDPxTc8STxO5ZIRc8uURy4swAVYSwdRJXoe8vxhtRzALPC/sZGa6b3zu4IzJhTEXLXQxbLjv6IUr3yi9PvV65fi7SpJCYgDPUYDyvC7M1301eTbjRcAPeEk8F6aXAbdBjs+3Xg69QKnl4MfgvDlV7UMYyqxALA+W6+KXJvd1ztwJJRmkfDRXq8D4//MZIHnpjhE5Nwvdm1A2MlU1CvLgUoUdVhcxamF/BXhpPWloEKesJxWhuYWs3NWU13vhp6pVUyRmDYxnCFX1h5dziQ7l5qxqbbF24nQf3yT6HTEMUAVjx1QkFKoJjBlerDMpc5ldbVqdXQfjKIa4NEwVWTi+IDPQ6NMEi+5ukayoxpslWzqeWG4O+Dmkd3lbn/ZjymEd3hhgTbEm6g1aZYJVp5cbERP6iZGi5O6pLzDnWwG8S4hmGA8fVXcyKJ+XpKdrq9bvpVsBt30ggbScNQEbVFGFXV6YMF30Gq0eY5tJuhgu+7+r+LXy1+Nh8nn5K9BfLg+SDq4bci7zdBnnp3+MC4b77bFVzquQRL8lkU0sEoUg47jCtuc1KRTTydFeepxhA+NTFmZ8E55QpROAFoQrqyELRYkgySLMBkJk5wWxYfM4qqtMiEGKtUd8Zfg/LRc9vBvqFgqwDsvAaMGzhr9PGFfVAbgAObn1TB8X+4VFFjiTB+4b3y627KrBQItLhxpDh8X75tyu1KbpnSS3VvYwv1rhGmIqUH8GlP96SoSffV0RQfdgZd9RdV4LwglVmpXW7JpKJ4HJPOsOdL8dAHGS7+SzDONum/LWIyq9Ov9scdsOrQ2BzI+MVq/KXEGGxHpCrPSm1XNpqG0NI+zAXQEZ9qsD5Fag0JmJ9RidMjbn/EZz6Vz2dZwOPCDMsa+1AjUlC5gBA8hcm/AY1VwPf1vYli32d5z8M3Ku1koSlMoYW0f5cYPYtqqQuZ4jEU3Rz+P0cp3fB7RE6xs7uQKHm/1Se9tSCpf7shFu8F8YmfIhFZdyYJjEciukSH7aHCLxmjcD6/02kErq2k+aePP7jgQMROKaGBzUrI1/wEEfnpY75IJ4B1PgnlskwZzUn5a4siLSHSG+Ibq5UrmAl/AZECqI+s9OqziknYUM7L8QpvEyubEA/cWB1ZgYjSd9CqS8259wdf6olbMjEdCzvwIJ Content-ID: <3568FC6E05EF8340AA901D8626E5AED3@INDPRD01.PROD.OUTLOOK.COM> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 66005162-e7f5-4287-be60-08dd4cdf1b91 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2025 10:05:28.0301 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0PR01MB10024 From: Aditya Garg The only difference between the fn mapping of the MacBook Pros with esc key and those without is of the presence of KEY_GRAVE in the translation table. We can easily use a flag instead of writing the whole table again to omit it from the models that have an esc key. Additionally, APPLE_IGNORE_MOUSE quirk was unused in this driver, so has been removed in this commit. Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 72 ++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 45 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 49812a76b..e31c9e8e8 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -30,7 +30,7 @@ #include "hid-ids.h" #define APPLE_RDESC_JIS BIT(0) -#define APPLE_IGNORE_MOUSE BIT(1) +/* BIT(1) reserved, was: APPLE_IGNORE_MOUSE */ #define APPLE_HAS_FN BIT(2) /* BIT(3) reserved, was: APPLE_HIDDEV */ #define APPLE_ISO_TILDE_QUIRK BIT(4) @@ -43,7 +43,8 @@ #define APPLE_IS_NON_APPLE BIT(11) #define APPLE_MAGIC_BACKLIGHT BIT(12) -#define APPLE_FLAG_FKEY 0x01 +#define APPLE_FLAG_FKEY 0x01 +#define APPLE_FLAG_DONT_TRANSLATE 0x02 #define HID_COUNTRY_INTERNATIONAL_ISO 13 #define APPLE_BATTERY_TIMEOUT_MS 60000 @@ -89,6 +90,19 @@ struct apple_sc_backlight { struct hid_device *hdev; }; +struct apple_backlight_config_report { + u8 report_id; + u8 version; + u16 backlight_off, backlight_on_min, backlight_on_max; +}; + +struct apple_backlight_set_report { + u8 report_id; + u8 version; + u16 backlight; + u16 rate; +}; + struct apple_magic_backlight { struct led_classdev cdev; struct hid_report *brightness; @@ -152,20 +166,6 @@ static const struct apple_key_translation magic_keyboard_2015_fn_keys[] = { { } }; -struct apple_backlight_config_report { - u8 report_id; - u8 version; - u16 backlight_off, backlight_on_min, backlight_on_max; -}; - -struct apple_backlight_set_report { - u8 report_id; - u8 version; - u16 backlight; - u16 rate; -}; - - static const struct apple_key_translation apple2021_fn_keys[] = { { KEY_BACKSPACE, KEY_DELETE }, { KEY_ENTER, KEY_INSERT }, @@ -209,32 +209,10 @@ static const struct apple_key_translation macbookair_fn_keys[] = { { } }; -static const struct apple_key_translation macbookpro_no_esc_fn_keys[] = { - { KEY_BACKSPACE, KEY_DELETE }, - { KEY_ENTER, KEY_INSERT }, - { KEY_GRAVE, KEY_ESC }, - { KEY_1, KEY_F1 }, - { KEY_2, KEY_F2 }, - { KEY_3, KEY_F3 }, - { KEY_4, KEY_F4 }, - { KEY_5, KEY_F5 }, - { KEY_6, KEY_F6 }, - { KEY_7, KEY_F7 }, - { KEY_8, KEY_F8 }, - { KEY_9, KEY_F9 }, - { KEY_0, KEY_F10 }, - { KEY_MINUS, KEY_F11 }, - { KEY_EQUAL, KEY_F12 }, - { KEY_UP, KEY_PAGEUP }, - { KEY_DOWN, KEY_PAGEDOWN }, - { KEY_LEFT, KEY_HOME }, - { KEY_RIGHT, KEY_END }, - { } -}; - -static const struct apple_key_translation macbookpro_dedicated_esc_fn_keys[] = { +static const struct apple_key_translation macbookpro_fn_keys[] = { { KEY_BACKSPACE, KEY_DELETE }, { KEY_ENTER, KEY_INSERT }, + { KEY_GRAVE, KEY_ESC, APPLE_FLAG_DONT_TRANSLATE }, { KEY_1, KEY_F1 }, { KEY_2, KEY_F2 }, { KEY_3, KEY_F3 }, @@ -415,6 +393,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, struct apple_sc *asc = hid_get_drvdata(hid); const struct apple_key_translation *trans, *table; bool do_translate; + bool dont_translate_flagged_key = false; u16 code = usage->code; unsigned int real_fnmode; @@ -481,14 +460,14 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132 || hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680 || hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213) - table = macbookpro_no_esc_fn_keys; + table = macbookpro_fn_keys; else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K || hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223 || hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F) - table = macbookpro_dedicated_esc_fn_keys; + table = macbookpro_fn_keys, dont_translate_flagged_key = true; else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K || hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K) - table = apple_fn_keys; + table = apple_fn_keys; else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) table = macbookair_fn_keys; @@ -525,6 +504,10 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, do_translate = asc->fn_on; } + if (dont_translate_flagged_key && + trans->flags & APPLE_FLAG_DONT_TRANSLATE) + do_translate = false; + if (do_translate) code = trans->to; } @@ -680,8 +663,7 @@ static void apple_setup_input(struct input_dev *input) apple_setup_key_translation(input, magic_keyboard_alu_fn_keys); apple_setup_key_translation(input, magic_keyboard_2015_fn_keys); apple_setup_key_translation(input, apple2021_fn_keys); - apple_setup_key_translation(input, macbookpro_no_esc_fn_keys); - apple_setup_key_translation(input, macbookpro_dedicated_esc_fn_keys); + apple_setup_key_translation(input, macbookpro_fn_keys); } static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi, From patchwork Fri Feb 14 10:07:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 865205 Received: from MA0PR01CU009.outbound.protection.outlook.com (mail-southindiaazolkn19010015.outbound.protection.outlook.com [52.103.67.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71DEF22CBDC; Fri, 14 Feb 2025 10:07:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.67.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739527648; cv=fail; b=YYtrqza4T19IwlLqTTbDldvi41y+Y3RiW8CRARBGv4J8MJr8/wRKXQCzNiykzuoJDqtwpub6sVJz8V0i+fw8Llfd7LyHy96KkfNnqGOtqUMepmffcLIKdDCxSH652phTKF6ypEe3c/OkAL+5b/zHdi/PeL8ifXu6Y5SIXJ5eoZU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739527648; c=relaxed/simple; bh=UvQ/yw+f8qekbNOh3nQsZdSRqPXrNxZOPSyJ33/2/0Y=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=uI6kl7/K4fUmwOQ0suNP4PmJljtOZjT2k72jNdQAxf/9FJ3WeNDvvgloydbTfPsPv33Q67yNGJXGUVzxxUJrg5Nxo92XrCHUqa38O0jGyfbJ2Tqx3GZGSB15ydDHsQaf/KgPvLe1UhQHmnSClmDKgevYhF3O+7zMo/uBNQcpeLM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=GtjqQEhr; arc=fail smtp.client-ip=52.103.67.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="GtjqQEhr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k8ntgojXAxEtlghQ2GwzQlRYxtRprF07UYejInQzAk4ifmbi5zaQTd66cvNkMUZ2dAyKetjN/2OApJzS8pjy/v16OT/A8K18zlXJQW5DokktRpJJKiQn6PBmkm9XxEOQBMeZldQxngjiIzHo2JaXLLbEltx9IkLd6HlU4tvMn7k169dZ5f5CGJVRsoTCpuQBlw9w/n8LF/nWrN42pfm+sSwxVWByxZuJlhc7JmvMYW8itmd8J3n/ReGynijVRXxWN4tXdLB7EtRIlWEoqJXi2JCL0JVkrkZgIMULlR3m5hBhbDRunxCEV3yYvvrpHXnzpr5dUmaZl12P3WTKFpIQMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ItwaqomeXXfXTD3OCr4OIQlSxlc2adn+czrpV+564ZE=; b=LzmfiMV7AwixULSHJbQhJhhlHbxHeQ35pl2mbdb27B6HHab5wTfGIl696ux9O0EBtR9x7Bp1wl/PHHsavzTSZY9vS/GpOLkz+dEobS5uaUVe9ubvOQTclSEFdWVFuiLD82BSw1nt6lnEsUS/A1/xxKDmMQKIo3Ul3HX0xyD+xatdsU49iEoJuOGIr+G42HT51y8nE2tMsK6/kwAYABdrS9fGLB3jiE/qGC9XpybuwcNkiavHTxM/RZH7aYpbTJ8MgmzQq9k9Q09D4GUspnBQYUqjfijdMx5fLIe35mu8V/z6b/lzecjrgdpXDMJDeeKYpuK+7H3EXHBL8hx37mirWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ItwaqomeXXfXTD3OCr4OIQlSxlc2adn+czrpV+564ZE=; b=GtjqQEhrrQXqRVjm3wmjleWJ2Xzqp7BW/kBeN9gpuemnZwTuUEAyHe1J6gyEQykb9J8SG6aElzKa6ZY1rEk7mjZ3OMDChgbdFWVPJszGWapqKCJHw0rxuk2Y+adXGIx0g0drESAOSiiJCrWwtqr40MBlDPHZXS5u03epkXPfk9A52lebi8ykXbFYGBh4bYwzELF1uEi8d2XE3iOBgsxyRTSFmTy9OEJxPWqFfsuxNXhh60pkWdegz+BPyLNgpkjhmchrExb92fIUXNnybt2lQxhj7E+wAbK0xXWnNWWCqlgfMVyznqDfHaQT5omWtbZshu+XjsXiBVbNJza5TCRJVg== Received: from PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:107::8) by MA0PR01MB10024.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a01:ea::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.15; Fri, 14 Feb 2025 10:07:21 +0000 Received: from PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM ([fe80::8bdf:4c57:be81:7866]) by PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM ([fe80::8bdf:4c57:be81:7866%3]) with mapi id 15.20.8445.016; Fri, 14 Feb 2025 10:07:21 +0000 From: Aditya Garg To: Jiri Kosina , "jkosina@suse.com" , "jkosina@suse.cz" , Benjamin Tissoires , "bentiss@kernel.org" CC: Alex Henrie , "jose.exposito89@gmail.com" , "bruners@gmail.com" , "seobrien@chromium.org" , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH v2 3/4] HID: apple: simplify logic for swapping only left sided option and command keys Thread-Topic: [PATCH v2 3/4] HID: apple: simplify logic for swapping only left sided option and command keys Thread-Index: AQHbfsg86PLYS+NsLk6zNloPDQHW8A== Date: Fri, 14 Feb 2025 10:07:20 +0000 Message-ID: <0DE60F20-1000-405B-99D7-70DB51A27BD2@live.com> References: In-Reply-To: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9615:EE_|MA0PR01MB10024:EE_ x-ms-office365-filtering-correlation-id: ac2860a8-633e-4ccf-f450-08dd4cdf5ee2 x-microsoft-antispam: BCL:0; ARA:14566002|19110799003|8062599003|8060799006|461199028|7092599003|15080799006|440099028|3412199025|102099032; x-microsoft-antispam-message-info: Vl34mFngs3ekXMndR0Ipwzn8gRU8TF7gXaltaZKaO51K73UhrXQsIvx6GHbixksgCZTESvQ8pVst691ov7yG4TLUGyq/5lmEXye8zU/oJKRDRWM6Ob73Ll2WOwVAAZyupdKJcMobtPkhwi1ezU1tvi5Amed+HdD1P6kw7EPNEmK/k/kIdlwtiJmh2fRf7V8Mv2g+tKdnsGWNOogK0fCbEDfMlsy1YWl2Om5n37VHWGwGbkn6g1Sua7U4GLuBppApTivKyxgQN5UO37Bb7wZ8tvOzKK7KPxDbIrzaXD2fDvVNeGz+DIiNTN9lMP8ZXn894goJ5mw88ooM4twxzPS1G5bfceAlq6Rh+iVWDrSGDRDqoDaeQg2VQRgcbBkbkOsUU67r4TsKqvOMFpy2Joe71oSqwUixswaw9+/hqtBXBOEwrsTavQefdDSHOuMHZHR5r43P3GneFehgxqK6yGRUeFE9rQ24i/6MynMN+Mh2+oJOjtdTc4tU1lvp07UffLLoUI8QUKOxnh15zcE2S5xncsKd6+yFl1QOZi58X0UtXuQEZiSN3hYaCP/Tiw26KaAxbibmU4T4ZOKUMYBC1NhVsQGZqoZmyKpxjACO2d5CbaqMKVW9QAQ2sUdlND9R2x/gBUD+HSF1Aa1mmcimgkkL2MfN4drCoY+4IUqtezfjXDRyJViId+aNLZ6tmI0eU81d4kDvR3vNSvWzk6N0WDNCg8ForPvvZXFWoK9f4HsIAlQHh3OamyXC0t76XTEbngF0Cce/xS49O/Xgr4wrrzlSJ6T/A4pDA4IFwRokVgxGX869HmWcQPKOwWyx0p1LhMVH+6PaVeFi+csqAJQlwPinbv74ezblvaZEwQvVgW05tNgvNdIpTR3uOFDNSsJzc1VojPMYHmrOHN3jFuUqKUSyiufN3T9dig2JL8xUxouGguG3cKvWavpZ7lotuSVDfGzsxbKaPJ7Y1oLQtlElPlhjHBRmnqfDXyyAUJCJLL5Qf3QB+UEWrqaSP483dMFH0/+qGAb4HPnVKU63OR7Xvak3WiGwJX0wrTLO29VzrLW7e7G+ywQnEO7vxYlQqEvih7fu3Yf3EljEY0ht0RxTNWs5Vg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: I8Q6O8qLPuleP4nWs5ZDQ7NqeIw6V09oGfTIrlHtbu3+smeof8QCOJ1FPTgpB83dncPeVyTFacIQq0m0exjlGEqa957O2qHJ1emzCgGUSFcLfvqJ3emzOEWpRhN+Lfbr1d2jxKSkihWTdT2eSzJKljtsHL5jTqOlYxdE2Q34BJyf82vB1smjk7RkncduRBZy3IpUapCCl3iDEWEvNtgoBH1CzPjbYMWmNmfSAE7UDhHqVxkY9XOI6JwONSgNw6AnfLi43Qv6nIlzTnzGeA4P9AEbSXsKV8QvpCsVWY3eMOQR8r2vvfPTfrcDLDipzFwESgW7zh2iDQh9iC5fcX8xCNa1YKG3nzIiSYkrsclePXRij44wzTZy5YSX/M89l+Jm05PKS/w5hrILWAEsA04yUU0tzbaeZUjCYwreqw+DAQuqPjxrQ+rmipzeuzn8LyE1s8whkRZvSRPdCHruiUkxcvoQptLEEX3Z30TA/ZxerPrx2XrS74BPJ4U7B7RnAQ2RebSmt1fKVejC+qNXM+j5PtyMpRkO/rbmnqlXcUhPdW31avWu07ThYZR80wuR377WFGZQ2hatIpjzsbvoZx0SY+YyFwI8tWg7iGe2WQ32GgkwQRu1DWgo7BJRFu+QEk87I3kMM3OGaz7bNUvCebTfNwqZg5+FjbMuhljSUBIYLeiIZlnw2vVf4gSP4Cy7kUd5AjYwNwo3q2f8kueHwQ7pM48igNpCONFZTaH6tXrA4Nc1euxAr9y82Rup+WQDtB19H//gE5T9Z5o1KmOjiZInj6XS697X5qV2r0NHZkEK4dJygF8bvkhA4adPnikEbrre7pfAPjGSdUHakMdHgowQ+5luD7xFLGd/Ltfjdb+jPTZzl3HuqnP6ore47Vs/7LYk+R6JRaJpv/l2dmiueJRSeZ9Qlv9Oj6DvzCfBdZGKPtVbiQq1YFTgWrKdENT+g+o9wFdkLIXnrrbDbpaP2BkP1jsrhjaEGAdkpWtkuW2xEeRP6W33Fx0/d911FXC4qYhZ3ArAWUoPSLxOgKZSWwTB10eM/q6Lpd+QbXOa6k1J3Z+gTZSEeMTOkAQ3987PowCZF5uLMmME1rV4Hdh873V497QZiBNh28f6bjy3bZmBvgkeK6i7wzgxzcpedKwfmRzzOLCzM3NPrhOJClt6pWYen8hSZB+Atf8tEeSktf2vlPyb/uPepX93KD5cCDC99OWNc+WKLTlH1u7elq22yfCF+gCKmbqTglawOxkk2rMWVJtPDvg2ZX7jgU4pKgeEYpPxvGcpqPmxKbf1kvgiD5LHI/gOzv9+JUna4pODoktdjoUF00NKR8ggXdTMFxW6v6dI Content-ID: <910969BB7EFAA84EB02C3B58A98A458F@INDPRD01.PROD.OUTLOOK.COM> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: ac2860a8-633e-4ccf-f450-08dd4cdf5ee2 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2025 10:07:20.9398 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MA0PR01MB10024 From: Aditya Garg In order to swap only left sided option and command keys a separate table was in use. This commit makes use of the APPLE_FLAG_DONT_TRANSLATE flag to remove the need of such separate tables. Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index ca462e483..c672ffc97 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -285,14 +285,8 @@ static const struct apple_key_translation apple_iso_keyboard[] = { static const struct apple_key_translation swapped_option_cmd_keys[] = { { KEY_LEFTALT, KEY_LEFTMETA }, { KEY_LEFTMETA, KEY_LEFTALT }, - { KEY_RIGHTALT, KEY_RIGHTMETA }, - { KEY_RIGHTMETA, KEY_RIGHTALT }, - { } -}; - -static const struct apple_key_translation swapped_option_cmd_left_keys[] = { - { KEY_LEFTALT, KEY_LEFTMETA }, - { KEY_LEFTMETA, KEY_LEFTALT }, + { KEY_RIGHTALT, KEY_RIGHTMETA, APPLE_FLAG_DONT_TRANSLATE }, + { KEY_RIGHTMETA, KEY_RIGHTALT, APPLE_FLAG_DONT_TRANSLATE }, { } }; @@ -399,12 +393,9 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, } if (swap_opt_cmd) { - if (swap_opt_cmd == 2) - trans = apple_find_translation(swapped_option_cmd_left_keys, code); - else - trans = apple_find_translation(swapped_option_cmd_keys, code); + trans = apple_find_translation(swapped_option_cmd_keys, code); - if (trans) + if (trans && !(swap_opt_cmd == 2 && trans->flags & APPLE_FLAG_DONT_TRANSLATE)) code = trans->to; } From patchwork Fri Feb 14 10:08:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 865204 Received: from PNZPR01CU001.outbound.protection.outlook.com (mail-centralindiaazolkn19011029.outbound.protection.outlook.com [52.103.68.29]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D0BA2580EC; Fri, 14 Feb 2025 10:08:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.103.68.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739527716; cv=fail; b=X3uHkr3Mdtzsg6tRPqKraFjinA49lGewYdamvvHowNS3Jdw8ZfhO08+ujMTdArJ7YFGDywctlkrpFULGBTH/DoCcxX+qthABXfUkq0d2gExKTJY0ZpbvyuTCnO+waj7oK0JinDsKFGZNbIpGe2+MZ7bxFFz2/aEc40PoRq7D/Mg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739527716; c=relaxed/simple; bh=ofGPAB7IIijTJPJxDujjEVYNtjkO8Zs/Oq5+1TgQb8M=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=nfEJQvNb02GCu8hzN46TfzP+6lunKykPqixOXv/bVDM62lJ0NVV0n0LUmzvXJIs3RT6JW3rrJQkoZchzVX0GLdNVJhgpnALksaHhxHiI9leOsh+EJczV9Bq4CgWfINVn8UITXvP3I8vscLPkxCdOm5U44ioNFuEAR+RlpoAHvPI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=OMN/si9G; arc=fail smtp.client-ip=52.103.68.29 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="OMN/si9G" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UfqrGNaLraDx97ep6Z+BKXV3+0hztxwrM8tXDriLu4hSNygkMES10Cg3rwEcRT9HA5IKC8YMfCtc9dFDcBa3qPDElXkMjQPtcOaitxxBB/HVkqcMdiVlbJqumizeJJtfXT/rSBJOxiE10FHLy6aCb2X/Ieb/K4vmpaKOO8LMhHjSzrQ1P81snveiGSSZ0SD3ya60rXU7E8solEtxvYX+F/o1wxzbbWQ3oPwEjk3xRNeIAWJ0GF1E0YeEm1rc95aUU2DpmKmIRWeeAYGxMWur4AD5MBtgfZ4fD7o2qisA2Bf/O3kj2dPH1tkIyidBDdMKTvPUdp4cxCXjy6VyjYMhSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xiIWcqTaT41gSdJ7meArh5mGZu5+NUROWJRm1ZONzUc=; b=QyqgEJnLdwlcbx+aZOc9W1nco/tHjrpmKsqP/CYm0Myl0e1VHowyCJEfAYwI4bPB//GKJVirz7GZATb4W98zGgiXV6J+shdJ0zFStp6x6bHrFwCiTlSqq0F0FJHo20Q9PIGMLwThPprx+ThvM7yX/unSKxJeRtjIHVtLU2oVh0RpH3CxClyD52MZqe6iuJnIDFB3Dzmao4ZKxrrHJoumDO28m9uZxe/IeRqoiDpEx40Hi0JbD1+E8JMXE8zjrspq886oX4wJugzQzwrEVnkGL/nka6U1s/knuEu7MEDl+PfSkn/A7VaYWICCqIYFnPmQ5eYlYoVZkfdEf22uh3wdwA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xiIWcqTaT41gSdJ7meArh5mGZu5+NUROWJRm1ZONzUc=; b=OMN/si9GGpUrtOtLRwr5yxyGymVhZifdkwlHcx+50AXOD7Lsa8U4kfYZI0X5XuBNJ4fjolfxL4lone8lKYYTcdyyRaOSbC2R4MTHdOj0yjq9dFzBak97ts8gukGA9W86lybACYWB9D+lHDp9BuKhDgEUvrGsyrIin7AyVN7bI5Q51Zz4LiB8U2DQadZtIAnvkq3t2kEnRvhdeSFuTudiwOGTUGUpgqSyxK+EA1KQ/QBLweXvIcFVoolLyh0RrkRwcvlSAS+770OUiDS/cpPQsn1HJ0N9mqZWLV+pJszhwg6c/Kh5va1KFIDiBUbAZ1mqegFng9Kbep/cJJ3N6Hb2kg== Received: from PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:107::8) by PN2PR01MB9082.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:159::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.17; Fri, 14 Feb 2025 10:08:28 +0000 Received: from PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM ([fe80::8bdf:4c57:be81:7866]) by PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM ([fe80::8bdf:4c57:be81:7866%3]) with mapi id 15.20.8445.016; Fri, 14 Feb 2025 10:08:28 +0000 From: Aditya Garg To: Jiri Kosina , "jkosina@suse.com" , "jkosina@suse.cz" , Benjamin Tissoires , "bentiss@kernel.org" CC: Alex Henrie , "jose.exposito89@gmail.com" , "bruners@gmail.com" , "seobrien@chromium.org" , Linux Kernel Mailing List , "linux-input@vger.kernel.org" Subject: [PATCH v2 4/4] HID: apple: use switch case to assign devices to their respective fn mapping Thread-Topic: [PATCH v2 4/4] HID: apple: use switch case to assign devices to their respective fn mapping Thread-Index: AQHbfshkmgz2/YnzI0WPBj39Y8IbiA== Date: Fri, 14 Feb 2025 10:08:28 +0000 Message-ID: <7747D0EE-DA32-4B6A-AB63-DB30C5E856BE@live.com> References: In-Reply-To: Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3PR01MB9615:EE_|PN2PR01MB9082:EE_ x-ms-office365-filtering-correlation-id: a3f4acf7-f79a-49d5-d4c7-08dd4cdf8725 x-microsoft-antispam: BCL:0; ARA:14566002|7092599003|15080799006|19110799003|461199028|8062599003|8060799006|3412199025|440099028|19061999003|102099032; x-microsoft-antispam-message-info: QWC3QER91p2neh3QG78zJWrGr69xT+rvA0Uz6QkQJH0v84mbOdB95NdPR3Hnwb+3ggVC6gNeH9f7K2yNcRf/cKgU/ZlyBnPIOICoGrjPcf9X/ebaeSFlrhCNoX8L9M877uNimTzmOnTDoXcyW93OWoMcPRr3XJPTxMfmQMfj6af7QYNFfAuOmNlb8Dh5tlmI8bfivOB4xUk8p0BszAPcngo39bGS/e753Y2Gw1p+2UXVFp4i7o1f+ddlJDhctfFVQmfhV0/RGbwOMa3FDJroSgnkRvbcTf/8zOWvHQ2vZaKBZsMJtzbiLdOwnju/8igJWN9oJEoWc8TZkROGHbmCT4kOA5AoK8HctzOw8IvzN5FeF1B0mt0N1buiyVS+qDnjT71q79e7MWWREtMHuJM1UqfLbRGcKurnJfnqQxNoVSY/47orj0gJhenQkdmMBkjWJV3OKu5QYQSVng9OE1lVqkMdJ2r1dftToGODWUuH9x2ih0gx6EgykERB3hlahYPTaGz0zWUl39I/1VUSXYvruxPTKMXyZcbCjuoSVcNS3l5WSFcnUFl0yYy7lLABtXDYwEz69GHKN1/jT/ybLGfVhJFzoysMGVERVi8xMm/w6mTxPoVjvr+SCT9yL5tUR3UZuZpZvTnb5YYLNzBhQmpKV3yRICmrQFN5+Mt+S4lseXKhr6DVyh4sU1sBKTrN+RVy+/zn1Sv2XJR1p3gd7Zb8gmGfRt1wKPcavx1o0sAvIp8C38L8HScbdWoSUvXBb83TALVBgIDRJTTrXyjnbibWiUkw92zIQKU6m7VJ9oElJlxwWm8JqjW31YzOuHlOjfot6VH1zmlN39O6uTGrwv8sgTb2Ur0mAS1y5cnXgE6zNaaPxV6itBUQv6vsw9vVIwoowiV2B2DZ4hSUhMvu9Lc9b/H6Fe3buLhkkSnWZkK2DBP44LxjQn3ItWh6W/TvtTdnAgGfms/vU24QUS7WLh5+sh2T8UkEudIJbI07gwfUCcExfHtbZW116qHlMPxj+Pz8kC8m2gVYDmyN/zYYLWpyIrZb/mDIzhTkgPgC/EUJUQ1m4A3uzK1466i+NC5KWEjipL9hxxBJE7Q9H1etLYAdXBPzxLrbWrDw8uvZxOoAe20= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 1s6ViQHwA+FLRpPm1nerAcxcq++QhjNQG+zoCUh+hNUJFKR3W+WxDpsRh1kbhn08RLTa9/klC420jj5vFW/Wxee76qnDjhwAnTNdPrRMC+SoWFkEcIbhr2ZpPDrVet6dvr4p6E1zhMSpu114mP46UmEKF9s5DLBO7bgpSxHUPPmPboFWW0zLeF+Dst3d53ddv0fvEiu+VLDwL0WzZ9dk6E89MbkZFZxM+j+WWKXL8O3lQCd3bjvOf6YACBijWge5v5X1Q4vkWXKHbuBkXQUJt2i/y9qyzygFy8XrUr4dBtcXphY9Uz1q0OCGjmjBM62vEe6Q4bjXjP6Fk4aUJN03u+z4fOU5tZISQ7OhCUijhUBnqc3J88rcaOmqWup/+wh6/iHvxBsS6f25LgMw/C8gH90GA6vy5pVt7n1QtlwZTJgY1xC6zp/Q4XvHntuR33TVYPssfklWCNKPytPpyNWN9M3xY0qtutHtwF8F3kecGCx8EOR9Y0uLyUOqzajHAIKZgYxm08BY+8G5K5M+tILjVh7o7yh9hi9ij3KiP12f5Ck0Hz2xAVC/OZiSAJaWK9JrDEpO30D5BhBps67CxMSU8Gm0ALjiYm3jLJfKuER6hqw6SXHrBktCMWrZ53o8KzzIo/5aajKocVzPNXU6xKALkWzNtFQhZSJW39zMfrW4oWmvW3FAx0ke9YwP89x2KQkgQ0CZmiPteMl3696Mx2vMoSIOijavdtP2OREmGAMeW6tZ2VgMYqxBUhMrcU7UIztUSEqn8k1vg7yunI16dHR2299fMPWWg7NpPv6S8K/3Rv1A1qezDrlbyGbSzbl/6CZHIZ5JHdqCgiv132gEBQ6i0KJsbtjc+p1shJ1lxY/Gy0fx6RLoljmiKfDVn3Lpv4EsPMpf7YosEll7ciVHlYr6F5PmZm65inzNQgSHcOWgXdzFzTYagHQZ5X8dX/+LPyoV7oXIs+GjjVAa7S8FvAIr2y/US4hQNPi7ApGQC7fXP3aNnMr1GaJXoz6BO5bQZsA0w6f+V5YyjNvi3WFQxf553cjtDIDZhBDOog9OiN2Su9yAvGxxOcXWXdRIbfwBTcFImIM+80jT9epl3hIRuL8KH/gCa3I1NBic3SMQRAmiUL6qMd+R718qe/II6V9Y2jNFsI3Syz4s3/hbnQGx60O8EDEtCvCE2wBA9jNrM/xKJHnph2pil8kRy+5Tq3cA/QH7vELkLa2KHGBlQFvz+vC5eQm2A/tAlw623sKmM/fW8zjxVocSNfQsSM18g+nnFiD+CVzLhuhMBO/nckjhMYZR02YzC7W9IAu4gPztBl5vBIjk1R44fvppfvMiWnUmaa90 Content-ID: <560F1231F7FCE3468F39B607ED597D4C@INDPRD01.PROD.OUTLOOK.COM> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-ae5c4.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3PR01MB9615.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: a3f4acf7-f79a-49d5-d4c7-08dd4cdf8725 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Feb 2025 10:08:28.5242 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2PR01MB9082 From: Aditya Garg There has been a continuous increase in the number of devices requiring hid-apple driver during the last few years. Moreover, unlike previous releases, the PIDs of the newer devices released cannot be combined in a specific range, thus filling up the if else if statements with individual device IDs. For such large table, its now more suitable to use switch case instead of if else if for improved readability. Signed-off-by: Aditya Garg --- drivers/hid/hid-apple.c | 75 +++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index c672ffc97..4e8b01793 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c @@ -410,42 +410,53 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, asc->fn_on = !!value; if (real_fnmode) { - if (hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO || - hid->product == USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS) + switch (hid->product) { + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_ISO: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_JIS: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO: + case USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_JIS: table = magic_keyboard_alu_and_2015_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015) - table = magic_keyboard_alu_and_2015_fn_keys, dont_translate_flagged_key = true; - else if (hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021 || - hid->product == USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021) + break; + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2015: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2015: + table = magic_keyboard_alu_and_2015_fn_keys; + dont_translate_flagged_key = true; + break; + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2024: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021: + case USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021: table = magic_keyboard_2021_and_2024_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132 || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680 || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213) + break; + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J132: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J213: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J680: table = macbookpro_fn_keys; - else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223 || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F) - table = macbookpro_fn_keys, dont_translate_flagged_key = true; - else if (hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K || - hid->product == USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K) - table = apple_fn_keys; - else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && - hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) - table = macbookair_fn_keys; - else if (hid->product < 0x21d || hid->product >= 0x300) - table = powerbook_fn_keys; - else + break; + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J152F: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J214K: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J223: + table = macbookpro_fn_keys; + dont_translate_flagged_key = true; + break; + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J140K: + case USB_DEVICE_ID_APPLE_WELLSPRINGT2_J230K: table = apple_fn_keys; + break; + default: + if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI && + hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) + table = macbookair_fn_keys; + else if (hid->product < 0x21d || hid->product >= 0x300) + table = powerbook_fn_keys; + else + table = apple_fn_keys; + } trans = apple_find_translation(table, code);