FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-17 06:52:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Input: wacom - add defines for data packet report IDs

Browse Source 
Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Ping Cheng 2009-12-15 00:35:25 -08:00 committed by Dmitry Torokhov
parent ec67bbedcf
commit cad7470084
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/input/tablet/wacom_wac.c
View File

@ -58,7 +58,7 @@ static int wacom_pl_irq(struct wacom_wac *wacom, void *wcombo)
unsigned char *data = wacom->data; unsigned char *data = wacom->data;
int prox, pressure; int prox, pressure;
if (data[0] != 2) { if (data[0] != WACOM_REPORT_PENABLED) {
dbg("wacom_pl_irq: received unknown report #%d", data[0]); dbg("wacom_pl_irq: received unknown report #%d", data[0]);
return 0; return 0;
} }
@ -127,7 +127,7 @@ static int wacom_ptu_irq(struct wacom_wac *wacom, void *wcombo)
{ {
unsigned char *data = wacom->data; unsigned char *data = wacom->data;
if (data[0] != 2) { if (data[0] != WACOM_REPORT_PENABLED) {
printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]); printk(KERN_INFO "wacom_ptu_irq: received unknown report #%d\n", data[0]);
return 0; return 0;
} }
@ -155,7 +155,7 @@ static int wacom_graphire_irq(struct wacom_wac *wacom, void *wcombo)
unsigned char *data = wacom->data; unsigned char *data = wacom->data;
int x, y, rw; int x, y, rw;
if (data[0] != 2) { if (data[0] != WACOM_REPORT_PENABLED) {
dbg("wacom_graphire_irq: received unknown report #%d", data[0]); dbg("wacom_graphire_irq: received unknown report #%d", data[0]);
return 0; return 0;
} }
@ -431,7 +431,8 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
unsigned int t; unsigned int t;
int idx = 0, result; int idx = 0, result;
if (data[0] != 2 && data[0] != 5 && data[0] != 6 && data[0] != 12) { if (data[0] != WACOM_REPORT_PENABLED && data[0] != WACOM_REPORT_INTUOSREAD
&& data[0] != WACOM_REPORT_INTUOSWRITE && data[0] != WACOM_REPORT_INTUOSPAD) {
dbg("wacom_intuos_irq: received unknown report #%d", data[0]); dbg("wacom_intuos_irq: received unknown report #%d", data[0]);
return 0; return 0;
} }
@ -441,7 +442,7 @@ static int wacom_intuos_irq(struct wacom_wac *wacom, void *wcombo)
idx = data[1] & 0x01; idx = data[1] & 0x01;
/* pad packets. Works as a second tool and is always in prox */ /* pad packets. Works as a second tool and is always in prox */
if (data[0] == 12) { if (data[0] == WACOM_REPORT_INTUOSPAD) {
/* initiate the pad as a device */ /* initiate the pad as a device */
if (wacom->tool[1] != BTN_TOOL_FINGER) if (wacom->tool[1] != BTN_TOOL_FINGER)
wacom->tool[1] = BTN_TOOL_FINGER; wacom->tool[1] = BTN_TOOL_FINGER;
@ -648,7 +649,7 @@ static void wacom_tpc_touch_in(struct wacom_wac *wacom, void *wcombo)
if (urb->actual_length != WACOM_PKGLEN_TPC1FG) { if (urb->actual_length != WACOM_PKGLEN_TPC1FG) {
switch (data[0]) { switch (data[0]) {
case 6: case WACOM_REPORT_TPC1FG:
wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2])); wacom_report_abs(wcombo, ABS_X, wacom_le16_to_cpu(&data[2]));
wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4])); wacom_report_abs(wcombo, ABS_Y, wacom_le16_to_cpu(&data[4]));
wacom_report_abs(wcombo, ABS_PRESSURE, wacom_le16_to_cpu(&data[6])); wacom_report_abs(wcombo, ABS_PRESSURE, wacom_le16_to_cpu(&data[6]));
@ -656,7 +657,7 @@ static void wacom_tpc_touch_in(struct wacom_wac *wacom, void *wcombo)
wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]); wacom_report_abs(wcombo, ABS_MISC, wacom->id[0]);
wacom_report_key(wcombo, wacom->tool[0], 1); wacom_report_key(wcombo, wacom->tool[0], 1);
break; break;
case 13: case WACOM_REPORT_TPC2FG:
/* keep this byte to send proper out-prox event */ /* keep this byte to send proper out-prox event */
wacom->id[1] = data[1] & 0x03; wacom->id[1] = data[1] & 0x03;
@ -705,13 +706,13 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
dbg("wacom_tpc_irq: received report #%d", data[0]); dbg("wacom_tpc_irq: received report #%d", data[0]);
if (urb->actual_length == WACOM_PKGLEN_TPC1FG || if (urb->actual_length == WACOM_PKGLEN_TPC1FG || /* single touch */
data[0] == 6 || /* single touch */ data[0] == WACOM_REPORT_TPC1FG || /* single touch */
data[0] == 13) { /* 2FG touch */ data[0] == WACOM_REPORT_TPC2FG) { /* 2FG touch */
if (urb->actual_length == WACOM_PKGLEN_TPC1FG) { /* with touch */ if (urb->actual_length == WACOM_PKGLEN_TPC1FG) { /* with touch */
prox = data[0] & 0x01; prox = data[0] & 0x01;
} else { /* with capacity */ } else { /* with capacity */
if (data[0] == 6) if (data[0] == WACOM_REPORT_TPC1FG)
/* single touch */ /* single touch */
prox = data[1] & 0x01; prox = data[1] & 0x01;
else else
@ -728,7 +729,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
} }
} else { } else {
/* 2FGT out-prox */ /* 2FGT out-prox */
if ((data[0] & 0xff) == 13) { if (data[0] == WACOM_REPORT_TPC2FG) {
idx = (wacom->id[1] & 0x01) - 1; idx = (wacom->id[1] & 0x01) - 1;
if (idx == 0) { if (idx == 0) {
wacom_tpc_touch_out(wacom, wcombo, idx); wacom_tpc_touch_out(wacom, wcombo, idx);
@ -751,7 +752,7 @@ static int wacom_tpc_irq(struct wacom_wac *wacom, void *wcombo)
touchInProx = 1; touchInProx = 1;
return 1; return 1;
} }
} else if (data[0] == 2) { /* Penabled */ } else if (data[0] == WACOM_REPORT_PENABLED) { /* Penabled */
prox = data[1] & 0x20; prox = data[1] & 0x20;
touchInProx = 0; touchInProx = 0;

8
drivers/input/tablet/wacom_wac.h
View File

@ -28,6 +28,14 @@
#define ERASER_DEVICE_ID 0x0A #define ERASER_DEVICE_ID 0x0A
#define PAD_DEVICE_ID 0x0F #define PAD_DEVICE_ID 0x0F
/* wacom data packet report IDs */
#define WACOM_REPORT_PENABLED 2
#define WACOM_REPORT_INTUOSREAD 5
#define WACOM_REPORT_INTUOSWRITE 6
#define WACOM_REPORT_INTUOSPAD 12
#define WACOM_REPORT_TPC1FG 6
#define WACOM_REPORT_TPC2FG 13
enum { enum {
PENPARTNER = 0, PENPARTNER = 0,
GRAPHIRE, GRAPHIRE,