From patchwork Fri Apr 21 17:42:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Diego_Elio_Petten=C3=B2?= X-Patchwork-Id: 9693317 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9AF316037F for ; Fri, 21 Apr 2017 18:09:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9154A267EC for ; Fri, 21 Apr 2017 18:09:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8628628666; Fri, 21 Apr 2017 18:09:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 83487267EC for ; Fri, 21 Apr 2017 18:08:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423420AbdDUSIy (ORCPT ); Fri, 21 Apr 2017 14:08:54 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:38674 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1423382AbdDUSIv (ORCPT ); Fri, 21 Apr 2017 14:08:51 -0400 Received: by mail-wm0-f45.google.com with SMTP id r190so23379893wme.1 for ; Fri, 21 Apr 2017 11:08:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flameeyes-eu.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DlNWIjlAQZ6DxBsrETBSRo28aHnSAVPj+uZadXkTKkQ=; b=WYP7aK0VsixXBW21xQlXJ7k4s/cMbbAuIebe0ZCNwgG/EKjViJEkEkOkWBnS7pKws9 ixouY3K/9KIaNRd4Q47C8MNeKV0cwvzytRypyrfW5Swvst0rWjr7R9cpWSTt1OqnPds4 7tmw3zmOk0aNBTzh8YVpnWgsP7YC4VmpEXyWOCEDkH1cTepgE8bGZBdznx0QOjFE/7u+ ByrnqOXQo7/1nGm1dLmnseXNQuO7JhRbH4pr/HyePsJkaOdMLBpADixjvbHk0CTdkhR0 Q53l+x6W+7oF447YmSSji8eKtYa2Hq2Ds6YQp9EPJEJ0fqvV5tVgVOaJXk1IffqlMYYR yJGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DlNWIjlAQZ6DxBsrETBSRo28aHnSAVPj+uZadXkTKkQ=; b=d1vLbcMjtvIJvRhiPIVDdjVktt88cxHpW1NpKQW0SXssPsASYub+yl/LXkQCWjIXE9 SwGbRd4Uu0aqjWYzoWBVGc/aOWznq/oueZW2B86A9RCbPWw9ET1gA+KN02kuCejbQcFW 04qIBbkfCRJl2d3Z9xfUTeDX2HF3cniBhKU3gGFiAQdF1j/JHzGi5q/LUoEUjXAZwW1b zOD5ABCBDDNAafmuTkTwD7lonj/Xg1+yJn4rve+7Uqi2Q2ih3uKd7m4onBA86VMrxScs RP8JvHmc//bw9xXbw1Vp1fW5n90WpeRIkM3Pxl/eYtIzceK9fNqKo9Mz6F4maOubSuuw R9Tw== X-Gm-Message-State: AN3rC/7oLdtygBAkeywEUR+BAXOCZbtYgOSC470HDnlV9LwBwMB2v6Gb CYM9jDcwWzXEDg== X-Received: by 10.80.142.18 with SMTP id 18mr70498edw.51.1492796544126; Fri, 21 Apr 2017 10:42:24 -0700 (PDT) Received: from localhost ([2a02:8084:d6c0:6b00:5d65:6789:3292:3ea2]) by smtp.gmail.com with ESMTPSA id f18sm566998eda.43.2017.04.21.10.42.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Apr 2017 10:42:22 -0700 (PDT) From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= To: linux-input@vger.kernel.org Cc: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= , Jiri Kosina , Benjamin Tissoires , Yuxuan Shui Subject: [PATCH v2.1] HID: hid-elecom: extend to fix the descriptor for DEFT trackballs. Date: Fri, 21 Apr 2017 18:42:18 +0100 Message-Id: <20170421174218.15150-1-flameeyes@flameeyes.eu> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170421172933.14659-1-flameeyes@flameeyes.eu> References: <20170421172933.14659-1-flameeyes@flameeyes.eu> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ELECOM DEFT trackballs report only five buttons, when the device actually has 8. Change the descriptor so that the HID driver can see all of them. For completeness and future reference, I included a side-by-side diff of the part of the descriptor that is being edited. Cc: Jiri Kosina Cc: Benjamin Tissoires Cc: Yuxuan Shui Signed-off-by: Diego Elio Pettenò --- drivers/hid/Kconfig | 6 +++-- drivers/hid/hid-core.c | 2 ++ drivers/hid/hid-elecom.c | 59 ++++++++++++++++++++++++++++++++++++++++-------- drivers/hid/hid-ids.h | 2 ++ 4 files changed, 58 insertions(+), 11 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 4070b73..519918b 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -258,10 +258,12 @@ config HID_EMS_FF - Trio Linker Plus II config HID_ELECOM - tristate "ELECOM BM084 bluetooth mouse" + tristate "ELECOM HID devices" depends on HID ---help--- - Support for the ELECOM BM084 (bluetooth mouse). + Support for ELECOM devices: + - BM084 Bluetooth Mouse + - DEFT Trackball (Wired and wireless) config HID_ELO tristate "ELO USB 4000/4500 touchscreen" diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index ea36b55..1bc9291 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1891,6 +1891,8 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_WN) }, { HID_USB_DEVICE(USB_VENDOR_ID_DREAM_CHEEKY, USB_DEVICE_ID_DREAM_CHEEKY_FA) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_DEFT_WIRED) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_DEFT_WIRELESS) }, { HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0009) }, { HID_USB_DEVICE(USB_VENDOR_ID_ELO, 0x0030) }, { HID_USB_DEVICE(USB_VENDOR_ID_EMS, USB_DEVICE_ID_EMS_TRIO_LINKER_PLUS_II) }, diff --git a/drivers/hid/hid-elecom.c b/drivers/hid/hid-elecom.c index 6e3848a..cb278ac 100644 --- a/drivers/hid/hid-elecom.c +++ b/drivers/hid/hid-elecom.c @@ -1,10 +1,8 @@ /* - * HID driver for Elecom BM084 (bluetooth mouse). - * Removes a non-existing horizontal wheel from - * the HID descriptor. - * (This module is based on "hid-ortek".) - * + * HID driver for ELECOM devices. * Copyright (c) 2010 Richard Nauber + * Copyright (c) 2016 Yuxuan Shui + * Copyright (c) 2017 Diego Elio Pettenò */ /* @@ -23,15 +21,58 @@ static __u8 *elecom_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int *rsize) { - if (*rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) { - hid_info(hdev, "Fixing up Elecom BM084 report descriptor\n"); - rdesc[47] = 0x00; + switch (hdev->product) { + case USB_DEVICE_ID_ELECOM_BM084: + /* The BM084 Bluetooth mouse includes a non-existing horizontal + * wheel in the HID descriptor. */ + if (*rsize >= 48 && rdesc[46] == 0x05 && rdesc[47] == 0x0c) { + hid_info(hdev, "Fixing up Elecom BM084 report descriptor\n"); + rdesc[47] = 0x00; + } + case USB_DEVICE_ID_ELECOM_DEFT_WIRED: + case USB_DEVICE_ID_ELECOM_DEFT_WIRELESS: + /* The DEFT trackball has eight buttons, but its descriptor only + * reports five, disabling the three Fn buttons on the top of + * the mouse. + * + * Apply the following diff to the descriptor: + * + * Collection (Physical), Collection (Physical), + * Report ID (1), Report ID (1), + * Report Count (5), | Report Count (8), + * Report Size (1), Report Size (1), + * Usage Page (Button), Usage Page (Button), + * Usage Minimum (01h), Usage Minimum (01h), + * Usage Maximum (05h), | Usage Maximum (08h), + * Logical Minimum (0), Logical Minimum (0), + * Logical Maximum (1), Logical Maximum (1), + * Input (Variable), Input (Variable), + * Report Count (1), | Report Count (0), + * Report Size (3), Report Size (3), + * Input (Constant), Input (Constant), + * Report Size (16), Report Size (16), + * Report Count (2), Report Count (2), + * Usage Page (Desktop), Usage Page (Desktop), + * Usage (X), Usage (X), + * Usage (Y), Usage (Y), + * Logical Minimum (-32768), Logical Minimum (-32768), + * Logical Maximum (32767), Logical Maximum (32767), + * Input (Variable, Relative), Input (Variable, Relative), + * End Collection, End Collection, + */ + if (*rsize == 213 && rdesc[13] == 5 && rdesc[21] == 5) { + hid_info(hdev, "Fixing up Elecom DEFT Fn buttons\n"); + rdesc[13] = 8; /* Button/Variable Report Count */ + rdesc[21] = 8; /* Button/Variable Usage Maximum */ + rdesc[29] = 0; /* Button/Constant Report Count */ + } } return rdesc; } static const struct hid_device_id elecom_devices[] = { - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084)}, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) }, + { HID_USB_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_DEFT) }, { } }; MODULE_DEVICE_TABLE(hid, elecom_devices); diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 350accf..5f1635f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -351,6 +351,8 @@ #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061 +#define USB_DEVICE_ID_ELECOM_DEFT_WIRED 0x00fe +#define USB_DEVICE_ID_ELECOM_DEFT_WIRELESS 0x00ff #define USB_VENDOR_ID_DREAM_CHEEKY 0x1d34 #define USB_DEVICE_ID_DREAM_CHEEKY_WN 0x0004