On Wed, Mar 30, 2011 at 04:24:15PM -0700, Ping Cheng wrote: > Don't wait before we can post the events. Verify the serial number > as soon as the information is accessible. > > Signed-off-by: Ping Cheng <[email protected]> > --- > src/wcmCommon.c | 16 ++++++++-------- > 1 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/src/wcmCommon.c b/src/wcmCommon.c > index 338bc9a..106b741 100644 > --- a/src/wcmCommon.c > +++ b/src/wcmCommon.c > @@ -662,14 +662,6 @@ void wcmSendEvents(InputInfoPtr pInfo, const > WacomDeviceState* ds) > int v3, v4, v5; > int valuators[priv->naxes]; > > - if (priv->serial && serial != priv->serial) > - { > - DBG(10, priv, "serial number" > - " is %u but your system configured %u", > - serial, (int)priv->serial); > - return; > - } > - > /* don't move the cursor when going out-prox */ > if (!ds->proximity) > { > @@ -1138,6 +1130,14 @@ static void commonDispatchDevice(WacomCommonPtr > common, unsigned int channel, > /* Device transformations come first */ > priv = pInfo->private; > > + if (priv->serial && filtered.serial_num != priv->serial) > + { > + DBG(10, priv, "serial number" > + " is %u but your system configured %u", > + filtered.serial_num, priv->serial); > + return; > + } > + > /* send a touch out for USB Tablet PCs */ > if (IsUSBDevice(common) && !IsTouch(priv) > && common->wcmTouchDefault && !priv->oldProximity) > -- > 1.7.4
merged, thanks. Cheers, Peter ------------------------------------------------------------------------------ Create and publish websites with WebMatrix Use the most popular FREE web apps or write code yourself; WebMatrix provides all the features you need to develop and publish your website. http://p.sf.net/sfu/ms-webmatrix-sf _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
