From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABFF0C4743F for ; Tue, 8 Jun 2021 18:19:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9726C61380 for ; Tue, 8 Jun 2021 18:19:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234072AbhFHSU5 (ORCPT ); Tue, 8 Jun 2021 14:20:57 -0400 Received: from todd.t-8ch.de ([159.69.126.157]:35705 "EHLO todd.t-8ch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231652AbhFHSUy (ORCPT ); Tue, 8 Jun 2021 14:20:54 -0400 Date: Tue, 8 Jun 2021 20:18:56 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1623176337; bh=SC/iW8tEKG23KFNCOheedAfp54KKN/nyiLVof+f8O10=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=clilsAGWMCoQ2dLL4aqCX4sDgASMV05DVYEBhkh7N9uLURQEpHJ+yKoGww/AIRuwB HYpKmDIldBvQlrOeETDPmgVP8Zx9RI4hz7JMmrD4/W4DcYBPiERzDLxlVJXwqLTKCR +l0hNl0xa4YEIhjy3DWLLvGZdPaENrPbMh3Vaesk= From: Thomas =?utf-8?Q?Wei=C3=9Fschuh?= To: linux-input@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , Hans de Goede Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] HID: input: Add support for Programmable Buttons Message-ID: References: <20210520084805.685486-1-linux@weissschuh.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20210520084805.685486-1-linux@weissschuh.net> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi everybody, this is a ping requesting a review for my patch. I hope it is not to early send a ping. Link to patch in the archive: https://lore.kernel.org/linux-input/20210520084805.685486-1-linux@weissschuh.net/ Regards, Thomas On Do, 2021-05-20T10:48+0200, Thomas Weißschuh wrote: > Date: Thu, 20 May 2021 10:48:05 +0200 > From: Thomas Weißschuh > To: linux-input@vger.kernel.org, Jiri Kosina , Benjamin > Tissoires , Hans de Goede > > Cc: Thomas Weißschuh , linux-kernel@vger.kernel.org > Subject: [PATCH v3] HID: input: Add support for Programmable Buttons > X-Mailer: git-send-email 2.31.1 > > Map them to KEY_MACRO# event codes. > > These buttons are defined by HID as follows: > "The user defines the function of these buttons to control software applications or GUI objects." > > This matches the semantics of the KEY_MACRO# input event codes that Linux supports. > > Signed-off-by: Thomas Weißschuh > --- > > v1: https://lore.kernel.org/linux-input/20210519160349.609690-1-linux@weissschuh.net/ > > v1 -> v2: Only handle the 30 keys known > > v2: https://lore.kernel.org/linux-input/20210519174345.614467-1-linux@weissschuh.net/ > > v2 -> v3: > * Use hex constants for consistency > * Validate that the button is part of a "Programmable Buttons" Named Array. > Otherwise the condition would also apply to "Function Buttons". > * Ignore non-"Programmable Buttons" buttons. > > drivers/hid/hid-debug.c | 11 +++++++++++ > drivers/hid/hid-input.c | 22 ++++++++++++++++++++++ > include/linux/hid.h | 1 + > 3 files changed, 34 insertions(+) > > diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c > index 59f8d716d78f..0e76d9b4530a 100644 > --- a/drivers/hid/hid-debug.c > +++ b/drivers/hid/hid-debug.c > @@ -122,6 +122,7 @@ static const struct hid_usage_entry hid_usage_table[] = { > { 9, 0, "Button" }, > { 10, 0, "Ordinal" }, > { 12, 0, "Consumer" }, > + {0, 0x003, "ProgrammableButtons"}, > {0, 0x238, "HorizontalWheel"}, > { 13, 0, "Digitizers" }, > {0, 0x01, "Digitizer"}, > @@ -939,6 +940,16 @@ static const char *keys[KEY_MAX + 1] = { > [KEY_KBDINPUTASSIST_NEXTGROUP] = "KbdInputAssistNextGroup", > [KEY_KBDINPUTASSIST_ACCEPT] = "KbdInputAssistAccept", > [KEY_KBDINPUTASSIST_CANCEL] = "KbdInputAssistCancel", > + [KEY_MACRO1] = "Macro1", [KEY_MACRO2] = "Macro2", [KEY_MACRO3] = "Macro3", > + [KEY_MACRO4] = "Macro4", [KEY_MACRO5] = "Macro5", [KEY_MACRO6] = "Macro6", > + [KEY_MACRO7] = "Macro7", [KEY_MACRO8] = "Macro8", [KEY_MACRO9] = "Macro9", > + [KEY_MACRO10] = "Macro10", [KEY_MACRO11] = "Macro11", [KEY_MACRO12] = "Macro12", > + [KEY_MACRO13] = "Macro13", [KEY_MACRO14] = "Macro14", [KEY_MACRO15] = "Macro15", > + [KEY_MACRO16] = "Macro16", [KEY_MACRO17] = "Macro17", [KEY_MACRO18] = "Macro18", > + [KEY_MACRO19] = "Macro19", [KEY_MACRO20] = "Macro20", [KEY_MACRO21] = "Macro21", > + [KEY_MACRO22] = "Macro22", [KEY_MACRO23] = "Macro23", [KEY_MACRO24] = "Macro24", > + [KEY_MACRO25] = "Macro25", [KEY_MACRO26] = "Macro26", [KEY_MACRO27] = "Macro27", > + [KEY_MACRO28] = "Macro28", [KEY_MACRO29] = "Macro29", [KEY_MACRO30] = "Macro30", > }; > > static const char *relatives[REL_MAX + 1] = { > diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c > index 18f5e28d475c..791a2baf9ccd 100644 > --- a/drivers/hid/hid-input.c > +++ b/drivers/hid/hid-input.c > @@ -567,6 +567,16 @@ static void hidinput_update_battery(struct hid_device *dev, int value) > } > #endif /* CONFIG_HID_BATTERY_STRENGTH */ > > +static bool hidinput_field_in_collection(struct hid_device *device, struct hid_field *field, > + unsigned int type, unsigned int usage) > +{ > + struct hid_collection *collection; > + > + collection = &device->collection[field->usage->collection_index]; > + > + return collection->type == type && collection->usage == usage; > +} > + > static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_field *field, > struct hid_usage *usage) > { > @@ -632,6 +642,18 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel > else > code += BTN_TRIGGER_HAPPY - 0x10; > break; > + case HID_CP_CONSUMER_CONTROL: > + if (hidinput_field_in_collection(device, field, > + HID_COLLECTION_NAMED_ARRAY, > + HID_CP_PROGRAMMABLEBUTTONS)) { > + if (code <= 0x1d) > + code += KEY_MACRO1; > + else > + code += BTN_TRIGGER_HAPPY - 0x1e; > + } else { > + goto ignore; > + } > + break; > default: > switch (field->physical) { > case HID_GD_MOUSE: > diff --git a/include/linux/hid.h b/include/linux/hid.h > index 271021e20a3f..fb0e4dde6175 100644 > --- a/include/linux/hid.h > +++ b/include/linux/hid.h > @@ -102,6 +102,7 @@ struct hid_item { > #define HID_COLLECTION_PHYSICAL 0 > #define HID_COLLECTION_APPLICATION 1 > #define HID_COLLECTION_LOGICAL 2 > +#define HID_COLLECTION_NAMED_ARRAY 4 > > /* > * HID report descriptor global item tags > > base-commit: efd8929b9eec1cde120abb36d76dd00ff6711023 > -- > 2.31.1 >