From patchwork Fri Apr 21 16:08:27 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: 9693553 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 A5A8E6038D for ; Fri, 21 Apr 2017 19:03:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9773328628 for ; Fri, 21 Apr 2017 19:03:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8AD712863D; Fri, 21 Apr 2017 19:03:43 +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 516FC28628 for ; Fri, 21 Apr 2017 19:03:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424371AbdDUTDf (ORCPT ); Fri, 21 Apr 2017 15:03:35 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:35480 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424483AbdDUTDc (ORCPT ); Fri, 21 Apr 2017 15:03:32 -0400 Received: by mail-wm0-f52.google.com with SMTP id w64so22490976wma.0 for ; Fri, 21 Apr 2017 12:03: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:mime-version :content-transfer-encoding; bh=YGqWQz9o/meMO3Aau+FoyMlKpcjYCem/AREN6NjWfHg=; b=vkcpf8MLE8TAITjmeiVLnPZkv4IaTZp2aigeggG0Qfe+LmLFA4syAKFdO/LG3zxPhg /aepr5jgLgm39gaTlkMi8dask+yfuE9ZoCoE3Rj4MiHCDj9cBrsYN3OMRQLePXzKN03w /6GfC07ltJO3whrlFK+4PBrh/l7WbzIxB2w/WPUBe/DYypZTvJhjgMXuJ6z5vDJ0GOQr RAhJDQbyGOrzhym8ciRDVL+g0odXOi4J2+EO5WPt1tyYoCrPvNKub9S9/o9QqOaCfMDa HmZ/UAgwr94iceB5bfg6SVfldaK0+9z/UyIS32YpirhM2XspRSjt3mfzF23WzkQbL7VW FxBw== 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:mime-version :content-transfer-encoding; bh=YGqWQz9o/meMO3Aau+FoyMlKpcjYCem/AREN6NjWfHg=; b=Gba37hmzKgXc6KwKbObPz9L36cdDF0ppj9tYfHW5CYlfI+GsYUgwh86zNAyN94BXTO LA1VPShEXqLOszs5XD5vlhQZHQgiqfcEeks3pAffZxuj0CRBtVUmlUF3vxTD/tw6nWd+ SNkHaj4ty5JmBdRktuClmsu9gWX2gpHdcNcxUoMxLEdSXCPNOPM/XicBNAtcj6witpJP xo82Jw7HimiVfmOeYIap9vtm7mgXKS1GhZUcdQ9XjLJGP6Re0+pG7GYtPB9mP6F0MyvT 5HPW87gf3Q9SGnJN8MkWw4KzY+WqRcAJlzHn9Dg05Zy88h+p9sD99P9/TJNoDD72mS+r r6Rg== X-Gm-Message-State: AN3rC/4hUc2m7O7ZT/sHVSn/D4H8SVYO1YLcA1KiSvdXgu2eLZKm4lJu sixpxUCJTvOF4w== X-Received: by 10.80.211.7 with SMTP id g7mr65335edh.0.1492790921177; Fri, 21 Apr 2017 09:08:41 -0700 (PDT) Received: from localhost ([2a02:8084:d6c0:6b00:5d65:6789:3292:3ea2]) by smtp.gmail.com with ESMTPSA id h15sm525978edh.56.2017.04.21.09.08.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Apr 2017 09:08:40 -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?= Subject: [PATCH] HID: hid-elecom: extend to fix the descriptor for DEFT trackballs. Date: Fri, 21 Apr 2017 17:08:27 +0100 Message-Id: <20170421160827.11809-1-flameeyes@flameeyes.eu> X-Mailer: git-send-email 2.10.2 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. Signed-off-by: Diego Elio Pettenò --- drivers/hid/Kconfig | 6 +++-- drivers/hid/hid-core.c | 1 + drivers/hid/hid-elecom.c | 57 ++++++++++++++++++++++++++++++++++++++++-------- drivers/hid/hid-ids.h | 1 + 4 files changed, 54 insertions(+), 11 deletions(-) diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 4070b73..f717b3e 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 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..312cf1b 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1891,6 +1891,7 @@ 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) }, { 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..4f808c4 100644 --- a/drivers/hid/hid-elecom.c +++ b/drivers/hid/hid-elecom.c @@ -1,10 +1,7 @@ /* - * 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) 2017 Diego Elio Pettenò */ /* @@ -23,15 +20,57 @@ 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: + /* 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..69203c9 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -351,6 +351,7 @@ #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061 +#define USB_DEVICE_ID_ELECOM_DEFT 0x00ff #define USB_VENDOR_ID_DREAM_CHEEKY 0x1d34 #define USB_DEVICE_ID_DREAM_CHEEKY_WN 0x0004