135 lines
6.5 KiB
Diff
135 lines
6.5 KiB
Diff
|
From mboxrd@z Thu Jan 1 00:00:00 1970
|
||
|
|
Return-Path: <linux-kernel-owner@kernel.org>
|
||
|
|
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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED,
|
||
|
|
DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
|
||
|
|
HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH,
|
||
|
|
MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham
|
||
|
|
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 06C18C433E1
|
||
|
|
for <linux-kernel@archiver.kernel.org>; Sat, 27 Mar 2021 13:07:08 +0000 (UTC)
|
||
|
|
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
|
||
|
|
by mail.kernel.org (Postfix) with ESMTP id D1CE16193D
|
||
|
|
for <linux-kernel@archiver.kernel.org>; Sat, 27 Mar 2021 13:07:07 +0000 (UTC)
|
||
|
|
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
|
||
|
|
id S230328AbhC0NGi (ORCPT <rfc822;linux-kernel@archiver.kernel.org>);
|
||
|
|
Sat, 27 Mar 2021 09:06:38 -0400
|
||
|
|
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59770 "EHLO
|
||
|
|
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
|
||
|
|
with ESMTP id S230266AbhC0NG1 (ORCPT
|
||
|
|
<rfc822;linux-kernel@vger.kernel.org>);
|
||
|
|
Sat, 27 Mar 2021 09:06:27 -0400
|
||
|
|
Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634])
|
||
|
|
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5086BC0613B1
|
||
|
|
for <linux-kernel@vger.kernel.org>; Sat, 27 Mar 2021 06:06:27 -0700 (PDT)
|
||
|
|
Received: by mail-pl1-x634.google.com with SMTP id h8so2235029plt.7
|
||
|
|
for <linux-kernel@vger.kernel.org>; Sat, 27 Mar 2021 06:06:27 -0700 (PDT)
|
||
|
|
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||
|
|
d=gmail.com; s=20161025;
|
||
|
|
h=from:to:cc:subject:date:message-id:in-reply-to:references
|
||
|
|
:mime-version:content-transfer-encoding;
|
||
|
|
bh=NeWUvZBV3NAy1b0eckELIbBZ7sti/n1sLYnD4r2cjaU=;
|
||
|
|
b=V7uM0AaI1Vy/mmqpuTVu5F6+98YPDzOa3QS6tRkWeJqhrflMONfCXtOxXVR+CeiPil
|
||
|
|
OOfaxOtAMeVEW9wE0EU3U/8aNghtzuUvVN+0Tj57+W+4g0ilQOODiDLDu4ZqAo1Q5eDZ
|
||
|
|
gA+He13KWVwNYaYTNUNParLXG5GYDbblaqABSUDurI1FTjn1US0ZZytlzdZy1GfL9eTj
|
||
|
|
6AiiVM3A4YdUGUWE7qQQE8jI92o4qKYvaNjn1M+d5ypKCue3NJWeRTSPKLu0QD2qL02+
|
||
|
|
QPga2RPtmLpztA8/lPGTRpgVNY3C5jdCBZyWgFtvZg5dNoDfe5bQnAmF2J2ka+A7JBSD
|
||
|
|
VHtw==
|
||
|
|
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=NeWUvZBV3NAy1b0eckELIbBZ7sti/n1sLYnD4r2cjaU=;
|
||
|
|
b=OQek2lJ5JINezfYdN/FzSPFL1N9Hrs+KstU7K4gEHavdffvSAOBebg2MG5VSzkf93H
|
||
|
|
o1iOiAOoXY7cx7j7Vx5CFZUuJOLilpC6gPTJpZlaP8YtEFfGkPaUPPh5FSTyM463Sir8
|
||
|
|
n6DupTSrFUI1y44GOBZ2bM2pf9hRN1Yj1oiCT6upmfoHw0/PaKEZt5aOEI8se7HRJp94
|
||
|
|
td6+SEZok3uxKEglKEqAG8cnj7Pt4tKVQlg+MI1AQDLQ/ytdYJlMPmrqVyNpnsv44wYa
|
||
|
|
dxBf0TaMvqn9SYDIDcGct3toAVm5DfVUqXm1nkYcYMOdvPrmLoH52NtCyi5cYC+2TR6i
|
||
|
|
jUpA==
|
||
|
|
X-Gm-Message-State: AOAM532sXgN0NNpKjilSMBewUXwwXz+MOfd7J5FRI6zAWA5st7gy5LmE
|
||
|
|
Sw/QHj4cm3zT07LU1kWYSO9puwFV+yK0Hquf
|
||
|
|
X-Google-Smtp-Source: ABdhPJyDnhcP7BeBHXX2rPqMXwkOQiZdussDPATmYqyQnp7HAsi0OqWSUVIloMNi3QBpMsmjXTtyew==
|
||
|
|
X-Received: by 2002:a17:903:2285:b029:e6:faf5:eaff with SMTP id b5-20020a1709032285b02900e6faf5eaffmr19574014plh.70.1616850386727;
|
||
|
|
Sat, 27 Mar 2021 06:06:26 -0700 (PDT)
|
||
|
|
Received: from johnchen902-arch-ryzen.. (2001-b011-3815-3a1f-9afa-9bff-fe6e-3ce2.dynamic-ip6.hinet.net. [2001:b011:3815:3a1f:9afa:9bff:fe6e:3ce2])
|
||
|
|
by smtp.gmail.com with ESMTPSA id ot17sm6413787pjb.50.2021.03.27.06.06.25
|
||
|
|
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
|
||
|
|
Sat, 27 Mar 2021 06:06:26 -0700 (PDT)
|
||
|
|
From: John Chen <johnchen902@gmail.com>
|
||
|
|
To: linux-kernel@vger.kernel.org
|
||
|
|
Cc: Rohit Pidaparthi <rohitpid@gmail.com>,
|
||
|
|
RicardoEPRodrigues <ricardo.e.p.rodrigues@gmail.com>,
|
||
|
|
Jiri Kosina <jikos@kernel.org>,
|
||
|
|
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
|
||
|
|
John Chen <johnchen902@gmail.com>
|
||
|
|
Subject: [PATCH 2/4] HID: magicmouse: fix 3 button emulation of Mouse 2
|
||
|
|
Date: Sat, 27 Mar 2021 21:05:06 +0800
|
||
|
|
Message-Id: <20210327130508.24849-3-johnchen902@gmail.com>
|
||
|
|
X-Mailer: git-send-email 2.31.0
|
||
|
|
In-Reply-To: <20210327130508.24849-1-johnchen902@gmail.com>
|
||
|
|
References: <20210327130508.24849-1-johnchen902@gmail.com>
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
Precedence: bulk
|
||
|
|
List-ID: <linux-kernel.vger.kernel.org>
|
||
|
|
X-Mailing-List: linux-kernel@vger.kernel.org
|
||
|
|
Archived-At: <https://lore.kernel.org/lkml/20210327130508.24849-3-johnchen902@gmail.com/>
|
||
|
|
List-Archive: <https://lore.kernel.org/lkml/>
|
||
|
|
List-Post: <mailto:linux-kernel@vger.kernel.org>
|
||
|
|
|
||
|
|
It is observed that, with 3 button emulation, when middle button is
|
||
|
|
clicked, either the left button or right button is clicked as well. It
|
||
|
|
is caused by hidinput "correctly" acting on the event, oblivious to the
|
||
|
|
3 button emulation.
|
||
|
|
|
||
|
|
As raw_event has taken care of everything, no further processing is
|
||
|
|
needed. However, the only way to stop at raw_event is to return an error
|
||
|
|
(negative) value. Therefore, the processing is stopped at event instead.
|
||
|
|
|
||
|
|
Signed-off-by: John Chen <johnchen902@gmail.com>
|
||
|
|
---
|
||
|
|
drivers/hid/hid-magicmouse.c | 16 ++++++++++++++++
|
||
|
|
1 file changed, 16 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
|
||
|
|
index 7aad6ca56780..c646b4cd3783 100644
|
||
|
|
--- a/drivers/hid/hid-magicmouse.c
|
||
|
|
+++ b/drivers/hid/hid-magicmouse.c
|
||
|
|
@@ -440,6 +440,21 @@ static int magicmouse_raw_event(struct hid_device *hdev,
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static int magicmouse_event(struct hid_device *hdev, struct hid_field *field,
|
||
|
|
+ struct hid_usage *usage, __s32 value)
|
||
|
|
+{
|
||
|
|
+ struct magicmouse_sc *msc = hid_get_drvdata(hdev);
|
||
|
|
+ if (msc->input->id.product == USB_DEVICE_ID_APPLE_MAGICMOUSE2 &&
|
||
|
|
+ field->report->id == MOUSE2_REPORT_ID) {
|
||
|
|
+ // magic_mouse_raw_event has done all the work. Skip hidinput.
|
||
|
|
+ //
|
||
|
|
+ // Specifically, hidinput may modify BTN_LEFT and BTN_RIGHT,
|
||
|
|
+ // breaking emulate_3button.
|
||
|
|
+ return 1;
|
||
|
|
+ }
|
||
|
|
+ return 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hdev)
|
||
|
|
{
|
||
|
|
int error;
|
||
|
|
@@ -754,6 +769,7 @@ static struct hid_driver magicmouse_driver = {
|
||
|
|
.id_table = magic_mice,
|
||
|
|
.probe = magicmouse_probe,
|
||
|
|
.raw_event = magicmouse_raw_event,
|
||
|
|
+ .event = magicmouse_event,
|
||
|
|
.input_mapping = magicmouse_input_mapping,
|
||
|
|
.input_configured = magicmouse_input_configured,
|
||
|
|
};
|
||
|
|
--
|
||
|
|
2.31.0
|
||
|
|
|
||
|
|
|