On Tue, Mar 08, 2011 at 05:50:42PM -0800, Jason Gerecke wrote:
> This option was mostly removed from the driver at some point in
> the past, with only these vestigal lines remaining.
>
> Signed-off-by: Jason Gerecke <[email protected]>
merged and pushed patches 1-3, thanks. see my comment to 4/4.
Cheers,
Peter
> ---
> src/wcmCommon.c | 2 +-
> src/wcmConfig.c | 2 +-
> src/wcmValidateDevice.c | 4 ----
> src/xf86WacomDefs.h | 2 --
> 4 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/src/wcmCommon.c b/src/wcmCommon.c
> index 4641cc1..315aa4e 100644
> --- a/src/wcmCommon.c
> +++ b/src/wcmCommon.c
> @@ -906,7 +906,7 @@ void wcmEvent(WacomCommonPtr common, unsigned int channel,
> }
>
> /* Optionally filter values only while in proximity */
> - if (RAW_FILTERING(common) && common->wcmModel->FilterRaw &&
> + if (common->wcmModel->FilterRaw &&
> ds.proximity && ds.device_type != PAD_ID)
> {
> /* Start filter fresh when entering proximity */
> diff --git a/src/wcmConfig.c b/src/wcmConfig.c
> index afb5e0a..5d9d85b 100644
> --- a/src/wcmConfig.c
> +++ b/src/wcmConfig.c
> @@ -89,7 +89,7 @@ static int wcmAllocate(InputInfoPtr pInfo)
> /* JEJ - throttle sampling code */
> priv->throttleLimit = -1;
>
> - common->wcmFlags = RAW_FILTERING_FLAG; /* various flags */
> + common->wcmFlags = 0; /* various flags */
> common->wcmDevices = priv;
> common->wcmProtocolLevel = WCM_PROTOCOL_4; /* protocol level */
> common->wcmTPCButton = 0; /* set Tablet PC button on/off */
> diff --git a/src/wcmValidateDevice.c b/src/wcmValidateDevice.c
> index 1b6c4e2..9d68abd 100644
> --- a/src/wcmValidateDevice.c
> +++ b/src/wcmValidateDevice.c
> @@ -551,10 +551,6 @@ int wcmParseOptions(InputInfoPtr pInfo, int hotplugged)
> (common->wcmFlags & TILT_REQUEST_FLAG)))
> common->wcmFlags |= TILT_REQUEST_FLAG;
>
> - if (xf86SetBoolOption(pInfo->options, "RawFilter",
> - (common->wcmFlags & RAW_FILTERING_FLAG)))
> - common->wcmFlags |= RAW_FILTERING_FLAG;
> -
> /* pressure curve takes control points x1,y1,x2,y2
> * values in range from 0..100.
> * Linear curve is 0,0,100,100
> diff --git a/src/xf86WacomDefs.h b/src/xf86WacomDefs.h
> index db83ddb..891f6a6 100644
> --- a/src/xf86WacomDefs.h
> +++ b/src/xf86WacomDefs.h
> @@ -382,7 +382,6 @@ extern WacomDeviceClass gWacomISDV4Device;
>
> #define TILT_REQUEST_FLAG 1
> #define TILT_ENABLED_FLAG 2
> -#define RAW_FILTERING_FLAG 4
>
> #define MAX_CHANNELS 3
> #define PAD_CHANNEL (MAX_CHANNELS-1)
> @@ -481,7 +480,6 @@ struct _WacomCommonRec
> };
>
> #define HANDLE_TILT(comm) ((comm)->wcmFlags & TILT_ENABLED_FLAG)
> -#define RAW_FILTERING(comm) ((comm)->wcmFlags & RAW_FILTERING_FLAG)
>
>
> /******************************************************************************
> * WacomTool
> --
> 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
> [email protected]
> 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
[email protected]
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
