From patchwork Fri Oct 6 02:53:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masaki Ota <012nexus@gmail.com> X-Patchwork-Id: 9988313 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 76AE560216 for ; Fri, 6 Oct 2017 02:54:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63F2528C9D for ; Fri, 6 Oct 2017 02:54:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 588F528CCA; Fri, 6 Oct 2017 02:54:48 +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=-5.5 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,FROM_STARTS_WITH_NUMS,RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 DF56B28C9D for ; Fri, 6 Oct 2017 02:54:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751797AbdJFCxg (ORCPT ); Thu, 5 Oct 2017 22:53:36 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34002 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751782AbdJFCxe (ORCPT ); Thu, 5 Oct 2017 22:53:34 -0400 Received: by mail-pf0-f194.google.com with SMTP id g65so15767339pfe.1; Thu, 05 Oct 2017 19:53:34 -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; bh=KHfno1sUpBhzTRmrX1vmSeWo5AIqD39yn25myL3AA+Q=; b=aVv8eCuOkC8uYlS9u9CvrBXeIqJ92seWCbPCCpWCIzWLW81AK3qwjKzpO5DdoUGMk/ rWVo40iYb1jzH+d81t/I2fJhdcz6XJyymutWCaMkkhhqgx9a6srJVHOnJXMEe2FX24ZP 5lzKB3U/dJXS88hePvC3h8CZJIYg4WGi6itAZ2gymYAIJSKhattOHllWZ7TVBKCfyBB8 CO4Bca/IU0/JjLX2rJt42fgpVwLFZLorJDO6H0xdfghTMJGux4MTByfCt444TPQvi+8B OidfACn1BKHB7+QQLftOjQnRFpjlZ9lmZ8RQT2awgbatTactnY2I0N1lcDVmhC1vEbbx j1mA== 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; bh=KHfno1sUpBhzTRmrX1vmSeWo5AIqD39yn25myL3AA+Q=; b=HdWQvYap1IBsUmm5IKbJJWuJVNEw7LOVmNdagfrEWO28vHdLLI812EPbQOBvUw5cnh wYKEYEtg7av9wXQVSF48pDasm23oY9d+UKAw9OxxaS7f5wNfXDDx25NEzt4MtsUbesK2 oMSFpgecdW4OO+6g/20ZYxS1gADF+C4mTL29vCtxGoxWoTz9GVEmzShbTsGXi2y6x8D4 4BdWXiygKpuxiuAWfH0wxtVkyJubSn/7m9SaHkbX0G4jaqywMbT3jwwgC191ceC19NHs B1QGSoItdfd1B0NZqXLLZctcj9EkN3xinCEm3qq+49DsZY7oeyt65+6xllD1FhsHMa1I CpCg== X-Gm-Message-State: AMCzsaVWW42niclnS36PR2KRyM/fFIVMpvuRkZ4hYBR8YpXLNNVBNe2n 6Igk+AFxeHAams/ybyI/hOA= X-Google-Smtp-Source: AOwi7QDXLq5fqyDmFNhzHOPiLHq64VG1tApAUZsDcEQcHwR0/VFfeFX6KP8qiCkFi5ERs5liPFA3AA== X-Received: by 10.84.195.1 with SMTP id i1mr640161pld.70.1507258413650; Thu, 05 Oct 2017 19:53:33 -0700 (PDT) Received: from localhost (p2218-ipad303aobadori.miyagi.ocn.ne.jp. [123.216.73.218]) by smtp.gmail.com with ESMTPSA id o10sm430655pgq.69.2017.10.05.19.53.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Oct 2017 19:53:33 -0700 (PDT) From: Masaki Ota <012nexus@gmail.com> X-Google-Original-From: Masaki Ota To: jikos@kernel.org, benjamin.tissoires@redhat.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, masaki.ota@jp.alps.com Subject: [PATCH 3/7] Add some variables Date: Fri, 6 Oct 2017 11:53:15 +0900 Message-Id: <20171006025319.2505-4-masaki.ota@jp.alps.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171006025319.2505-1-masaki.ota@jp.alps.com> References: <20171006025319.2505-1-masaki.ota@jp.alps.com> 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 From: Masaki Ota -Create x_min, y_min and max_fingers variables for set correct XY minimum value and the number of max finger on each devices. -Move the Button pad checking code to U1 init function, because this checking code is for U1 device. Signed-off-by: Masaki Ota --- drivers/hid/hid-alps.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index c4ea5c6c9be9..201fe175cba3 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c @@ -73,9 +73,12 @@ * @y_active_len_mm: active area length of Y (mm) * @x_max: maximum x coordinate value * @y_max: maximum y coordinate value + * @x_min: minimum x coordinate value + * @y_min: minimum y coordinate value * @btn_cnt: number of buttons * @sp_btn_cnt: number of stick buttons * @has_sp: boolean of sp existense + * @max_fingers: total number of fingers */ struct u1_dev { struct input_dev *input; @@ -95,9 +98,12 @@ struct u1_dev { u32 y_active_len_mm; u32 x_max; u32 y_max; + u32 x_min; + u32 y_min; u32 btn_cnt; u32 sp_btn_cnt; u8 has_sp; + u8 max_fingers; }; static int u1_read_write_register(struct hid_device *hdev, u32 address, @@ -319,8 +325,10 @@ static int u1_init(struct hid_device *hdev, struct u1_dev *pri_data) pri_data->x_max = (pri_data->resolution << 2) * (pri_data->sen_line_num_x - 1); + pri_data->x_min = 1; pri_data->y_max = (pri_data->resolution << 2) * (pri_data->sen_line_num_y - 1); + pri_data->y_min = 1; ret = u1_read_write_register(hdev, ADDRESS_U1_PAD_BTN, &pri_data->btn_info, 0, true); @@ -328,6 +336,12 @@ static int u1_init(struct hid_device *hdev, struct u1_dev *pri_data) dev_err(&hdev->dev, "failed U1_PAD_BTN (%d)\n", ret); goto exit; } + if ((pri_data->btn_info & 0x0F) == (pri_data->btn_info & 0xF0) >> 4) { + pri_data->btn_cnt = (pri_data->btn_info & 0x0F); + } else { + /* Button pad */ + pri_data->btn_cnt = 1; + } pri_data->has_sp = 0; /* Check StickPointer device */ @@ -355,7 +369,7 @@ static int u1_init(struct hid_device *hdev, struct u1_dev *pri_data) } pri_data->has_sp = 1; } - + pri_data->max_fingers = 5; exit: return ret; } @@ -383,8 +397,10 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) goto exit; __set_bit(EV_ABS, input->evbit); - input_set_abs_params(input, ABS_MT_POSITION_X, 1, data->x_max, 0, 0); - input_set_abs_params(input, ABS_MT_POSITION_Y, 1, data->y_max, 0, 0); + input_set_abs_params(input, ABS_MT_POSITION_X, + data->x_min, data->x_max, 0, 0); + input_set_abs_params(input, ABS_MT_POSITION_Y, + data->y_min, data->y_max, 0, 0); if (data->x_active_len_mm && data->y_active_len_mm) { res_x = (data->x_max - 1) / data->x_active_len_mm; @@ -396,26 +412,21 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) input_set_abs_params(input, ABS_MT_PRESSURE, 0, 64, 0, 0); - input_mt_init_slots(input, MAX_TOUCHES, INPUT_MT_POINTER); + input_mt_init_slots(input, data->max_fingers, INPUT_MT_POINTER); __set_bit(EV_KEY, input->evbit); - if ((data->btn_info & 0x0F) == (data->btn_info & 0xF0) >> 4) { - data->btn_cnt = (data->btn_info & 0x0F); - } else { - /* Button pad */ - data->btn_cnt = 1; + + if (data->btn_cnt == 1) __set_bit(INPUT_PROP_BUTTONPAD, input->propbit); - } for (i = 0; i < data->btn_cnt; i++) __set_bit(BTN_LEFT + i, input->keybit); - /* Stick device initialization */ if (data->has_sp) { input2 = input_allocate_device(); if (!input2) { - ret = -ENOMEM; + input_free_device(input2); goto exit; } @@ -439,8 +450,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi) __set_bit(INPUT_PROP_POINTER, input2->propbit); __set_bit(INPUT_PROP_POINTING_STICK, input2->propbit); - ret = input_register_device(data->input2); - if (ret) { + if (input_register_device(data->input2)) { input_free_device(input2); goto exit; }