The following fields are not actually supported by any model we currently
support, so the hooks are unused:
Reset, EnableTilt, EnableSuppress, SetLinkSpeed
since the WacomModel isn't exported ABI, we can just add it again if we ever
need it in the future.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
---
src/wcmCommon.c | 21 --------------
src/wcmISDV4.c | 4 ---
src/wcmUSB.c | 76 ---------------------------------------------------
src/xf86WacomDefs.h | 4 ---
4 files changed, 0 insertions(+), 105 deletions(-)
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index ce1f90b..5839ee5 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -1627,27 +1627,6 @@ int wcmInitTablet(LocalDevicePtr local, const char* id,
float version)
local->name, common->wcmThreshold);
}
- /* Reset tablet to known state */
- if (model->Reset && (model->Reset(local) != Success))
- {
- xf86Msg(X_ERROR, "Wacom xf86WriteSerial error : %s\n",
strerror(errno));
- return !Success;
- }
-
- /* Enable tilt mode, if requested and available */
- if ((common->wcmFlags & TILT_REQUEST_FLAG) && model->EnableTilt)
- {
- if (model->EnableTilt(local) != Success)
- return !Success;
- }
-
- /* Enable hardware suppress, if requested and available */
- if (model->EnableSuppress)
- {
- if (model->EnableSuppress(local) != Success)
- return !Success;
- }
-
/* output tablet state as probed */
xf86Msg(X_PROBED, "%s: Wacom %s tablet speed=%d maxX=%d maxY=%d maxZ=%d
"
"resX=%d resY=%d tilt=%s\n",
diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c
index 96f16c1..f705027 100644
--- a/src/wcmISDV4.c
+++ b/src/wcmISDV4.c
@@ -56,10 +56,6 @@ static int wcmWriteWait(int fd, const char* request);
isdv4InitISDV4,
NULL, /* resolution not queried */
isdv4GetRanges, /* query ranges */
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
isdv4StartTablet, /* start tablet */
isdv4Parse,
};
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
index ed53897..01f36c6 100644
--- a/src/wcmUSB.c
+++ b/src/wcmUSB.c
@@ -64,10 +64,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol5, /* assume the best */
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
NULL, /* input filtering not needed */
@@ -80,10 +76,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -96,10 +88,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -112,10 +100,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -128,10 +112,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -144,10 +124,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -160,10 +136,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -176,10 +148,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -192,10 +160,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -208,10 +172,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
NULL, /* input filtering */
@@ -224,10 +184,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
NULL, /* input filtering */
@@ -240,10 +196,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol5,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterIntuos, /* input filtering recommended */
@@ -256,10 +208,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol5,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterIntuos, /* input filtering recommended */
@@ -272,10 +220,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol5,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterIntuos, /* input filtering recommended */
@@ -288,10 +232,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol5,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterIntuos, /* input filtering recommended */
@@ -304,10 +244,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -320,10 +256,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterCoord, /* input filtering */
@@ -336,10 +268,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol5,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
wcmFilterIntuos, /* input filtering recommended */
@@ -352,10 +280,6 @@ static int usbChooseChannel(WacomCommonPtr common, int
serial);
usbInitProtocol4,
NULL, /* resolution not queried */
usbWcmGetRanges,
- NULL, /* reset not supported */
- NULL, /* tilt automatically enabled */
- NULL, /* suppress implemented in software */
- NULL, /* link speed unsupported */
NULL, /* start not supported */
usbParse,
NULL, /* input filtering */
diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
index c7c2495..22a0642 100644
--- a/src/xf86WacomDefs.h
+++ b/src/xf86WacomDefs.h
@@ -91,10 +91,6 @@ struct _WacomModel
void (*Initialize)(WacomCommonPtr common, const char* id, float
version);
void (*GetResolution)(LocalDevicePtr local);
int (*GetRanges)(LocalDevicePtr local);
- int (*Reset)(LocalDevicePtr local);
- int (*EnableTilt)(LocalDevicePtr local);
- int (*EnableSuppress)(LocalDevicePtr local);
- int (*SetLinkSpeed)(LocalDevicePtr local);
int (*Start)(LocalDevicePtr local);
int (*Parse)(LocalDevicePtr local, const unsigned char* data);
int (*FilterRaw)(WacomCommonPtr common, WacomChannelPtr pChannel,
--
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
