For consistency with the rest of the code.
Signed-off-by: Peter Hutterer <[email protected]>
---
src/wcmCommon.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/wcmCommon.c b/src/wcmCommon.c
index d62ce3d..59c7af3 100644
--- a/src/wcmCommon.c
+++ b/src/wcmCommon.c
@@ -1158,7 +1158,7 @@ setPressureButton(const WacomDevicePtr priv, const
WacomDeviceState *ds)
static void commonDispatchDevice(WacomCommonPtr common, unsigned int channel,
const WacomChannelPtr pChannel, Bool suppress)
{
- InputInfoPtr pDev = NULL;
+ InputInfoPtr pInfo = NULL;
WacomToolPtr tool = NULL;
WacomDeviceState* ds = &pChannel->valid.states[0];
WacomDevicePtr priv = NULL;
@@ -1182,12 +1182,12 @@ static void commonDispatchDevice(WacomCommonPtr common,
unsigned int channel,
return;
}
- pDev = tool->current->device;
- DBG(11, common, "tool id=%d for %s\n", ds->device_type, pDev->name);
+ pInfo = tool->current->device;
+ DBG(11, common, "tool id=%d for %s\n", ds->device_type, pInfo->name);
/* Tool on the tablet when driver starts. This sometime causes
* access errors to the device */
- if (!miPointerGetScreen(pDev->dev))
+ if (!miPointerGetScreen(pInfo->dev))
{
xf86Msg(X_ERROR, "wcmEvent: Wacom driver can not get Current
Screen ID\n");
xf86Msg(X_ERROR, "Please remove Wacom tool from the tablet and
bring it back again.\n");
@@ -1197,7 +1197,7 @@ static void commonDispatchDevice(WacomCommonPtr common,
unsigned int channel,
filtered = pChannel->valid.state;
/* Device transformations come first */
- priv = pDev->private;
+ priv = pInfo->private;
if (IsUSBDevice(common))
{
@@ -1258,7 +1258,7 @@ static void commonDispatchDevice(WacomCommonPtr common,
unsigned int channel,
/* User-requested transformations come last */
- if (!is_absolute(pDev) && !IsPad(priv))
+ if (!is_absolute(pInfo) && !IsPad(priv))
{
/* To improve the accuracy of relative x/y,
* don't send motion event when there is no movement.
@@ -1324,7 +1324,7 @@ static void commonDispatchDevice(WacomCommonPtr common,
unsigned int channel,
return;
}
}
- wcmSendEvents(pDev, &filtered);
+ wcmSendEvents(pInfo, &filtered);
/* If out-prox, reset the current area pointer */
if (!filtered.proximity)
tool->current = NULL;
--
1.7.3.5
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Linuxwacom-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
