summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/eventcomm.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/eventcomm.c b/src/eventcomm.c
index 69436cd..97c7260 100644
--- a/src/eventcomm.c
+++ b/src/eventcomm.c
@@ -489,9 +489,8 @@ EventQueryHardware(InputInfoPtr pInfo)
}
static Bool
-SynapticsReadEvent(InputInfoPtr pInfo, struct input_event *ev)
+SynapticsReadEvent(SynapticsPrivate *priv, struct input_event *ev)
{
- SynapticsPrivate *priv = (SynapticsPrivate *) pInfo->private;
struct eventcomm_proto_data *proto_data = priv->proto_data;
int rc = TRUE;
ssize_t len;
@@ -527,10 +526,9 @@ EventTouchSlotPreviouslyOpen(SynapticsPrivate * priv, int slot)
}
static void
-EventProcessTouchEvent(InputInfoPtr pInfo, struct SynapticsHwState *hw,
+EventProcessTouchEvent(SynapticsPrivate *priv, struct SynapticsHwState *hw,
struct input_event *ev)
{
- SynapticsPrivate *priv = (SynapticsPrivate *) pInfo->private;
struct eventcomm_proto_data *proto_data = priv->proto_data;
if (!priv->has_touch)
@@ -639,7 +637,7 @@ EventReadHwState(InputInfoPtr pInfo,
hw->cumulative_dy = hw->y;
}
- while (SynapticsReadEvent(pInfo, &ev)) {
+ while (SynapticsReadEvent(priv, &ev)) {
switch (ev.type) {
case EV_SYN:
switch (ev.code) {
@@ -725,7 +723,7 @@ EventReadHwState(InputInfoPtr pInfo,
}
}
else
- EventProcessTouchEvent(pInfo, hw, &ev);
+ EventProcessTouchEvent(priv, hw, &ev);
break;
}
}