summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVic Yang <victoryang@chromium.org>2014-05-29 14:15:38 -0700
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-05-31 03:57:33 +0000
commit4b396a05c455654b570c1c59ea44250be21b1075 (patch)
tree34138385fbb466bf62f36c8393ecd003e4c8a4b1
parent200246949abb240788d89645c572d14f0a0a8b96 (diff)
downloadchrome-ec-4b396a05c455654b570c1c59ea44250be21b1075.tar.gz
Keyborg: options to turn on/off fast scan mode
For experiments, we sometimes need to turn off fast scan mode. Let's add an option so that this can be easily done. BUG=None TEST=Manual test with fast scan mode on/off. BRANCH=None Change-Id: Icd9a4a4b18699f34f424e84167748fcfe30588e3 Signed-off-by: Vic Yang <victoryang@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/202141 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
-rw-r--r--board/keyborg/board.h1
-rw-r--r--board/keyborg/touch_scan.c12
2 files changed, 13 insertions, 0 deletions
diff --git a/board/keyborg/board.h b/board/keyborg/board.h
index d0dadffc2d..b1750575a6 100644
--- a/board/keyborg/board.h
+++ b/board/keyborg/board.h
@@ -13,6 +13,7 @@
/* Optional features */
#define CONFIG_DEBUG_PRINTF
+#define CONFIG_KEYBORG_FAST_SCAN
#undef CONFIG_ADC
#undef CONFIG_COMMON_GPIO
#undef CONFIG_COMMON_PANIC_OUTPUT
diff --git a/board/keyborg/touch_scan.c b/board/keyborg/touch_scan.c
index b69ccfe33f..01642d2958 100644
--- a/board/keyborg/touch_scan.c
+++ b/board/keyborg/touch_scan.c
@@ -148,6 +148,7 @@ static inline void set_scan_needed(int col)
scan_needed[word + 1] |= SPAN_MASK >> (32 - bit);
}
+#ifdef CONFIG_KEYBORG_FAST_SCAN
int fast_scan(uint32_t *data)
{
int col;
@@ -181,6 +182,17 @@ int fast_scan(uint32_t *data)
return EC_SUCCESS;
}
+#else
+int fast_scan(uint32_t *data)
+{
+ int col;
+
+ for (col = 0; col < COL_COUNT * 2; ++col)
+ set_scan_needed(col);
+
+ return EC_SUCCESS;
+}
+#endif
void scan_column(uint8_t *data)
{