We only support ISDV4 and usb tablets and both use the same read method.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
src/wcmISDV4.c | 1 -
src/wcmUSB.c | 1 -
src/xf86Wacom.c | 5 +----
src/xf86WacomDefs.h | 1 -
4 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c
index c18fc3a..b050fcb 100644
--- a/src/wcmISDV4.c
+++ b/src/wcmISDV4.c
@@ -48,7 +48,6 @@ static int wcmWriteWait(int fd, const char* request);
{
isdv4Detect,
isdv4Init,
- wcmReadPacket,
};
static WacomModel isdv4General =
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index 6667ba1..f9a4a31 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -55,7 +55,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
{
usbDetect,
usbWcmInit,
- wcmReadPacket,
};
static WacomModel usbUnknown =
diff --git a/src/xf86Wacom.c b/src/xf86Wacom.c
index f339788..f72a95e 100644
--- a/src/xf86Wacom.c
+++ b/src/xf86Wacom.c
@@ -1074,9 +1074,6 @@ static void wcmDevReadInput(LocalDevicePtr local)
int loop=0;
#define MAX_READ_LOOPS 10
- WacomDevicePtr priv = (WacomDevicePtr)local->private;
- WacomCommonPtr common = priv->common;
-
/* move data until we exhaust the device */
for (loop=0; loop < MAX_READ_LOOPS; ++loop)
{
@@ -1084,7 +1081,7 @@ static void wcmDevReadInput(LocalDevicePtr local)
if (!wcmReady(local)) break;
/* dispatch */
- common->wcmDevCls->Read(local);
+ wcmReadPacket(local);
}
/* report how well we're doing */
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index f9d4b5e..d383ac5 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -328,7 +328,6 @@ struct _WacomDeviceClass
{
Bool (*Detect)(LocalDevicePtr local); /* detect device */
Bool (*Init)(LocalDevicePtr local, char* id, float *version); /*
initialize device */
- void (*Read)(LocalDevicePtr local); /* reads device */
};
extern WacomDeviceClass gWacomUSBDevice;
--
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
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
