diff options
| author | Bobby Casey <bobbycasey@google.com> | 2023-02-20 12:34:45 -0500 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-03 20:24:54 +0000 |
| commit | b77339bd7ffd539963687796846be56c38d611aa (patch) | |
| tree | bc7fddd53aa21ba5ccf93b9eafd2dcf131c8926a /driver | |
| parent | 53a1bd42ccff3942c75ca5e4790af0b358688615 (diff) | |
| download | chrome-ec-b77339bd7ffd539963687796846be56c38d611aa.tar.gz | |
fingerprint/elan: Add _ELAN suffix to ELAN macros
This commit builds successfully but is not testable without an elan
sensor on an icetower board.
This commit is based on http://crrev.com/c/2727971, which was reverted
in http://crrev.com/c/2810517
BRANCH=none
BUG=b:264457390
TEST=build dartmonkey target modified to use elan sensor
Signed-off-by: Bobby Casey <bobbycasey@google.com>
Change-Id: Ifca9113e82deaf96a262256fab5aa48f2cdb2c61
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4273189
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/fingerprint/elan/elan_private.c | 8 | ||||
| -rw-r--r-- | driver/fingerprint/elan/elan_sensor.h | 27 | ||||
| -rw-r--r-- | driver/fingerprint/fpsensor.h | 5 |
3 files changed, 23 insertions, 17 deletions
diff --git a/driver/fingerprint/elan/elan_private.c b/driver/fingerprint/elan/elan_private.c index 1e50855661..410efd1cef 100644 --- a/driver/fingerprint/elan/elan_private.c +++ b/driver/fingerprint/elan/elan_private.c @@ -34,11 +34,11 @@ static struct ec_response_fp_info ec_fp_sensor_info = { .model_id = MID, .version = VERSION, /* Image frame characteristics */ - .frame_size = FP_SENSOR_RES_X * FP_SENSOR_RES_Y, + .frame_size = FP_SENSOR_RES_X_ELAN * FP_SENSOR_RES_Y_ELAN, .pixel_format = V4L2_PIX_FMT_GREY, - .width = FP_SENSOR_RES_X, - .height = FP_SENSOR_RES_Y, - .bpp = FP_SENSOR_RES_BPP, + .width = FP_SENSOR_RES_X_ELAN, + .height = FP_SENSOR_RES_Y_ELAN, + .bpp = FP_SENSOR_RES_BPP_ELAN, }; /** diff --git a/driver/fingerprint/elan/elan_sensor.h b/driver/fingerprint/elan/elan_sensor.h index 168c233e7b..d7b9de70a7 100644 --- a/driver/fingerprint/elan/elan_sensor.h +++ b/driver/fingerprint/elan/elan_sensor.h @@ -10,27 +10,28 @@ /* Sensor pixel resolution */ #if defined(CONFIG_FP_SENSOR_ELAN80) -#define FP_SENSOR_IMAGE_SIZE (80 * 80) -#define FP_SENSOR_RES_X 80 -#define FP_SENSOR_RES_Y 80 +#define FP_SENSOR_IMAGE_SIZE_ELAN (80 * 80) +#define FP_SENSOR_RES_X_ELAN 80 +#define FP_SENSOR_RES_Y_ELAN 80 #if defined(CHIP_FAMILY_STM32F4) -#define FP_ALGORITHM_TEMPLATE_SIZE 15000 +#define FP_ALGORITHM_TEMPLATE_SIZE_ELAN 15000 #elif defined(CHIP_FAMILY_STM32H7) -#define FP_ALGORITHM_TEMPLATE_SIZE 40960 +#define FP_ALGORITHM_TEMPLATE_SIZE_ELAN 40960 #endif -#define FP_MAX_FINGER_COUNT 3 +#define FP_MAX_FINGER_COUNT_ELAN 3 #elif defined(CONFIG_FP_SENSOR_ELAN515) -#define FP_SENSOR_IMAGE_SIZE (52 * 150) -#define FP_SENSOR_RES_X 52 -#define FP_SENSOR_RES_Y 150 +#define FP_SENSOR_IMAGE_SIZE_ELAN (52 * 150) +#define FP_SENSOR_RES_X_ELAN 52 +#define FP_SENSOR_RES_Y_ELAN 150 #if defined(CHIP_FAMILY_STM32F4) -#define FP_ALGORITHM_TEMPLATE_SIZE 15000 +#define FP_ALGORITHM_TEMPLATE_SIZE_ELAN 15000 #elif defined(CHIP_FAMILY_STM32H7) -#define FP_ALGORITHM_TEMPLATE_SIZE 67000 +#define FP_ALGORITHM_TEMPLATE_SIZE_ELAN 67000 #endif -#define FP_MAX_FINGER_COUNT 3 +#define FP_MAX_FINGER_COUNT_ELAN 3 #endif -#define FP_SENSOR_RES_BPP (8) + +#define FP_SENSOR_RES_BPP_ELAN (8) /** * Set ELAN fingerprint sensor into finger touch detects and power saving mode diff --git a/driver/fingerprint/fpsensor.h b/driver/fingerprint/fpsensor.h index 219d182ea1..ff8ac47058 100644 --- a/driver/fingerprint/fpsensor.h +++ b/driver/fingerprint/fpsensor.h @@ -10,6 +10,11 @@ #define HAVE_FP_PRIVATE_DRIVER #if defined(CONFIG_FP_SENSOR_ELAN80) || defined(CONFIG_FP_SENSOR_ELAN515) #include "elan/elan_sensor.h" +#define FP_SENSOR_IMAGE_SIZE (FP_SENSOR_IMAGE_SIZE_ELAN) +#define FP_SENSOR_RES_X (FP_SENSOR_RES_X_ELAN) +#define FP_SENSOR_RES_Y (FP_SENSOR_RES_Y_ELAN) +#define FP_ALGORITHM_TEMPLATE_SIZE (FP_ALGORITHM_TEMPLATE_SIZE_ELAN) +#define FP_MAX_FINGER_COUNT (FP_MAX_FINGER_COUNT_ELAN) #else #include "fpc/fpc_sensor.h" #define FP_SENSOR_IMAGE_SIZE (FP_SENSOR_IMAGE_SIZE_FPC) |