From 675a93c65029c2cda2d00bb73f9d7f0e1c9d42dc Mon Sep 17 00:00:00 2001 From: Nelson Castillo Date: Tue, 10 Mar 2009 12:04:40 +0000 Subject: Add filter_chain object Filter chains should be completely opaque to the drivers that use it. We fix this with this patch. ~ Make the "filter chain" a new object. ~ We can build with CONFIG_TOUCHSCREEN_FILTER=n with no problems in a cleaner way. ~ Update s3c2410_ts.c to use the filter_chain object. ~ Cleanups. Signed-off-by: Nelson Castillo --- drivers/input/touchscreen/ts_filter.h | 38 ----------------------------------- 1 file changed, 38 deletions(-) (limited to 'drivers/input/touchscreen/ts_filter.h') diff --git a/drivers/input/touchscreen/ts_filter.h b/drivers/input/touchscreen/ts_filter.h index 0e4704f255a..aac1e028d0b 100644 --- a/drivers/input/touchscreen/ts_filter.h +++ b/drivers/input/touchscreen/ts_filter.h @@ -62,10 +62,6 @@ struct ts_filter_api { * as a member. */ struct ts_filter_configuration { - /* API to use */ - const struct ts_filter_api *api; - /* Generic filter configuration. Different for each filter. */ - const struct ts_filter_configuration *config; }; struct ts_filter { @@ -75,38 +71,4 @@ struct ts_filter { int count_coords; }; -#ifdef CONFIG_TOUCHSCREEN_FILTER - -/* - * Helper to create a filter chain. It will allocate an array of - * null-terminated pointers to filters. - */ -extern struct ts_filter **ts_filter_chain_create( - struct platform_device *pdev, - const struct ts_filter_configuration conf[], - int count_coords); - -/* Helper to destroy a whole chain from the list of filter pointers. */ -extern void ts_filter_chain_destroy(struct ts_filter **arr); - -/* Helper to call the clear API function */ -extern void ts_filter_chain_clear(struct ts_filter **arr); - -/* - * Try to get one point. Returns 0 if no points are available. - * coords will be used as temporal space, thus you supply a point - * using coords but you shouldn't rely on its value on return unless - * it returns a nonzero value that is not -1. - * If one of the filters find an error then this function will - * return -1. - */ -int ts_filter_chain_feed(struct ts_filter **arr, int *coords); - -#else /* !CONFIG_TOUCHSCREEN_FILTER */ -#define ts_filter_chain_create(pdev, config, count_coords) (0) /*TODO:fail!*/ -#define ts_filter_chain_destroy(pdev, arr) do { } while (0) -#define ts_filter_chain_clear(arr) do { } while (0) -#define ts_filter_chain_feed(arr, coords) (1) -#endif - #endif -- cgit v1.2.3