From 5866ec2921784004f66f9a0407f97c1659d674fb Mon Sep 17 00:00:00 2001 From: Craig Hesling Date: Wed, 31 Jul 2019 10:30:05 -0700 Subject: mock: Add fp_sensor and mkbp_events mocks BRANCH=none BUG=b:116065496 TEST=make buildall -j Change-Id: Ia723d98354ca027f41f1b3c00d6a2dac500edbf8 Signed-off-by: Craig Hesling Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1715633 Reviewed-by: Tom Hughes Commit-Queue: Sean Abraham --- common/fpsensor/build.mk | 2 +- common/mock/README.md | 2 +- common/mock/build.mk | 3 +- common/mock/fp_sensor_mock.c | 78 ++++++++++++++++++++++++++++++++++++++++++ common/mock/fpsensor_mock.c | 17 --------- common/mock/mkbp_events_mock.c | 22 ++++++++++++ common/mock/rollback_mock.c | 6 +++- 7 files changed, 109 insertions(+), 21 deletions(-) create mode 100644 common/mock/fp_sensor_mock.c delete mode 100644 common/mock/fpsensor_mock.c create mode 100644 common/mock/mkbp_events_mock.c (limited to 'common') diff --git a/common/fpsensor/build.mk b/common/fpsensor/build.mk index 9556515f2f..687496bf2a 100644 --- a/common/fpsensor/build.mk +++ b/common/fpsensor/build.mk @@ -12,6 +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),) +ifeq ($(HAS_MOCK_FP_SENSOR),) all-obj-$(HAS_TASK_FPSENSOR)+=$(_fpsensor_dir)fpsensor_stubs.o endif diff --git a/common/mock/README.md b/common/mock/README.md index 0044856639..e1962651a6 100644 --- a/common/mock/README.md +++ b/common/mock/README.md @@ -43,7 +43,7 @@ Example `.mocklist`: #define CONFIG_TEST_MOCK_LIST \ MOCK(ROLLBACK) \ - MOCK(FPSENSOR) + MOCK(FP_SENSOR) ``` If you need additional mock control functionality, you may need to include diff --git a/common/mock/build.mk b/common/mock/build.mk index 882cf6ccb9..c8aac53723 100644 --- a/common/mock/build.mk +++ b/common/mock/build.mk @@ -4,7 +4,8 @@ # See common/mock/README.md for more information. -mock-$(HAS_MOCK_FPSENSOR) += fpsensor_mock.o +mock-$(HAS_MOCK_FP_SENSOR) += fp_sensor_mock.o +mock-$(HAS_MOCK_MKBP_EVENTS) += mkbp_events_mock.o mock-$(HAS_MOCK_ROLLBACK) += rollback_mock.o mock-$(HAS_MOCK_TCPC) += tcpc_mock.o mock-$(HAS_MOCK_TIMER) += timer_mock.o diff --git a/common/mock/fp_sensor_mock.c b/common/mock/fp_sensor_mock.c new file mode 100644 index 0000000000..778b7c270d --- /dev/null +++ b/common/mock/fp_sensor_mock.c @@ -0,0 +1,78 @@ +/* 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. + */ + +/** + * @file + * @brief Mock fpsensor private driver + */ + +#include + +#include "common.h" +#include "fpsensor.h" +#include "mock/fp_sensor_mock.h" + +struct mock_ctrl_fp_sensor mock_ctrl_fp_sensor = MOCK_CTRL_DEFAULT_FP_SENSOR; + +int fp_sensor_init(void) +{ + return mock_ctrl_fp_sensor.fp_sensor_init_return; +} + +int fp_sensor_deinit(void) +{ + return mock_ctrl_fp_sensor.fp_sensor_deinit_return; +} + +int fp_sensor_get_info(struct ec_response_fp_info *resp) +{ + resp->version = 0; + return mock_ctrl_fp_sensor.fp_sensor_get_info_return; +} + +void fp_sensor_low_power(void) +{ +} + +void fp_sensor_configure_detect(void) +{ +} + +enum finger_state fp_sensor_finger_status(void) +{ + return mock_ctrl_fp_sensor.fp_sensor_finger_status_return; +} + +int fp_sensor_acquire_image(uint8_t *image_data) +{ + return mock_ctrl_fp_sensor.fp_sensor_acquire_image_return; +} + +int fp_sensor_acquire_image_with_mode(uint8_t *image_data, int mode) +{ + return mock_ctrl_fp_sensor.fp_sensor_acquire_image_with_mode_return; +} + +int fp_finger_match(void *templ, uint32_t templ_count, + uint8_t *image, int32_t *match_index, + uint32_t *update_bitmap) +{ + return mock_ctrl_fp_sensor.fp_finger_match_return; +} + +int fp_enrollment_begin(void) +{ + return mock_ctrl_fp_sensor.fp_enrollment_begin_return; +} + +int fp_enrollment_finish(void *templ) +{ + return mock_ctrl_fp_sensor.fp_enrollment_finish_return; +} + +int fp_finger_enroll(uint8_t *image, int *completion) +{ + return mock_ctrl_fp_sensor.fp_finger_enroll_return; +} diff --git a/common/mock/fpsensor_mock.c b/common/mock/fpsensor_mock.c deleted file mode 100644 index 7ace5c2f43..0000000000 --- a/common/mock/fpsensor_mock.c +++ /dev/null @@ -1,17 +0,0 @@ -/* 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" - -/* No-op mocks */ -int fp_sensor_init(void) -{ - return EC_SUCCESS; -} - -int fp_sensor_deinit(void) -{ - return EC_SUCCESS; -} diff --git a/common/mock/mkbp_events_mock.c b/common/mock/mkbp_events_mock.c new file mode 100644 index 0000000000..fdab664c39 --- /dev/null +++ b/common/mock/mkbp_events_mock.c @@ -0,0 +1,22 @@ +/* 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. + */ + +/** + * @file + * @brief Mock event handling for MKBP keyboard protocol + */ + +#include + +#include "common.h" +#include "mock/mkbp_events_mock.h" + +struct mock_ctrl_mkbp_events mock_ctrl_mkbp_events = \ + MOCK_CTRL_DEFAULT_MKBP_EVENTS; + +int mkbp_send_event(uint8_t event_type) +{ + return mock_ctrl_mkbp_events.mkbp_send_event_return; +} diff --git a/common/mock/rollback_mock.c b/common/mock/rollback_mock.c index 6a04b6142a..84e9c4aa43 100644 --- a/common/mock/rollback_mock.c +++ b/common/mock/rollback_mock.c @@ -3,7 +3,10 @@ * found in the LICENSE file. */ -#include "mock/rollback_mock.h" +/** + * @file + * @brief Mock rollback block library + */ #include #include @@ -11,6 +14,7 @@ #include "common.h" #include "compile_time_macros.h" #include "util.h" +#include "mock/rollback_mock.h" struct mock_ctrl_rollback mock_ctrl_rollback = MOCK_CTRL_DEFAULT_ROLLBACK; -- cgit v1.2.1