From patchwork Wed Jan 25 20:08:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Armstrong Skomra X-Patchwork-Id: 9537859 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 DDD126042B for ; Wed, 25 Jan 2017 20:09:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CFF8027D4D for ; Wed, 25 Jan 2017 20:09:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C507527F99; Wed, 25 Jan 2017 20:09:25 +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.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 7D25827D4D for ; Wed, 25 Jan 2017 20:09:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751790AbdAYUJY (ORCPT ); Wed, 25 Jan 2017 15:09:24 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35159 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751708AbdAYUJY (ORCPT ); Wed, 25 Jan 2017 15:09:24 -0500 Received: by mail-pf0-f196.google.com with SMTP id f144so15004502pfa.2 for ; Wed, 25 Jan 2017 12:09:24 -0800 (PST) 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=ZMqKBLTvKcjhU24xI0Plgal5mhK5Xn46XahVbWsmjA0=; b=QZMRuwcOMhNQPt76HM1lR+dT2ijyR/JoPTC/xjEJqX3KmFynAmnK05J5kIgzwbm23J QTsOmSwEnwKMIX6r1uec6JiuYYfOCA2m+BvPcMbKI/yqT2myVtbwACXlJ9/JyUKWQ0Ui EC5Q+5c1vH2zY58iz/nkhFcIt5QupdDb682m9eZBQMGXKzGu0e4gN89W6lnNc2yYpCWF AcOBaPHhB5Ramr7bOZ2+8EarFEgE5gkKf1hWXSsmAxpTnMGV8sO0mKbHFGfQkkJ/orWE T1LSQ5uU26tu3jD5fiGyviiruZgFCMwPUW9MLgBHPAuACdovc+RpNO50i3QwjWRqYbUP d5/g== 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=ZMqKBLTvKcjhU24xI0Plgal5mhK5Xn46XahVbWsmjA0=; b=YxmWW6bM6SJZ+0zRkSi/h/IyzhMTaqBh5km/ApJ5ydg2P2RhVctGiIgL4xxm9rd0WT JrDXTwvABmPXSc65VBCKU/CyM6HJp1SRCG0Az61CulxPGz30sb1ughiQYmSgX5tO6WHz JBsWtLk22NSjHxZXSKkzMweDGdRKSltnx7QcGkx8vswsOg+iCXry5ZyH4XfxnXiKa/MJ sVXlv22fDQ9ivmwopXl/qsPoZ13Y47hluCy7WRuMC1pBHZ+yr3yXmsNVnc+xMDz4dgxD WtBL2Y69BzM4AhCh3sDoeaaeP1EawsH3DST9nrcP/XCnNSRHJywCgM/Cqi0LRaBvnYs6 FWCg== X-Gm-Message-State: AIkVDXLFDr4d1e0OIHE5xViCzUHNNvoYqGQrt+Q+cT7RhnS/MtI3hmOEx+nRzBiNQTrhxw== X-Received: by 10.84.232.133 with SMTP id i5mr6136199plk.79.1485374963713; Wed, 25 Jan 2017 12:09:23 -0800 (PST) Received: from localhost.localdomain (71-36-102-37.ptld.qwest.net. [71.36.102.37]) by smtp.googlemail.com with ESMTPSA id g64sm3066106pfc.57.2017.01.25.12.09.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Jan 2017 12:09:23 -0800 (PST) From: Aaron Armstrong Skomra To: linux-input@vger.kernel.org, jkosina@suse.cz, benjamin.tissoires@redhat.com, pinglinux@gmail.com, killertofu@gmail.com Cc: Jason Gerecke Subject: [PATCH 2/8] HID: wacom: Move WAC_CMD_* into wacom_wac.h Date: Wed, 25 Jan 2017 12:08:36 -0800 Message-Id: <1485374922-3417-3-git-send-email-skomra@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485374922-3417-1-git-send-email-skomra@gmail.com> References: <1485374922-3417-1-git-send-email-skomra@gmail.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: Jason Gerecke Centralize our definition of report IDs by moving those for device commands into wacom_wac.h alongside those for input reports. Signed-off-by: Jason Gerecke --- drivers/hid/wacom_sys.c | 8 -------- drivers/hid/wacom_wac.h | 9 +++++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index e1aa51a..4dd7b80 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -16,15 +16,7 @@ #include #define WAC_MSG_RETRIES 5 - -#define WAC_CMD_WL_LED_CONTROL 0x03 -#define WAC_CMD_LED_CONTROL 0x20 -#define WAC_CMD_ICON_START 0x21 -#define WAC_CMD_ICON_XFER 0x23 -#define WAC_CMD_ICON_BT_XFER 0x26 #define WAC_CMD_RETRIES 10 -#define WAC_CMD_DELETE_PAIRING 0x20 -#define WAC_CMD_UNPAIR_ALL 0xFF #define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP) #define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP) diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index fb0e50a..804fda3 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h @@ -72,6 +72,15 @@ #define WACOM_REPORT_REMOTE 17 #define WACOM_REPORT_INTUOSHT2_ID 8 +/* wacom command report ids */ +#define WAC_CMD_WL_LED_CONTROL 0x03 +#define WAC_CMD_LED_CONTROL 0x20 +#define WAC_CMD_ICON_START 0x21 +#define WAC_CMD_ICON_XFER 0x23 +#define WAC_CMD_ICON_BT_XFER 0x26 +#define WAC_CMD_DELETE_PAIRING 0x20 +#define WAC_CMD_UNPAIR_ALL 0xFF + /* device quirks */ #define WACOM_QUIRK_BBTOUCH_LOWRES 0x0001 #define WACOM_QUIRK_SENSE 0x0002