summaryrefslogtreecommitdiff
path: root/include/fpsensor_state.h
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2019-10-18 13:00:05 -0700
committerCommit Bot <commit-bot@chromium.org>2019-10-28 23:06:18 +0000
commit24b8b215065de2e3de9a5531976e32fe62313de8 (patch)
tree2ca0b857ace514462b22a7b391384d31b21e02ae /include/fpsensor_state.h
parentbc2a8f70d1eeb449b404ceb2e97a526562c700e1 (diff)
downloadchrome-ec-24b8b215065de2e3de9a5531976e32fe62313de8.tar.gz
fpsensor: Clean up headers and Makefiles
We no longer need the various levels of indirection since the source files are public. BRANCH=none BUG=b:137848573 TEST=make buildall -j Cq-Depend: chrome-internal:2005128 Change-Id: I7483c233dc54c5dbf2907441365feffc9ae9f0a5 Signed-off-by: Tom Hughes <tomhughes@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1869533
Diffstat (limited to 'include/fpsensor_state.h')
-rw-r--r--include/fpsensor_state.h19
1 files changed, 2 insertions, 17 deletions
diff --git a/include/fpsensor_state.h b/include/fpsensor_state.h
index f7bb3a3f1e..6b752bc86d 100644
--- a/include/fpsensor_state.h
+++ b/include/fpsensor_state.h
@@ -15,6 +15,8 @@
#include "link_defs.h"
#include "timer.h"
+#include "driver/fingerprint/fpsensor.h"
+
/* if no special memory regions are defined, fallback on regular SRAM */
#ifndef FP_FRAME_SECTION
#define FP_FRAME_SECTION
@@ -23,23 +25,6 @@
#define FP_TEMPLATE_SECTION
#endif
-#if defined(HAVE_PRIVATE) && !defined(TEST_BUILD)
-#define HAVE_FP_PRIVATE_DRIVER
-/* Include the device specific header file */
-#define PRIV_HEADER(header) STRINGIFY(header)
-#include PRIV_HEADER(FP_SENSOR_PRIVATE)
-#else
-/* These values are used by the host (emulator) tests. */
-#define FP_SENSOR_IMAGE_SIZE 0
-#define FP_SENSOR_RES_X 0
-#define FP_SENSOR_RES_Y 0
-#define FP_ALGORITHM_TEMPLATE_SIZE 0
-#define FP_MAX_FINGER_COUNT 5
-#endif
-#ifdef TEST_BUILD
-/* This represents the mock of the private */
-#define HAVE_FP_PRIVATE_DRIVER
-#endif
#define SBP_ENC_KEY_LEN 16
#define FP_ALGORITHM_ENCRYPTED_TEMPLATE_SIZE \
(FP_ALGORITHM_TEMPLATE_SIZE + \