aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet/wacom_wac.h
diff options
context:
space:
mode:
authorJason Childs <oblivian@users.sourceforge.net>2010-02-17 22:38:31 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-02-19 01:25:16 -0800
commite33da8a5486aaadf5161118869e6cfb3d119beea (patch)
treeff5819b0f2e192557f6d9848698a65d988ee8983 /drivers/input/tablet/wacom_wac.h
parent4e45ad5e89128939c671e927f030cb3909fe1d69 (diff)
downloadkernel_samsung_crespo-e33da8a5486aaadf5161118869e6cfb3d119beea.zip
kernel_samsung_crespo-e33da8a5486aaadf5161118869e6cfb3d119beea.tar.gz
kernel_samsung_crespo-e33da8a5486aaadf5161118869e6cfb3d119beea.tar.bz2
Input: wacom - use per-device instance of wacom_features
Since we mangle data in wacom_features when dealing with certain devices let's use a private (per-device) instance of wacom_features in wacom_wac. This way same product ID can support more than one type of device, such as pen and touch, and not interfere with each other. Signed-off-by: Jason Childs <oblivian@users.sourceforge.net> Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/tablet/wacom_wac.h')
-rw-r--r--drivers/input/tablet/wacom_wac.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/tablet/wacom_wac.h b/drivers/input/tablet/wacom_wac.h
index ee01e19..3f4b89d 100644
--- a/drivers/input/tablet/wacom_wac.h
+++ b/drivers/input/tablet/wacom_wac.h
@@ -15,11 +15,11 @@
/* packet length for individual models */
#define WACOM_PKGLEN_PENPRTN 7
#define WACOM_PKGLEN_GRAPHIRE 8
-#define WACOM_PKGLEN_BBFUN 9
-#define WACOM_PKGLEN_INTUOS 10
+#define WACOM_PKGLEN_BBFUN 9
+#define WACOM_PKGLEN_INTUOS 10
#define WACOM_PKGLEN_PENABLED 8
#define WACOM_PKGLEN_TPC1FG 5
-#define WACOM_PKGLEN_TPC2FG 14
+#define WACOM_PKGLEN_TPC2FG 14
/* device IDs */
#define STYLUS_DEVICE_ID 0x02
@@ -58,7 +58,7 @@ enum {
};
struct wacom_features {
- char *name;
+ const char *name;
int pktlen;
int x_max;
int y_max;
@@ -77,7 +77,7 @@ struct wacom_wac {
int tool[2];
int id[2];
__u32 serial[2];
- struct wacom_features *features;
+ struct wacom_features features;
};
#endif