From patchwork Mon Jul 11 17:28:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ari Savolainen X-Patchwork-Id: 965572 X-Patchwork-Delegate: jikos@jikos.cz Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6BHS7l0012398 for ; Mon, 11 Jul 2011 17:28:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758256Ab1GKR2F (ORCPT ); Mon, 11 Jul 2011 13:28:05 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:55761 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758242Ab1GKR2F (ORCPT ); Mon, 11 Jul 2011 13:28:05 -0400 Received: by gwaa18 with SMTP id a18so1571241gwa.19 for ; Mon, 11 Jul 2011 10:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=eatITPHG0omvZtcRAZTVN9d6QWXf3YKAigOC7whqOgI=; b=EDcsAwoxjoJDNoKW7R10UHQsJDJlVWGYrZv9KOsdblkEVXfBEWrH8k4leM3jOHhFIE cSka4T/puhsJLDUvCYPI8k51cF/Hw5LW7kfJ4mz080qzKP+YHzvgfmgNd7RdFK3OKAIQ eumt/Smgr69o2yr0tuCCHKbf8D09I4QZL9U04= MIME-Version: 1.0 Received: by 10.150.201.6 with SMTP id y6mr4689977ybf.10.1310405284473; Mon, 11 Jul 2011 10:28:04 -0700 (PDT) Received: by 10.150.98.6 with HTTP; Mon, 11 Jul 2011 10:28:04 -0700 (PDT) In-Reply-To: References: Date: Mon, 11 Jul 2011 20:28:04 +0300 Message-ID: Subject: Re: [PATCH] HID: fix horizontal wheel for ms comfort mouse 4500 From: Ari Savolainen To: Jiri Kosina Cc: linux-input@vger.kernel.org Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 11 Jul 2011 17:28:08 +0000 (UTC) 2011/7/11 Jiri Kosina : > Hi, > > thanks a lot for debuging this. > > For rational of HWHEEL mapping, please see commit 25914662b. > > So what I'd like to ask you to do instead would be adding a new quirk. > Wouldn't DUPLICATE_USAGES be enough here? > > If not, please just add a really simple quirk into hid-microsoft. > > Thanks, > > -- > Jiri Kosina > SUSE Labs > Hi, The generic DUPLICATE_USAGES quirk doesn't exist any more. The following patch is somewhat simplified version of what is done in hid-lg.c in similar cases. --- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-microsoft.c | 26 +++++++++++++++++++++----- 2 files changed, 22 insertions(+), 5 deletions(-) { @@ -181,6 +194,8 @@ static const struct hid_device_id ms_devices[] = { .driver_data = MS_PRESENTER }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_WIRELESS_OPTICAL_DESKTOP_3_0), .driver_data = MS_NOGET }, + { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_MOUSE_4500), + .driver_data = MS_DUPLICATE_USAGES }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT), .driver_data = MS_PRESENTER }, @@ -193,6 +208,7 @@ static struct hid_driver ms_driver = { .id_table = ms_devices, .report_fixup = ms_report_fixup, .input_mapping = ms_input_mapping, + .input_mapped = ms_input_mapped, .event = ms_event, .probe = ms_probe, }; diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index a756ee6..92de0d5 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -472,6 +472,7 @@ #define USB_DEVICE_ID_MS_LK6K 0x00f9 #define USB_DEVICE_ID_MS_PRESENTER_8K_BT 0x0701 #define USB_DEVICE_ID_MS_PRESENTER_8K_USB 0x0713 +#define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500 0x076c #define USB_VENDOR_ID_MOJO 0x8282 #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c index 0f6fc54..8f31362 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c @@ -23,11 +23,12 @@ #include "hid-ids.h" -#define MS_HIDINPUT 0x01 -#define MS_ERGONOMY 0x02 -#define MS_PRESENTER 0x04 -#define MS_RDESC 0x08 -#define MS_NOGET 0x10 +#define MS_HIDINPUT 0x01 +#define MS_ERGONOMY 0x02 +#define MS_PRESENTER 0x04 +#define MS_RDESC 0x08 +#define MS_NOGET 0x10 +#define MS_DUPLICATE_USAGES 0x20 /* * Microsoft Wireless Desktop Receiver (Model 1028) has @@ -109,6 +110,18 @@ static int ms_input_mapping(struct hid_device *hdev, struct hid_input *hi, return 0; } +static int ms_input_mapped(struct hid_device *hdev, struct hid_input *hi, + struct hid_field *field, struct hid_usage *usage, + unsigned long **bit, int *max) +{ + unsigned long quirks = (unsigned long)hid_get_drvdata(hdev); + + if (quirks & MS_DUPLICATE_USAGES) + clear_bit(usage->code, *bit); + + return 0; +} + static int ms_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value)