From 24b8b215065de2e3de9a5531976e32fe62313de8 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 18 Oct 2019 13:00:05 -0700 Subject: 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 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1869533 --- driver/fingerprint/fpc/bep/build.mk | 6 ------ driver/fingerprint/fpc/bep/fpc1025_private.h | 3 --- driver/fingerprint/fpc/bep/fpc1035_private.h | 3 --- driver/fingerprint/fpc/bep/fpc_private.c | 6 +++--- driver/fingerprint/fpc/bep/fpc_sensor_spi.c | 2 +- 5 files changed, 4 insertions(+), 16 deletions(-) (limited to 'driver/fingerprint/fpc/bep') 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) -- cgit v1.2.1