diff options
author | Tom Hughes <tomhughes@chromium.org> | 2019-10-18 13:00:05 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-10-28 23:06:18 +0000 |
commit | 24b8b215065de2e3de9a5531976e32fe62313de8 (patch) | |
tree | 2ca0b857ace514462b22a7b391384d31b21e02ae | |
parent | bc2a8f70d1eeb449b404ceb2e97a526562c700e1 (diff) | |
download | chrome-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
-rw-r--r-- | driver/fingerprint/fpc/bep/build.mk | 6 | ||||
-rw-r--r-- | driver/fingerprint/fpc/bep/fpc1025_private.h | 3 | ||||
-rw-r--r-- | driver/fingerprint/fpc/bep/fpc1035_private.h | 3 | ||||
-rw-r--r-- | driver/fingerprint/fpc/bep/fpc_private.c | 6 | ||||
-rw-r--r-- | driver/fingerprint/fpc/bep/fpc_sensor_spi.c | 2 | ||||
-rw-r--r-- | driver/fingerprint/fpc/fpc_sensor.h | 21 | ||||
-rw-r--r-- | driver/fingerprint/fpc/libfp/build.mk | 6 | ||||
-rw-r--r-- | driver/fingerprint/fpc/libfp/fpc1145_private.h | 3 | ||||
-rw-r--r-- | driver/fingerprint/fpc/libfp/fpc_private.c | 4 | ||||
-rw-r--r-- | driver/fingerprint/fpsensor.h | 26 | ||||
-rw-r--r-- | include/config.h | 6 | ||||
-rw-r--r-- | include/fpsensor_state.h | 19 |
12 files changed, 63 insertions, 42 deletions
diff --git a/driver/fingerprint/fpc/bep/build.mk b/driver/fingerprint/fpc/bep/build.mk index fc704e172a..ac7f05fb60 100644 --- a/driver/fingerprint/fpc/bep/build.mk +++ b/driver/fingerprint/fpc/bep/build.mk @@ -10,14 +10,8 @@ _bep_cur_dir:=$(dir $(lastword $(MAKEFILE_LIST))) # Make sure output directory is created (in build directory) dirs-y+="$(_bep_cur_dir)" -sensor-$(CONFIG_FP_SENSOR_FPC1025)=fpc1025 -sensor-$(CONFIG_FP_SENSOR_FPC1035)=fpc1035 - # Only build for these objects for the RW image all-obj-rw+=$(_bep_cur_dir)fpc_misc.o \ $(_bep_cur_dir)fpc_private.o \ $(_bep_cur_dir)fpc_sensor_spi.o \ $(_bep_cur_dir)fpc_timebase.o -fp_sensor_header-rw=$(_bep_cur_dir)$(sensor-rw)_private.h - -CPPFLAGS+=-DFP_SENSOR_PRIVATE=$(fp_sensor_header-rw) diff --git a/driver/fingerprint/fpc/bep/fpc1025_private.h b/driver/fingerprint/fpc/bep/fpc1025_private.h index eddb435d4a..2da127741f 100644 --- a/driver/fingerprint/fpc/bep/fpc1025_private.h +++ b/driver/fingerprint/fpc/bep/fpc1025_private.h @@ -6,9 +6,6 @@ #ifndef __CROS_EC_FPC1025_PRIVATE_H #define __CROS_EC_FPC1025_PRIVATE_H -/* Define sensor type */ -#define FP_SENSOR_CONFIG_FPC1025 - /* The 16-bit hardware ID is 0x021y */ #define FP_SENSOR_HWID 0x021 diff --git a/driver/fingerprint/fpc/bep/fpc1035_private.h b/driver/fingerprint/fpc/bep/fpc1035_private.h index 61c423c6b8..695228898b 100644 --- a/driver/fingerprint/fpc/bep/fpc1035_private.h +++ b/driver/fingerprint/fpc/bep/fpc1035_private.h @@ -6,9 +6,6 @@ #ifndef __CROS_EC_FPC1035_PRIVATE_H #define __CROS_EC_FPC1035_PRIVATE_H -/* Define sensor type */ -#define FP_SENSOR_CONFIG_FPC1035 - /* The 16-bit hardware ID is 0x011y */ #define FP_SENSOR_HWID 0x011 diff --git a/driver/fingerprint/fpc/bep/fpc_private.c b/driver/fingerprint/fpc/bep/fpc_private.c index f69cffb0ce..9bcd4f65ff 100644 --- a/driver/fingerprint/fpc/bep/fpc_private.c +++ b/driver/fingerprint/fpc/bep/fpc_private.c @@ -12,7 +12,7 @@ #include "system.h" #include "util.h" -#include STRINGIFY(FP_SENSOR_PRIVATE) +#include "driver/fingerprint/fpc/fpc_sensor.h" /* Console output macros */ #define CPRINTF(format, args...) cprintf(CC_FP, format, ## args) @@ -55,7 +55,7 @@ typedef struct { uint32_t image_buffer_size; } fpc_sensor_info_t; -#if defined(FP_SENSOR_CONFIG_FPC1025) +#if defined(CONFIG_FP_SENSOR_FPC1025) extern const fpc_bep_sensor_t fpc_bep_sensor_1025; extern const fpc_bep_algorithm_t fpc_bep_algorithm_pfe_1025; @@ -70,7 +70,7 @@ const fpc_bio_info_t fpc_bio_info = { .template_size = FP_ALGORITHM_TEMPLATE_SIZE, }; -#elif defined(FP_SENSOR_CONFIG_FPC1035) +#elif defined(CONFIG_FP_SENSOR_FPC1035) extern const fpc_bep_sensor_t fpc_bep_sensor_1035; extern const fpc_bep_algorithm_t fpc_bep_algorithm_pfe_1035; diff --git a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c index 3db3713702..225752bdb6 100644 --- a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c +++ b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c @@ -16,7 +16,7 @@ #include "spi.h" #include "util.h" -#include STRINGIFY(FP_SENSOR_PRIVATE) +#include "driver/fingerprint/fpc/fpc_sensor.h" /* Console output macros */ #define CPRINTF(format, args...) cprintf(CC_FP, format, ##args) diff --git a/driver/fingerprint/fpc/fpc_sensor.h b/driver/fingerprint/fpc/fpc_sensor.h new file mode 100644 index 0000000000..da67696a0c --- /dev/null +++ b/driver/fingerprint/fpc/fpc_sensor.h @@ -0,0 +1,21 @@ +/* Copyright 2019 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef __CROS_EC_DRIVER_FINGERPRINT_FPC_FPC_SENSOR_H_ +#define __CROS_EC_DRIVER_FINGERPRINT_FPC_FPC_SENSOR_H_ + +#include "common.h" + +#if defined(CONFIG_FP_SENSOR_FPC1025) +#include "bep/fpc1025_private.h" +#elif defined(CONFIG_FP_SENSOR_FPC1035) +#include "bep/fpc1035_private.h" +#elif defined(CONFIG_FP_SENSOR_FPC1145) +#include "libfp/fpc1145_private.h" +#else +#error "Sensor type not defined!" +#endif + +#endif /* __CROS_EC_DRIVER_FINGERPRINT_FPC_FPC_SENSOR_H_ */ diff --git a/driver/fingerprint/fpc/libfp/build.mk b/driver/fingerprint/fpc/libfp/build.mk index 8e745f728a..3fabab38e9 100644 --- a/driver/fingerprint/fpc/libfp/build.mk +++ b/driver/fingerprint/fpc/libfp/build.mk @@ -10,12 +10,6 @@ libfp_cur_dir:=$(dir $(lastword $(MAKEFILE_LIST))) # Make sure output directory is created (in build directory) dirs-y+="$(libfp_cur_dir)" -sensor-$(CONFIG_FP_SENSOR_FPC1145)=fpc1145 - # Only build for these objects for the RW image all-obj-rw+=$(libfp_cur_dir)fpc_sensor_pal.o \ $(libfp_cur_dir)fpc_private.o -fp_sensor_header-rw=$(libfp_cur_dir)$(sensor-rw)_private.h - -CPPFLAGS+=-DFP_SENSOR_PRIVATE=$(fp_sensor_header-rw) -CPPFLAGS+=-DFP_SENSOR_CONFIG=$(call uppercase,$(sensor-rw)) diff --git a/driver/fingerprint/fpc/libfp/fpc1145_private.h b/driver/fingerprint/fpc/libfp/fpc1145_private.h index ad1e824942..91b072d6a2 100644 --- a/driver/fingerprint/fpc/libfp/fpc1145_private.h +++ b/driver/fingerprint/fpc/libfp/fpc1145_private.h @@ -11,6 +11,9 @@ /* The 16-bit hardware ID is 0x140y */ #define FP_SENSOR_HWID 0x140 +/* Sensor type name */ +#define FP_SENSOR_NAME "FPC1145" + /* Sensor pixel resolution */ #define FP_SENSOR_RES_Y 192 #define FP_SENSOR_RES_X 56 diff --git a/driver/fingerprint/fpc/libfp/fpc_private.c b/driver/fingerprint/fpc/libfp/fpc_private.c index 1ee7f29a79..e734a94734 100644 --- a/driver/fingerprint/fpc/libfp/fpc_private.c +++ b/driver/fingerprint/fpc/libfp/fpc_private.c @@ -17,13 +17,11 @@ #include "timer.h" #include "util.h" -#include STRINGIFY(FP_SENSOR_PRIVATE) +#include "driver/fingerprint/fpc/fpc_sensor.h" #define CPRINTF(format, args...) cprintf(CC_FP, format, ## args) #define CPRINTS(format, args...) cprints(CC_FP, format, ## args) -#define FP_SENSOR_NAME STRINGIFY(FP_SENSOR_CONFIG) - /* Minimum reset duration */ #define FP_SENSOR_RESET_DURATION_US (10 * MSEC) /* Maximum delay for the interrupt to be asserted after the sensor is reset */ diff --git a/driver/fingerprint/fpsensor.h b/driver/fingerprint/fpsensor.h new file mode 100644 index 0000000000..be7565c5d4 --- /dev/null +++ b/driver/fingerprint/fpsensor.h @@ -0,0 +1,26 @@ +/* Copyright 2019 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef __CROS_EC_DRIVER_FINGERPRINT_FPSENSOR_H_ +#define __CROS_EC_DRIVER_FINGERPRINT_FPSENSOR_H_ + +#if defined(HAVE_PRIVATE) && !defined(TEST_BUILD) +#define HAVE_FP_PRIVATE_DRIVER +#include "fpc/fpc_sensor.h" +#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 + +#endif /* __CROS_EC_DRIVER_FINGERPRINT_FPSENSOR_H_ */ diff --git a/include/config.h b/include/config.h index 741c618316..a4d3545422 100644 --- a/include/config.h +++ b/include/config.h @@ -1768,6 +1768,12 @@ #undef CONFIG_FLASH_NVCTR_BASE_B /*****************************************************************************/ +/* Fingerprint Sensor Configuration */ +#undef CONFIG_FP_SENSOR_FPC1025 +#undef CONFIG_FP_SENSOR_FPC1035 +#undef CONFIG_FP_SENSOR_FPC1145 + +/*****************************************************************************/ /* NvMem Configuration */ /* Enable NV Memory module within flash */ #undef CONFIG_FLASH_NVMEM 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 + \ |