fpsensor: Support building firmware that works for both sensors

This is a refactoring to allow building FPMCU firmware that works for
one FPC sensor and one ELAN sensor.

1. When both drivers implement our common functions, e.g. fp_sensor_init(),
   rename them to fp_sensor_init_fpc() and fp_sensor_init_elan().
2. There are a few functions implemented not in FPC driver but in FPC
   private library, e.g. fp_sensor_finger_status(). I kept this as-is for
   FPC but renamed the one in ELAN driver to fp_sensor_finger_status_elan()
3. If building for ELAN, need to hardcode elan=1 in hatch_fp/board.c
   because the sensor type GPIO always says FPC.

BRANCH=none
BUG=b:175158241
TEST=make run-fpsensor; make run-fpsensor_status;
     make run-fpsensor_crypto
TEST=make -j BOARD=dartmonkey
TEST=add CONFIG_FP_SENSOR_ELAN515 to board/hatch_fp/board.h;
     make -j BOARD=bloonchipper
     Firmware binary fully works on Dragonair (FPC) and Voema (ELAN)
TEST=run device tests with http://crrev/c/2750547 and
	http://crrev/i/3654297 on Dragonclaw, all pass

Change-Id: I789090dbdfe35ac6aefd6a629fa4c7bde89dc437
Signed-off-by: Yicheng Li <yichengli@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2727971
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Commit-Queue: Tom Hughes <tomhughes@chromium.org>

1 files changed, 37 insertions, 15 deletions

diff --git a/common/mock/fp_sensor_mock.c b/common/mock/fp_sensor_mock.c
index 363f092ff1..f8da209aa7 100644
--- a/common/mock/fp_sensor_mock.c
+++ b/common/mock/fp_sensor_mock.c
@@ -20,68 +20,90 @@
 
 struct mock_ctrl_fp_sensor mock_ctrl_fp_sensor = MOCK_CTRL_DEFAULT_FP_SENSOR;
 
-int fp_sensor_init(void)
+int fp_sensor_init_mock(void)
 {
 	return mock_ctrl_fp_sensor.fp_sensor_init_return;
 }
 
-int fp_sensor_deinit(void)
+int fp_sensor_deinit_mock(void)
 {
 	return mock_ctrl_fp_sensor.fp_sensor_deinit_return;
 }
 
-int fp_sensor_get_info(struct ec_response_fp_info *resp)
+int fp_sensor_get_info_mock(struct ec_response_fp_info *resp)
 {
 	resp->version = 0;
 	return mock_ctrl_fp_sensor.fp_sensor_get_info_return;
 }
 
-void fp_sensor_low_power(void)
+void fp_sensor_low_power_mock(void)
 {
 }
 
-void fp_sensor_configure_detect(void)
+void fp_sensor_configure_detect_mock(void)
 {
 }
 
-enum finger_state fp_sensor_finger_status(void)
+enum finger_state fp_sensor_finger_status_mock(void)
 {
 	return mock_ctrl_fp_sensor.fp_sensor_finger_status_return;
 }
 
-int fp_sensor_acquire_image(uint8_t *image_data)
+int fp_sensor_acquire_image_mock(uint8_t *image_data)
 {
 	return mock_ctrl_fp_sensor.fp_sensor_acquire_image_return;
 }
 
-int fp_sensor_acquire_image_with_mode(uint8_t *image_data, int mode)
+int fp_sensor_acquire_image_with_mode_mock(uint8_t *image_data, int mode)
 {
 	return mock_ctrl_fp_sensor.fp_sensor_acquire_image_with_mode_return;
 }
 
-int fp_finger_match(void *templ, uint32_t templ_count,
-		    uint8_t *image, int32_t *match_index,
-		    uint32_t *update_bitmap)
+int fp_finger_match_mock(void *templ, uint32_t templ_count, uint8_t *image,
+			 int32_t *match_index, uint32_t *update_bitmap)
 {
 	return mock_ctrl_fp_sensor.fp_finger_match_return;
 }
 
-int fp_enrollment_begin(void)
+int fp_enrollment_begin_mock(void)
 {
 	return mock_ctrl_fp_sensor.fp_enrollment_begin_return;
 }
 
-int fp_enrollment_finish(void *templ)
+int fp_enrollment_finish_mock(void *templ)
 {
 	return mock_ctrl_fp_sensor.fp_enrollment_finish_return;
 }
 
-int fp_finger_enroll(uint8_t *image, int *completion)
+int fp_finger_enroll_mock(uint8_t *image, int *completion)
 {
 	return mock_ctrl_fp_sensor.fp_finger_enroll_return;
 }
 
-int fp_maintenance(void)
+int fp_maintenance_mock(void)
 {
 	return mock_ctrl_fp_sensor.fp_maintenance_return;
 }
+
+struct fp_sensor_interface fp_driver_mock = {
+	.sensor_type = FP_SENSOR_TYPE_UNKNOWN,
+	.fp_sensor_init = &fp_sensor_init_mock,
+	.fp_sensor_deinit = &fp_sensor_deinit_mock,
+	.fp_sensor_get_info = &fp_sensor_get_info_mock,
+	.fp_sensor_low_power = &fp_sensor_low_power_mock,
+	.fp_sensor_configure_detect_ = &fp_sensor_configure_detect_mock,
+	.fp_sensor_finger_status_ = &fp_sensor_finger_status_mock,
+	.fp_sensor_acquire_image_with_mode_ =
+		&fp_sensor_acquire_image_with_mode_mock,
+	.fp_finger_enroll = &fp_finger_enroll_mock,
+	.fp_finger_match = &fp_finger_match_mock,
+	.fp_enrollment_begin = &fp_enrollment_begin_mock,
+	.fp_enrollment_finish = &fp_enrollment_finish_mock,
+	.fp_maintenance = &fp_maintenance_mock,
+	.algorithm_template_size = 0,
+	.encrypted_template_size =
+		FP_POSITIVE_MATCH_SALT_BYTES +
+		sizeof(struct ec_fp_template_encryption_metadata),
+	.res_x = 0,
+	.res_y = 0
+};