From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mauro Carvalho Chehab Subject: [PATCH v3 4/4] hid-logitech-hidpp: add support for ratchet switch Date: Fri, 7 Apr 2017 08:31:27 -0300 Message-ID: References: <3f88befad3bce50fe8a9a51549c24ec0b9f3f793.1491564565.git.mchehab@s-opensource.com> <3be194a94955af2525d9635cac44dfc48ad9c308.1491564565.git.mchehab@s-opensource.com> Return-path: Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:48271 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933407AbdDGLbv (ORCPT ); Fri, 7 Apr 2017 07:31:51 -0400 In-Reply-To: <3be194a94955af2525d9635cac44dfc48ad9c308.1491564565.git.mchehab@s-opensource.com> In-Reply-To: References: Sender: linux-input-owner@vger.kernel.org List-Id: linux-input@vger.kernel.org To: linux-input@vger.kernel.org, Dmitry Torokhov Cc: Mauro Carvalho Chehab , Jiri Kosina , Benjamin Tissoires Logitech Anywhere MX2 and MX master produce events for the wheel ratchet/free wheel button. Add support for it. Signed-off-by: Mauro Carvalho Chehab --- drivers/hid/hid-logitech-hidpp.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index c208a5107511..6177087ffaca 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -1406,6 +1406,19 @@ static int hidpp_mouse_set_wheel_mode(struct hidpp_device *hidpp, return ret; } + ret = hidpp_send_fap_command_sync(hidpp, hrd->feature_index, + CMD_MOUSE_GET_WHEEL_RATCHET, + params, 16, &response); + if (ret > 0) { + hid_err(hidpp->hid_dev, "%s: received protocol error 0x%02x\n", + __func__, ret); + return -EPROTO; + } + if (ret) + return ret; + + hrd->ratchet = response.fap.params[0] & 0x01; + params[0] = invert ? 0x4 : 0 | high_res ? 0x2 : 0 | hidpp_mode ? 0x1 : 0; @@ -1945,10 +1958,11 @@ static int high_res_raw_event(struct hid_device *hdev, u8 *data, int size) input_report_rel(hrd->input, REL_HIRES_WHEEL, delta); else input_report_rel(hrd->input, REL_WHEEL, delta); + } else if (data[3] == 0x10) { + hrd->ratchet = data[4] & 0x01; + input_report_switch(hrd->input, SW_RATCHET, hrd->ratchet); } - /* FIXME: also report ratchet events to userspace */ - return 1; } @@ -1961,6 +1975,11 @@ static void high_res_populate_input(struct hidpp_device *hidpp, __set_bit(REL_WHEEL, hrd->input->relbit); __set_bit(REL_HIRES_WHEEL, hrd->input->relbit); + __set_bit(EV_SW, hrd->input->evbit); + __set_bit(SW_RATCHET, hrd->input->swbit); + + /* Report current state of the ratchet switch */ + input_report_switch(hrd->input, SW_RATCHET, hrd->ratchet); } -- 2.9.3