Signed-off-by: Peter Hutterer <[email protected]> --- src/wcmISDV4.h | 11 +++++++++++ src/xf86Wacom.h | 7 ------- src/xf86WacomDefs.h | 4 ---- 3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/wcmISDV4.h b/src/wcmISDV4.h index 93c5e19..cd57d5e 100644 --- a/src/wcmISDV4.h +++ b/src/wcmISDV4.h @@ -20,6 +20,17 @@ #ifndef WCMISDV4_H #define WCMISDV4_H +/* packet length for individual models */ +#define ISDV4_PKGLEN_TOUCH93 5 +#define ISDV4_PKGLEN_TOUCH9A 7 +#define ISDV4_PKGLEN_TPCPEN 9 +#define ISDV4_PKGLEN_TPCCTL 11 +#define ISDV4_PKGLEN_TOUCH2FG 13 + +#define HEADER_BIT 0x80 +#define CONTROL_BIT 0x40 +#define DATA_ID_MASK 0x3F + /* ISDV4 protocol parsing structs. */ /* Query reply data */ diff --git a/src/xf86Wacom.h b/src/xf86Wacom.h index 6303c27..bc033bf 100644 --- a/src/xf86Wacom.h +++ b/src/xf86Wacom.h @@ -80,13 +80,6 @@ #define XI_PAD "PAD" /* X device name for the Pad */ #define XI_TOUCH "TOUCH" /* X device name for the touch */ -/* packet length for individual models */ -#define ISDV4_PKGLEN_TOUCH93 5 -#define ISDV4_PKGLEN_TOUCH9A 7 -#define ISDV4_PKGLEN_TPCPEN 9 -#define ISDV4_PKGLEN_TPCCTL 11 -#define ISDV4_PKGLEN_TOUCH2FG 13 - /****************************************************************************** * WacomModule - all globals are packed in a single structure to keep the * global namespaces as clean as possible. diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h index d4e18f8..b87ccf2 100644 --- a/src/xf86WacomDefs.h +++ b/src/xf86WacomDefs.h @@ -39,10 +39,6 @@ #define PROXOUT_INTUOS_DISTANCE 10 #define PROXOUT_GRAPHIRE_DISTANCE 42 -#define HEADER_BIT 0x80 -#define CONTROL_BIT 0x40 -#define DATA_ID_MASK 0x3F - #ifndef BTN_TOOL_DOUBLETAP #define BTN_TOOL_DOUBLETAP 0x14d #endif -- 1.6.6.1 ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
