From patchwork Tue May 27 23:17:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 4251911 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9C442BF90B for ; Tue, 27 May 2014 23:17:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C826C20173 for ; Tue, 27 May 2014 23:17:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A959820155 for ; Tue, 27 May 2014 23:17:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752068AbaE0XRe (ORCPT ); Tue, 27 May 2014 19:17:34 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34555 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751922AbaE0XRe (ORCPT ); Tue, 27 May 2014 19:17:34 -0400 Received: by mail-pa0-f54.google.com with SMTP id bj1so9901461pad.41 for ; Tue, 27 May 2014 16:17:33 -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; bh=2gWlSoCjjZkB9MiklJpwYM6YRD/HPuy2YADIqkPOp3w=; b=ehL5J2lcfxafMRMwUH8stJZeiUMxTY8vxGLIxcOmRx+OeUlzLG5sfgX3EEEnUBLAWc bP+/4F2sVO5Kvdjk3FMT14JIe72O5vv1rLUqMdpLAGY/z+7r0kPgTyUbO9YgKCuEhdOM AWWTNLwUHAp1ULYqyl8VQn4L+zgzd6sO6E01swTM2Gx6K7GZZheFjgwHY/So7Js9Gufe PLbIxJCfhxyr/tKYt5MbyLYl+Uw+HvmL24dMMhdhnrenEiI/2T65cXQWBbG1nJDisW82 RSt/qZi6S+5SLPZ/dmM3CvapdPxo5FSI5tbTWewUR5arIloa+S0dj0VXe0ztxnyU/Us6 2WTw== X-Received: by 10.68.221.42 with SMTP id qb10mr41229377pbc.65.1401232653763; Tue, 27 May 2014 16:17:33 -0700 (PDT) Received: from wacom-XPS-8500.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPSA id ue3sm20566640pbc.49.2014.05.27.16.17.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 May 2014 16:17:32 -0700 (PDT) From: Ping Cheng X-Google-Original-From: Ping Cheng To: linux-input@vger.kernel.org Cc: dmitry.torokhov@gmail.com, Ping Cheng Subject: [PATCH 1/3] Input: wacom - set stylus_in_proximity when pen is in range Date: Tue, 27 May 2014 16:17:44 -0700 Message-Id: <1401232664-9699-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.9.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ping Cheng Reviewed-by: Jason Gerecke Tested-by: Jason Gerecke --- drivers/input/tablet/wacom_wac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index 24c0733..c98e51c 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -484,6 +484,8 @@ static int wacom_intuos_inout(struct wacom_wac *wacom) input_report_key(input, BTN_TOUCH, 0); input_report_abs(input, ABS_PRESSURE, 0); input_report_abs(input, ABS_DISTANCE, wacom->features.distance_max); + if (features->quirks & WACOM_QUIRK_MULTI_INPUT) + wacom->shared->stylus_in_proximity = true; } /* Exit report */