diff options
| author | Yicheng Li <yichengli@chromium.org> | 2021-03-02 15:38:17 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-04-02 23:16:12 +0000 |
| commit | ac08c9d1dbc9f587df3ee6b15d58c0203f7e356e (patch) | |
| tree | 04cd12d6787ce1b0b99b1d4e0aff504ccfa2c35e /driver/fingerprint/elan/elan_sensor_pal.c | |
| parent | e3cbbc3461c83d2d97b78447c53db1c6540cb3be (diff) | |
| download | chrome-ec-ac08c9d1dbc9f587df3ee6b15d58c0203f7e356e.tar.gz | |
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>
Diffstat (limited to 'driver/fingerprint/elan/elan_sensor_pal.c')
| -rw-r--r-- | driver/fingerprint/elan/elan_sensor_pal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/driver/fingerprint/elan/elan_sensor_pal.c b/driver/fingerprint/elan/elan_sensor_pal.c index b59368b835..a185e655c4 100644 --- a/driver/fingerprint/elan/elan_sensor_pal.c +++ b/driver/fingerprint/elan/elan_sensor_pal.c @@ -225,7 +225,8 @@ int elan_fp_maintenance(uint16_t *error_state) *error_state &= 0xFC00; sensor_info.num_defective_pixels = 0; sensor_info.sensor_error_code = 0; - rv = fp_sensor_maintenance(&sensor_info); + /* TODO(b/184289118): Rename to fp_sensor_maintenance_elan. */ + rv = elan_fp_sensor_maintenance(&sensor_info); LOGE_SA("Maintenance took %d ms", time_since32(start) / MSEC); if (rv != 0) { |