diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-18 10:34:28 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-05-31 14:56:43 +1000 |
| commit | 429246440a379418d9d86f272e07290543ab4a84 (patch) | |
| tree | 15408288242fe06108b911fab8e525f3ea103a51 | |
| parent | dd01a9257f5a89804a7ee7c00793fa5302fbefcc (diff) | |
eventcomm: more pInfo -> priv changeovers
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/eventcomm.c | 10 |
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; } } |