"INTUOSREAD" and "INTUOSWRITE" are poorly named. These are report IDs
for pen ID (proximity) packets. It should be noted that the latter is
only used on Intuos/Intuos2 for a second stylus when DualTrack is in use.
NOTE: This patch was backported earlier, but only as far back as 2.6.38.
To make backporting the next few patches easier, we complete this backport
all the way to 2.6.30.
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
Signed-off-by: Jiri Kosina <jkos...@suse.cz>
[jason.gere...@wacom.com: Imported into input-wacom repository (0610999)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: backported from input-wacom a56ed5b]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
[jason.gere...@wacom.com: backported from input-wacom (35dc103)]
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
2.6.30/wacom_wac.c | 4 ++--
2.6.30/wacom_wac.h | 4 ++--
2.6.36/wacom_wac.c | 8 ++++----
2.6.36/wacom_wac.h | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/2.6.30/wacom_wac.c b/2.6.30/wacom_wac.c
index 9b34ffc..fac17f3 100644
--- a/2.6.30/wacom_wac.c
+++ b/2.6.30/wacom_wac.c
@@ -1021,8 +1021,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
unsigned char *data = wacom->data;
int result;
- if (data[0] != WACOM_REPORT_PENABLED && data[0] !=
WACOM_REPORT_INTUOSREAD
- && data[0] != WACOM_REPORT_INTUOSWRITE && data[0] !=
WACOM_REPORT_INTUOSPAD
+ if (data[0] != WACOM_REPORT_PENABLED && data[0] !=
WACOM_REPORT_INTUOS_ID1
+ && data[0] != WACOM_REPORT_INTUOS_ID2 && data[0] !=
WACOM_REPORT_INTUOSPAD
&& data[0] != WACOM_REPORT_INTUOS_PEN
&& data[0] != WACOM_REPORT_CINTIQ && data[0] !=
WACOM_REPORT_CINTIQPAD
&& data[0] != WACOM_REPORT_INTUOS5PAD) {
diff --git a/2.6.30/wacom_wac.h b/2.6.30/wacom_wac.h
index 865a96d..7082f59 100755
--- a/2.6.30/wacom_wac.h
+++ b/2.6.30/wacom_wac.h
@@ -41,8 +41,8 @@
/* wacom data packet report IDs */
#define WACOM_REPORT_PENABLED 2
-#define WACOM_REPORT_INTUOSREAD 5
-#define WACOM_REPORT_INTUOSWRITE 6
+#define WACOM_REPORT_INTUOS_ID1 5
+#define WACOM_REPORT_INTUOS_ID2 6
#define WACOM_REPORT_INTUOSPAD 12
#define WACOM_REPORT_INTUOS5PAD 3
#define WACOM_REPORT_DTUSPAD 21
diff --git a/2.6.36/wacom_wac.c b/2.6.36/wacom_wac.c
index 0b52023..9167b22 100644
--- a/2.6.36/wacom_wac.c
+++ b/2.6.36/wacom_wac.c
@@ -682,8 +682,8 @@ static int wacom_intuos_general(struct wacom_wac *wacom)
(features->type == CINTIQ && !(data[1] & 0x40)))
return 1;
- if (data[0] != WACOM_REPORT_PENABLED && data[0] !=
WACOM_REPORT_INTUOSREAD &&
- data[0] != WACOM_REPORT_INTUOSWRITE)
+ if (data[0] != WACOM_REPORT_PENABLED && data[0] !=
WACOM_REPORT_INTUOS_ID1 &&
+ data[0] != WACOM_REPORT_INTUOS_ID2)
return 0;
x = (be16_to_cpup((__be16 *)&data[2]) << 1) | ((data[9] >> 1) & 1);
@@ -816,8 +816,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom)
unsigned char *data = wacom->data;
int result;
- if (data[0] != WACOM_REPORT_PENABLED && data[0] !=
WACOM_REPORT_INTUOSREAD
- && data[0] != WACOM_REPORT_INTUOSWRITE && data[0] !=
WACOM_REPORT_INTUOSPAD
+ if (data[0] != WACOM_REPORT_PENABLED && data[0] !=
WACOM_REPORT_INTUOS_ID1
+ && data[0] != WACOM_REPORT_INTUOS_ID2 && data[0] !=
WACOM_REPORT_INTUOSPAD
&& data[0] != WACOM_REPORT_INTUOS5PAD) {
dbg("wacom_intuos_irq: received unknown report #%d", data[0]);
return 0;
diff --git a/2.6.36/wacom_wac.h b/2.6.36/wacom_wac.h
index 8dc8564..3f47410 100644
--- a/2.6.36/wacom_wac.h
+++ b/2.6.36/wacom_wac.h
@@ -36,8 +36,8 @@
/* wacom data packet report IDs */
#define WACOM_REPORT_PENABLED 2
-#define WACOM_REPORT_INTUOSREAD 5
-#define WACOM_REPORT_INTUOSWRITE 6
+#define WACOM_REPORT_INTUOS_ID1 5
+#define WACOM_REPORT_INTUOS_ID2 6
#define WACOM_REPORT_INTUOSPAD 12
#define WACOM_REPORT_INTUOS5PAD 3
#define WACOM_REPORT_DTUSPAD 21
--
2.10.2
------------------------------------------------------------------------------
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
