On Tue, Feb 23, 2010 at 08:55:39PM -0600, ch...@cnpbagwell.com wrote: > From: Chris Bagwell <ch...@cnpbagwell.com> > > Cleanup. Variables not referenced by any real code. > > Signed-off-by: Chris Bagwell <ch...@cnpbagwell.com> > --- > src/wcmValidateDevice.c | 6 ------ > src/xf86WacomDefs.h | 6 ------ > 2 files changed, 0 insertions(+), 12 deletions(-) > > diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c > index 470b5cf..9e59362 100644 > --- a/src/wcmValidateDevice.c > +++ b/src/wcmValidateDevice.c > @@ -599,12 +599,6 @@ int wcmParseOptions(LocalDevicePtr local, unsigned long* > keys) > common->wcmThreshold = xf86SetIntOption(local->options, "Threshold", > common->wcmThreshold); > > - common->wcmUserResolX = xf86SetIntOption(local->options, "ResolutionX", > - common->wcmUserResolX); > - common->wcmUserResolY = xf86SetIntOption(local->options, "ResolutionY", > - common->wcmUserResolY); > - common->wcmUserResolZ = xf86SetIntOption(local->options, "ResolutionZ", > - common->wcmUserResolZ); > if (xf86SetBoolOption(local->options, "ButtonsOnly", 0)) > priv->flags |= BUTTONS_ONLY_FLAG; > > diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h > index c7c2495..611b687 100644 > --- a/src/xf86WacomDefs.h > +++ b/src/xf86WacomDefs.h > @@ -384,12 +384,6 @@ struct _WacomCommonRec > int wcmMaxtiltX; /* styli max tilt in X directory */ > int wcmMaxtiltY; /* styli max tilt in Y directory */ > > - /* These values are in user coordinates */ > - int wcmUserResolX; /* user-defined X resolution */ > - int wcmUserResolY; /* user-defined Y resolution */ > - int wcmUserResolZ; /* user-defined Z resolution, > - * value equal to 100% pressure */ > - > int wcmMaxStripX; /* Maximum fingerstrip X */ > int wcmMaxStripY; /* Maximum fingerstrip Y */ > > -- > 1.6.6
merged, thank you. Cheers, Peter ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
