diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:10:01 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:49:33 -0700 |
commit | 2bcf863b492fe7ed8105c853814dba6ed32ba719 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /common/ioexpander.c | |
parent | e5fb0b9ba488614b5684e640530f00821ab7b943 (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-2bcf863b492fe7ed8105c853814dba6ed32ba719.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release
Relevant changes:
git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "stm32f_rtc": PASSED
Test "panic_data_bloonchipper_v2.0.4277": PASSED
Test "panic_data_bloonchipper_v2.0.5938": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3
Diffstat (limited to 'common/ioexpander.c')
-rw-r--r-- | common/ioexpander.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/common/ioexpander.c b/common/ioexpander.c index 2bed1039f4..0a08f37c46 100644 --- a/common/ioexpander.c +++ b/common/ioexpander.c @@ -1,18 +1,19 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ /* IO Expander Controller Common Code */ +#include "builtin/assert.h" #include "gpio.h" #include "hooks.h" #include "ioexpander.h" #include "system.h" #include "util.h" -#define CPRINTF(format, args...) cprintf(CC_GPIO, format, ## args) -#define CPRINTS(format, args...) cprints(CC_GPIO, format, ## args) +#define CPRINTF(format, args...) cprintf(CC_GPIO, format, ##args) +#define CPRINTS(format, args...) cprints(CC_GPIO, format, ##args) int signal_is_ioex(int signal) { @@ -68,7 +69,7 @@ int ioex_enable_interrupt(enum ioex_signal signal) rv = ioex_is_valid_interrupt_signal(signal); if (rv != EC_SUCCESS) - return rv; + return rv; drv = ioex_config[g->ioex].drv; return drv->enable_interrupt(g->ioex, g->port, g->mask, 1); @@ -82,7 +83,7 @@ int ioex_disable_interrupt(enum ioex_signal signal) rv = ioex_is_valid_interrupt_signal(signal); if (rv != EC_SUCCESS) - return rv; + return rv; drv = ioex_config[g->ioex].drv; return drv->enable_interrupt(g->ioex, g->port, g->mask, 0); @@ -107,8 +108,8 @@ int ioex_get_flags(enum ioex_signal signal, int *flags) if (g == NULL) return EC_ERROR_BUSY; - return ioex_config[g->ioex].drv->get_flags_by_mask(g->ioex, - g->port, g->mask, flags); + return ioex_config[g->ioex].drv->get_flags_by_mask(g->ioex, g->port, + g->mask, flags); } int ioex_set_flags(enum ioex_signal signal, int flags) @@ -118,8 +119,8 @@ int ioex_set_flags(enum ioex_signal signal, int flags) if (g == NULL) return EC_ERROR_BUSY; - return ioex_config[g->ioex].drv->set_flags_by_mask(g->ioex, - g->port, g->mask, flags); + return ioex_config[g->ioex].drv->set_flags_by_mask(g->ioex, g->port, + g->mask, flags); } int ioex_get_level(enum ioex_signal signal, int *val) @@ -129,8 +130,8 @@ int ioex_get_level(enum ioex_signal signal, int *val) if (g == NULL) return EC_ERROR_BUSY; - return ioex_config[g->ioex].drv->get_level(g->ioex, g->port, - g->mask, val); + return ioex_config[g->ioex].drv->get_level(g->ioex, g->port, g->mask, + val); } int ioex_set_level(enum ioex_signal signal, int value) @@ -140,8 +141,8 @@ int ioex_set_level(enum ioex_signal signal, int value) if (g == NULL) return EC_ERROR_BUSY; - return ioex_config[g->ioex].drv->set_level(g->ioex, g->port, - g->mask, value); + return ioex_config[g->ioex].drv->set_level(g->ioex, g->port, g->mask, + value); } #ifdef CONFIG_IO_EXPANDER_SUPPORT_GET_PORT @@ -198,7 +199,7 @@ int ioex_restore_gpio_state(int ioex, const int *state, int state_len) } rv = drv->set_flags_by_mask(g->ioex, g->port, g->mask, - state[state_offset++]); + state[state_offset++]); if (rv) { CPRINTS("%s failed to set flags rv=%d", __func__, rv); return rv; @@ -233,8 +234,8 @@ int ioex_init(int ioex) if (system_jumped_late()) flags &= ~(GPIO_LOW | GPIO_HIGH); - drv->set_flags_by_mask(g->ioex, g->port, - g->mask, flags); + drv->set_flags_by_mask(g->ioex, g->port, g->mask, + flags); } } @@ -253,8 +254,8 @@ static void ioex_init_default(void) * If the IO Expander has been initialized or if the default * initialization is disabled, skip initializing. */ - if (ioex_config[i].flags & (IOEX_FLAGS_INITIALIZED | - IOEX_FLAGS_DEFAULT_INIT_DISABLED)) + if (ioex_config[i].flags & + (IOEX_FLAGS_INITIALIZED | IOEX_FLAGS_DEFAULT_INIT_DISABLED)) continue; ioex_init(i); |