aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authormerge <null@invalid>2008-12-08 11:03:03 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-12-08 11:03:03 +0000
commitc3be736aeb24f44cf95dfad8fe3f1c7c6f367aaf (patch)
tree1ba8dbf5784f805847652d896d9ee98ceffae22b /include/linux
parent2eb3742db1ecd3d9ffe8f02eaa8def1b2bd2a2c2 (diff)
MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-remove-skip-filter-1228733704
pending-tracking-hist top was MERGE-via-stable-tracking-remove-skip-filter-1228733704 / 552c6fdd4c644ab2618ad27564d159ed28bbd859 ... parent commitmessage: From: merge <null@invalid> MERGE-via-stable-tracking-hist-remove-skip-filter stable-tracking-hist top was remove-skip-filter / 92bdef8636873a19efc05b2a19578a0aa93dba41 ... parent commitmessage: From: Nelson Castillo <nelsoneci@gmail.com> Remove skip filter With more reliable points median and mean filters perform a better job. We no longer need this filter. Signed-off-by: Nelson Castillo <nelsoneci@gmail.com>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ts_filter.h7
-rw-r--r--include/linux/ts_filter_group.h39
-rw-r--r--include/linux/ts_filter_variance.h36
3 files changed, 41 insertions, 41 deletions
diff --git a/include/linux/ts_filter.h b/include/linux/ts_filter.h
index 7262bbaf3dd..bfb8a221964 100644
--- a/include/linux/ts_filter.h
+++ b/include/linux/ts_filter.h
@@ -4,14 +4,11 @@
/*
* touchscreen filter
*
- * median
- *
* (c) 2008 Andy Green <andy@openmoko.com>
*/
-/* max filters you can chain up */
-#define MAX_TS_FILTER_CHAIN 4
-#define MAX_TS_FILTER_COORDS 6
+#define MAX_TS_FILTER_CHAIN 4 /* max filters you can chain up */
+#define MAX_TS_FILTER_COORDS 3 /* Y, Y and Z (pressure) */
struct ts_filter;
diff --git a/include/linux/ts_filter_group.h b/include/linux/ts_filter_group.h
new file mode 100644
index 00000000000..1e74c8dc741
--- /dev/null
+++ b/include/linux/ts_filter_group.h
@@ -0,0 +1,39 @@
+#ifndef __TS_FILTER_GROUP_H__
+#define __TS_FILTER_GROUP_H__
+
+#include <linux/ts_filter.h>
+
+/*
+ * Touchscreen group filter.
+ *
+ * Copyright (C) 2008 by Openmoko, Inc.
+ * Author: Nelson Castillo <arhuaco@freaks-unidos.net>
+ *
+ */
+
+struct ts_filter_group_configuration {
+ int extent;
+ int close_enough;
+ int threshold;
+ int attempts;
+};
+
+struct ts_filter_group {
+ struct ts_filter tsf;
+ struct ts_filter_group_configuration *config;
+
+ int N; /* How many samples we have */
+ int *samples[MAX_TS_FILTER_COORDS]; /* the samples, our input */
+
+ int *group_size; /* used for temporal computations */
+ int *sorted_samples; /* used for temporal computations */
+
+ int range_max[MAX_TS_FILTER_COORDS]; /* max computed ranges */
+ int range_min[MAX_TS_FILTER_COORDS]; /* min computed ranges */
+
+ int tries_left; /* We finish if we don't get enough samples */
+};
+
+extern struct ts_filter_api ts_filter_group_api;
+
+#endif
diff --git a/include/linux/ts_filter_variance.h b/include/linux/ts_filter_variance.h
deleted file mode 100644
index 574cf90f3f5..00000000000
--- a/include/linux/ts_filter_variance.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef __TS_FILTER_VARIANCE_H__
-#define __TS_FILTER_VARIANCE_H__
-
-#include <linux/ts_filter.h>
-
-/*
- * touchscreen filter
- *
- * Variance
- *
- * Copyright (C) 2008 by Openmoko, Inc.
- * Author: Nelson Castillo <arhuaco@freaks-unidos.net>
- *
- */
-
-struct ts_filter_variance_configuration {
- int extent;
- int window;
- int threshold;
- int attempts;
-};
-
-struct ts_filter_variance {
- struct ts_filter tsf;
- struct ts_filter_variance_configuration *config;
-
- int *samples[2];
- int N; /* How many samples we have */
-
- int tries_left; /* How many times we can try to get a point */
- int passed; /* Did the samples pass the test? */
-};
-
-extern struct ts_filter_api ts_filter_variance_api;
-
-#endif