All of lore.kernel.org
 help / color / mirror / Atom feed
From: Aaron Armstrong Skomra <skomra@gmail.com>
To: linux-input@vger.kernel.org, jkosina@suse.cz,
	benjamin.tissoires@redhat.com, pinglinux@gmail.com,
	killertofu@gmail.com
Cc: Jason Gerecke <jason.gerecke@wacom.com>
Subject: [PATCH 2/8] HID: wacom: Move WAC_CMD_* into wacom_wac.h
Date: Wed, 25 Jan 2017 12:08:36 -0800	[thread overview]
Message-ID: <1485374922-3417-3-git-send-email-skomra@gmail.com> (raw)
In-Reply-To: <1485374922-3417-1-git-send-email-skomra@gmail.com>

From: Jason Gerecke <killertofu@gmail.com>

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 <jason.gerecke@wacom.com>
---
 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 <linux/input/mt.h>
 
 #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
-- 
2.7.4


  parent reply	other threads:[~2017-01-25 20:09 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-25 20:08 [PATCH 0/8] HID: wacom: Support second generation Intuos Pro Aaron Armstrong Skomra
2017-01-25 20:08 ` [PATCH 1/8] HID: wacom: Enable HID_GENERIC codepath for Bluetooth devices Aaron Armstrong Skomra
2017-01-25 20:08 ` Aaron Armstrong Skomra [this message]
2017-01-25 20:08 ` [PATCH 3/8] HID: wacom: Support 2nd-gen Intuos Pro's Bluetooth classic interface Aaron Armstrong Skomra
2017-01-25 20:08 ` [PATCH 4/8] HID: wacom: generic: remove input_event_flag Aaron Armstrong Skomra
2017-01-25 20:08 ` [PATCH 5/8] HID: wacom: generic: add support for touchring Aaron Armstrong Skomra
2017-01-25 20:08 ` [PATCH 6/8] HID: wacom: generic: add vendor defined touch Aaron Armstrong Skomra
2017-01-25 20:08 ` [PATCH 7/8] HID: wacom: generic: support generic touch switch Aaron Armstrong Skomra
2017-01-25 20:08 ` [PATCH 8/8] HID: wacom: generic: support LEDs Aaron Armstrong Skomra
2017-01-26 20:39 ` [PATCH 0/8] HID: wacom: Support second generation Intuos Pro Ping Cheng
2017-01-26 20:48 ` Jiri Kosina

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1485374922-3417-3-git-send-email-skomra@gmail.com \
    --to=skomra@gmail.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=jason.gerecke@wacom.com \
    --cc=jkosina@suse.cz \
    --cc=killertofu@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=pinglinux@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.