From patchwork Mon Jun 6 11:23:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Pali_Roh=C3=A1r?= X-Patchwork-Id: 9157891 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 1DE2760759 for ; Mon, 6 Jun 2016 11:25:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0F8F3267EC for ; Mon, 6 Jun 2016 11:25:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0482126E5D; Mon, 6 Jun 2016 11:25:22 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 ADCA3267EC for ; Mon, 6 Jun 2016 11:25:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbcFFLYc (ORCPT ); Mon, 6 Jun 2016 07:24:32 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35938 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751808AbcFFLYa (ORCPT ); Mon, 6 Jun 2016 07:24:30 -0400 Received: by mail-wm0-f68.google.com with SMTP id m124so14565505wme.3; Mon, 06 Jun 2016 04:24:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VMJ/TKArjXfK2yT/bfcW6qbG0E4p9v5OWZNwDZ72gBI=; b=R2TFkOADio2NuMevZbwMCgTc6a3GQBRv9UcwvlwZmRhkanEtVtOILiDyzvWvsoTb3w JovZo1fpr281fcc7JDA1876VT0DQGd9yARjzIv3rZZGIJ8X93CQG4iBULlpy4VixuDUS 5mUop4jsbZkFNvv0XcMMhO0WrL7QR/9N7OF198pjQsfeFiKoGNmiCE2gmJH+PqvP8hBQ UQ/dtYga8ZenmmmWY4xx5xICATZqNJAQa5Fs9+wIWOHxuf5LaJxuheX8gR284B6lcs0e gKSKIj77VCvPw/9Cjy9F/yJ2KO8CK9YvPwjlNcShMhhZTDHYShAcdINCyT0dKw9SVuWR Q2ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VMJ/TKArjXfK2yT/bfcW6qbG0E4p9v5OWZNwDZ72gBI=; b=EqE1N/SKIKJkgaTa2wqo8SWlydUffGVqaszwzYElhcWRXLxddMzBDFyCVnA6s/wMpz eV1k1Qs0EC1uLJel5IN9KJ7ts01M+otkGlLn6cE7JBejNb6Eo15cEN2QEZH3mRe3CHS1 alfXdmZVNQ054vE7XtYs/19ItlqkJpZpnc8m/Hti3hd0ouTVDaSmfu4y68+2Dm5ZT/8g PRVL3poPdBpgNbESTekqAX5zycQ5ExD7sgM/e4YiAH7zphKY6rqbI7phP8vAKibkN1bx pF9Nvu3oKRigal7GNlScSYy+Btmr5/2VUC7kfO5bQc/k4XiUPFVNk82jC6QiKZg23r0Q h3hA== X-Gm-Message-State: ALyK8tK3S1ifEMpl2QFWYileaDtFO9e1/OsLN0SFfNNI8km0E2dSMjsVRl60X4wG4S5wtQ== X-Received: by 10.28.61.137 with SMTP id k131mr11020797wma.37.1465212269327; Mon, 06 Jun 2016 04:24:29 -0700 (PDT) Received: from Pali-Latitude.lan (pali.kolej.mff.cuni.cz. [78.128.193.202]) by smtp.gmail.com with ESMTPSA id c191sm13765776wmh.5.2016.06.06.04.24.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 04:24:28 -0700 (PDT) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Dmitry Torokhov , Hans de Goede , Ben Gamari Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Pali=20Roh=C3=A1r?= Subject: [PATCH 3/5] Input: alps - move ALPS_PROTO_V1 out of alps_model_data table Date: Mon, 6 Jun 2016 13:23:59 +0200 Message-Id: <1465212241-14702-4-git-send-email-pali.rohar@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1465212241-14702-1-git-send-email-pali.rohar@gmail.com> References: <1465212241-14702-1-git-send-email-pali.rohar@gmail.com> 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 Like for other protocols create alps_v1_protocol_data and use it in alps_identify() function. Signed-off-by: Pali Rohár --- drivers/input/mouse/alps.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 087fbe5..4e6d76e 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c @@ -106,7 +106,6 @@ static const struct alps_nibble_commands alps_v6_nibble_commands[] = { static const struct alps_model_info alps_model_data[] = { { { 0x32, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, ALPS_PASS | ALPS_DUALPOINT } }, /* Toshiba Salellite Pro M10 */ - { { 0x33, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V1, 0x88, 0xf8, 0 } }, /* UMAX-530T */ { { 0x53, 0x02, 0x0a }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } }, { { 0x53, 0x02, 0x14 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } }, { { 0x60, 0x03, 0xc8 }, 0x00, { ALPS_PROTO_V2, 0xf8, 0xf8, 0 } }, /* HP ze1115 */ @@ -138,6 +137,10 @@ static const struct alps_model_info alps_model_data[] = { ALPS_PASS | ALPS_DUALPOINT | ALPS_PS2_INTERLEAVED } }, /* Toshiba Tecra A11-11L */ }; +static const struct alps_protocol_info alps_v1_protocol_data = { + ALPS_PROTO_V1, 0x88, 0xf8, 0 +}; + static const struct alps_protocol_info alps_v3_protocol_data = { ALPS_PROTO_V3, 0x8f, 0x8f, ALPS_DUALPOINT }; @@ -2759,7 +2762,9 @@ static int alps_identify(struct psmouse *psmouse, struct alps_data *priv) protocol = alps_match_table(e7, ec); if (!protocol) { - if (e7[0] == 0x73 && e7[1] == 0x02 && e7[2] == 0x64 && + if (e7[0] == 0x33 && e7[1] == 0x02 && e7[2] == 0x0a) { + protocol = &alps_v1_protocol_data; + } else if (e7[0] == 0x73 && e7[1] == 0x02 && e7[2] == 0x64 && ec[2] == 0x8a) { protocol = &alps_v4_protocol_data; } else if (e7[0] == 0x73 && e7[1] == 0x03 && e7[2] == 0x50 &&