diff options
| -rw-r--r-- | src/alpscomm.c | 14 | ||||
| -rw-r--r-- | src/eventcomm.c | 7 | ||||
| -rw-r--r-- | src/ps2comm.c | 8 | ||||
| -rw-r--r-- | src/psmcomm.c | 14 | ||||
| -rw-r--r-- | src/synaptics.c | 9 |
5 files changed, 12 insertions, 40 deletions
diff --git a/src/alpscomm.c b/src/alpscomm.c index 75cd348..a1b6fb1 100644 --- a/src/alpscomm.c +++ b/src/alpscomm.c @@ -86,16 +86,6 @@ ALPS_initialize(int fd) ALPS_sync(fd); } -static void -ALPSDeviceOnHook(LocalDevicePtr local, SynapticsParameters *para) -{ -} - -static void -ALPSDeviceOffHook(LocalDevicePtr local) -{ -} - static Bool ALPSQueryHardware(LocalDevicePtr local, struct SynapticsHwInfo *synhw) { @@ -260,8 +250,8 @@ ALPSAutoDevProbe(LocalDevicePtr local) } struct SynapticsProtocolOperations alps_proto_operations = { - ALPSDeviceOnHook, - ALPSDeviceOffHook, + NULL, + NULL, ALPSQueryHardware, ALPSReadHwState, ALPSAutoDevProbe, diff --git a/src/eventcomm.c b/src/eventcomm.c index 77faf51..5bd15ec 100644 --- a/src/eventcomm.c +++ b/src/eventcomm.c @@ -69,11 +69,6 @@ EventDeviceOnHook(LocalDevicePtr local, SynapticsParameters *para) } } -static void -EventDeviceOffHook(LocalDevicePtr local) -{ -} - static Bool event_query_is_touchpad(int fd) { @@ -415,7 +410,7 @@ EventAutoDevProbe(LocalDevicePtr local) struct SynapticsProtocolOperations event_proto_operations = { EventDeviceOnHook, - EventDeviceOffHook, + NULL, EventQueryHardware, EventReadHwState, EventAutoDevProbe, diff --git a/src/ps2comm.c b/src/ps2comm.c index 6486765..2b7e8a9 100644 --- a/src/ps2comm.c +++ b/src/ps2comm.c @@ -444,12 +444,6 @@ ps2_print_ident(const struct SynapticsHwInfo *synhw) } } - -static void -PS2DeviceOnHook(LocalDevicePtr local, SynapticsParameters* para) -{ -} - static void PS2DeviceOffHook(LocalDevicePtr local) { @@ -756,7 +750,7 @@ PS2AutoDevProbe(LocalDevicePtr local) } struct SynapticsProtocolOperations psaux_proto_operations = { - PS2DeviceOnHook, + NULL, PS2DeviceOffHook, PS2QueryHardware, PS2ReadHwState, diff --git a/src/psmcomm.c b/src/psmcomm.c index eaad064..e7d2a92 100644 --- a/src/psmcomm.c +++ b/src/psmcomm.c @@ -101,16 +101,6 @@ PSMQueryIsSynaptics(LocalDevicePtr local) } static void -PSMDeviceOnHook(LocalDevicePtr local, SynapticsParameters *para) -{ -} - -static void -PSMDeviceOffHook(LocalDevicePtr local) -{ -} - -static void convert_hw_info(const synapticshw_t *psm_ident, struct SynapticsHwInfo *synhw) { memset(synhw, 0, sizeof(*synhw)); @@ -175,8 +165,8 @@ static Bool PSMAutoDevProbe(LocalDevicePtr local) } struct SynapticsProtocolOperations psm_proto_operations = { - PSMDeviceOnHook, - PSMDeviceOffHook, + NULL, + NULL, PSMQueryHardware, PSMReadHwState, PSMAutoDevProbe, diff --git a/src/synaptics.c b/src/synaptics.c index 8cfe176..5b932fd 100644 --- a/src/synaptics.c +++ b/src/synaptics.c @@ -700,7 +700,8 @@ DeviceOn(DeviceIntPtr dev) return !Success; } - priv->proto_ops->DeviceOnHook(local, &priv->synpara); + if (priv->proto_ops->DeviceOnHook) + priv->proto_ops->DeviceOnHook(local, &priv->synpara); priv->comm.buffer = XisbNew(local->fd, 64); if (!priv->comm.buffer) { @@ -731,7 +732,8 @@ DeviceOff(DeviceIntPtr dev) TimerFree(priv->timer); priv->timer = NULL; xf86RemoveEnabledDevice(local); - priv->proto_ops->DeviceOffHook(local); + if (priv->proto_ops->DeviceOffHook) + priv->proto_ops->DeviceOffHook(local); if (priv->comm.buffer) { XisbFree(priv->comm.buffer); priv->comm.buffer = NULL; @@ -2191,7 +2193,8 @@ QueryHardware(LocalDevicePtr local) shm->synhw = priv->synhw; } else { xf86Msg(X_PROBED, "%s: no supported touchpad found\n", local->name); - priv->proto_ops->DeviceOffHook(local); + if (priv->proto_ops->DeviceOffHook) + priv->proto_ops->DeviceOffHook(local); } return TRUE; |