On Fri, Mar 11, 2011 at 8:39 AM, Jason Gerecke <killert...@gmail.com> wrote:
> XWACOM_MAX_SAMPLES is a duplicate of MAX_SAMPLES, and appears to have
> no reason to be included in the Xwacom.h header. We remove it and
> retarget all references.
>
> Signed-off-by: Jason Gerecke <killert...@gmail.com>
>
Reviewed-by: Ping Cheng <pingli...@gmail.com>
Ping
> ---
> include/Xwacom.h | 2 --
> src/wcmValidateDevice.c | 4 ++--
> src/wcmXCommand.c | 2 +-
> 3 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/include/Xwacom.h b/include/Xwacom.h
> index b06e8ff..3ca8573 100644
> --- a/include/Xwacom.h
> +++ b/include/Xwacom.h
> @@ -43,8 +43,6 @@
> #define ROTATE_CCW 2
> #define ROTATE_HALF 3
>
> -#define XWACOM_MAX_SAMPLES 20
> -
> /* The following flags are used for button action property values to mark
> * the type of event that should be emitted when that button is pressed;
> * combined together they form an Action Code (AC). Each button has up to
> diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
> index af6b8d2..0d838fb 100644
> --- a/src/wcmValidateDevice.c
> +++ b/src/wcmValidateDevice.c
> @@ -539,10 +539,10 @@ int wcmParseOptions(InputInfoPtr pInfo, int
> hotplugged)
>
> common->wcmRawSample = xf86SetIntOption(pInfo->options, "RawSample",
> common->wcmRawSample);
> - if (common->wcmRawSample < 1 || common->wcmRawSample >
> XWACOM_MAX_SAMPLES)
> + if (common->wcmRawSample < 1 || common->wcmRawSample > MAX_SAMPLES)
> {
> xf86Msg(X_ERROR, "%s: RawSample setting '%d' out of range
> [1..%d]. Using default.\n",
> - pInfo->name, common->wcmRawSample,
> XWACOM_MAX_SAMPLES);
> + pInfo->name, common->wcmRawSample, MAX_SAMPLES);
> common->wcmRawSample = DEFAULT_SAMPLES;
> }
>
> diff --git a/src/wcmXCommand.c b/src/wcmXCommand.c
> index e589e37..4f702b7 100644
> --- a/src/wcmXCommand.c
> +++ b/src/wcmXCommand.c
> @@ -620,7 +620,7 @@ int wcmSetProperty(DeviceIntPtr dev, Atom property,
> XIPropertyValuePtr prop,
> if ((values[0] < 0) || (values[0] > 100))
> return BadValue;
>
> - if ((values[1] < 1) || (values[1] > XWACOM_MAX_SAMPLES))
> + if ((values[1] < 1) || (values[1] > MAX_SAMPLES))
> return BadValue;
>
> if (!checkonly)
> --
> 1.7.1
>
>
>
> ------------------------------------------------------------------------------
> Colocation vs. Managed Hosting
> A question and answer guide to determining the best fit
> for your organization - today and in the future.
> http://p.sf.net/sfu/internap-sfd2d
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
>
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
