diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-21 15:26:25 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-31 14:56:48 +1000 |
| commit | 1a184805c1ff2f8dabcb78bd0a5be139b085fa7c (patch) | |
| tree | 4c930f0c064a0fb0ce4289c17faaa8b23d26e6ba | |
| parent | 29223b53587dd31722b9788f5d7aff40db208a9f (diff) | |
Move SynapticsReset into the core
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/synaptics-x11.c | 1 | ||||
| -rw-r--r-- | src/synaptics.c | 3 | ||||
| -rw-r--r-- | src/synaptics.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/synaptics-x11.c b/src/synaptics-x11.c index 9a15027..3a6d930 100644 --- a/src/synaptics-x11.c +++ b/src/synaptics-x11.c @@ -408,7 +408,6 @@ DeviceOff(DeviceIntPtr dev) if (pInfo->fd != -1) { TimerCancel(x11->timer); xf86RemoveEnabledDevice(pInfo); - SynapticsReset(priv); if (!SynapticsDisableDevice(priv, pInfo->fd)) rc = !Success; diff --git a/src/synaptics.c b/src/synaptics.c index 125a31d..37a0fa1 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -546,7 +546,7 @@ SynapticsFreePrivate(SynapticsPrivate **private) } -void +static void SynapticsReset(SynapticsPrivate * priv) { SynapticsResetHwState(priv->hwState); @@ -652,6 +652,7 @@ SynapticsEnableDevice(SynapticsPrivate *priv, int fd) int SynapticsDisableDevice(SynapticsPrivate *priv, int fd) { + SynapticsReset(priv); if (priv->proto_ops->DeviceOffHook && !priv->proto_ops->DeviceOffHook(priv, fd)) return 0; diff --git a/src/synaptics.h b/src/synaptics.h index c75239d..e361380 100644 --- a/src/synaptics.h +++ b/src/synaptics.h @@ -45,7 +45,7 @@ SynapticsPrivate * SynapticsInitPrivate(void); * @see SynapticsInitPrivate */ void SynapticsFreePrivate(SynapticsPrivate **private); -void SynapticsReset(SynapticsPrivate * priv); + /** * Callback for data available on device file descriptor. Reads data and * posts events to the frontend. |