On Mon, Jan 31, 2011 at 05:20:32PM -0800, Ping Cheng wrote: > Signed-off-by: Ping Cheng <[email protected]> > --- > src/wcmISDV4.c | 12 +++++++----- > 1 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/src/wcmISDV4.c b/src/wcmISDV4.c > index 7bab7d4..a0c9b3b 100644 > --- a/src/wcmISDV4.c > +++ b/src/wcmISDV4.c > @@ -31,6 +31,10 @@ > > #define RESET_RELATIVE(ds) do { (ds).relwheel = 0; } while (0) > > +/* resolution in points/m */ > +#define ISDV4_PEN_RESOLUTION 100000 > +#define ISDV4_TOUCH_RESOLUTION 10000 > + > /* ISDV4 init process > This process is the same for other backends (i.e. USB). > > @@ -142,8 +146,6 @@ static int wcmSkipInvalidBytes(const unsigned char* data, > int len) > return n; > } > > - > - > > /***************************************************************************** > * wcmSerialValidate -- validates serial packet; returns 0 on success, > * positive number of bytes to skip on error. > @@ -318,9 +320,9 @@ static void isdv4InitISDV4(WacomCommonPtr common, const > char* id, float version) > common->wcmPktLength = ISDV4_PKGLEN_TPCPEN; > > /* digitizer X resolution in points/m */ > - common->wcmResolX = 100000; > + common->wcmResolX = ISDV4_PEN_RESOLUTION; > /* digitizer Y resolution in points/m */ > - common->wcmResolY = 100000; > + common->wcmResolY = ISDV4_PEN_RESOLUTION; > > /* tilt disabled */ > common->wcmFlags &= ~TILT_ENABLED_FLAG; > @@ -510,7 +512,7 @@ static int isdv4GetRanges(InputInfoPtr pInfo) > (1 << reply.panel_resolution); > > if (reply.panel_resolution) > - common->wcmTouchResolX = common->wcmTouchResolY = 10000; > + common->wcmTouchResolX = common->wcmTouchResolY = > ISDV4_TOUCH_RESOLUTION;
this patch doesn't seem to apply here. did I miss a preceding patch? hunks 3 and 4 fail and I notice that the current resolution is set based on the reply. Is this data we get from the device? If so, we should leave it at that instead of hardcoding a value here. Cheers, Peter > common->wcmVersion = reply.version; > ret = Success; > -- > 1.7.3.5 ------------------------------------------------------------------------------ Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! Finally, a world-class log management solution at an even better price-free! Download using promo code Free_Logger_4_Dev2Dev. Offer expires February 28th, so secure your free ArcSight Logger TODAY! http://p.sf.net/sfu/arcsight-sfd2d _______________________________________________ Linuxwacom-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
