diff options
| author | Tom Hughes <tomhughes@chromium.org> | 2019-10-01 15:08:19 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-10-03 01:16:43 +0000 |
| commit | 8357a4fb160bda9a3c926c674492cb604421b7f1 (patch) | |
| tree | f8687171fc120bedf920b88cb0cbbb7f270e8597 /common/fpsensor | |
| parent | a10b8681986558e47c44fd8941e2532ea941319f (diff) | |
| download | chrome-ec-8357a4fb160bda9a3c926c674492cb604421b7f1.tar.gz | |
fpsensor: Fix public build
Add stubs for fp_sensor_init and fp_sensor_deinit when building without
the private FP sensor files.
BRANCH=none
BUG=b:124773209,b:141924178
TEST=make buildall -j
Change-Id: Ie85a4bb0e568b205ada0d378ae658e8fe478c0a9
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1834274
Reviewed-by: Nicolas Norvez <norvez@chromium.org>
Diffstat (limited to 'common/fpsensor')
| -rw-r--r-- | common/fpsensor/build.mk | 3 | ||||
| -rw-r--r-- | common/fpsensor/fpsensor_stubs.c | 30 |
2 files changed, 33 insertions, 0 deletions
diff --git a/common/fpsensor/build.mk b/common/fpsensor/build.mk index 7df7dbaf28..9556515f2f 100644 --- a/common/fpsensor/build.mk +++ b/common/fpsensor/build.mk @@ -12,3 +12,6 @@ all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor_crypto.o ifneq ($(CONFIG_SPI_FP_PORT),) all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor.o endif +ifeq ($(HAS_MOCK_FPSENSOR),) +all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor_stubs.o +endif diff --git a/common/fpsensor/fpsensor_stubs.c b/common/fpsensor/fpsensor_stubs.c new file mode 100644 index 0000000000..3acaa689f5 --- /dev/null +++ b/common/fpsensor/fpsensor_stubs.c @@ -0,0 +1,30 @@ +/* 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. + */ + +#include "common.h" +#include "fpsensor_state.h" +#include "panic.h" + +/* + * These are built when we don't have the private driver files. + * The definitions are intentionally kept separate from the mock + * implementations so that we don't accidentally compile mocks into a release. + */ + +#if !defined(HAVE_FP_PRIVATE_DRIVER) + +int fp_sensor_init(void) +{ + panic("fp_sensor_init stub should never be called\n"); + return EC_ERROR_UNKNOWN; +} + +int fp_sensor_deinit(void) +{ + panic("fp_sensor_deinit stub should never be called\n"); + return EC_ERROR_UNKNOWN; +} + +#endif /* !HAVE_FP_PRIVATE_DRIVER */ |