diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2019-08-13 12:36:08 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-14 18:55:16 +0000 |
| commit | 29b86be6ba06f1de6973a6d2f4fa3c9eba8be0f1 (patch) | |
| tree | 8ceeb0ad98e98e2335dfb37e5affabd808bfe3e1 /board/kukui | |
| parent | a18332870ba0f77eb686366d616201da6ff90527 (diff) | |
| download | chrome-ec-29b86be6ba06f1de6973a6d2f4fa3c9eba8be0f1.tar.gz | |
charge_manager: Mark functions overridable
Functions such as board_fill_source_power_info are overridable. This
patch annotates them properly using override macros, and removes their
declarations from board.h.
These functions are declared in both charge_manager.h and
{kukui,krane,kodama}/board.h. The latter causes comm-dev.c to fail
to be compiled in chrome-base/diagnostics.
BUG=none
BRANCH=none
TEST=buildall
Change-Id: I27d6dfe2fa9299550ac5205c34095a4fe02dabdb
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1752597
Tested-by: Yu-Ping Wu <yupingso@chromium.org>
Diffstat (limited to 'board/kukui')
| -rw-r--r-- | board/kukui/board.c | 5 | ||||
| -rw-r--r-- | board/kukui/board.h | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/board/kukui/board.c b/board/kukui/board.c index 2f6315426b..0005b0cd68 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -496,17 +496,18 @@ int board_is_vbus_too_low(int port, enum chg_ramp_vbus_state ramp_state) return charger_get_vbus_voltage(port) < 4400; } -int board_charge_port_is_sink(int port) +__override int board_charge_port_is_sink(int port) { /* TODO(b:128386458): Check POGO_ADC_INT_L */ return 1; } -int board_charge_port_is_connected(int port) +__override int board_charge_port_is_connected(int port) { return gpio_get_level(GPIO_POGO_VBUS_PRESENT); } +__override void board_fill_source_power_info(int port, struct ec_response_usb_pd_power_info *r) { diff --git a/board/kukui/board.h b/board/kukui/board.h index b6561b13f1..7628857a2a 100644 --- a/board/kukui/board.h +++ b/board/kukui/board.h @@ -119,7 +119,6 @@ enum charge_port { #endif }; -#include "ec_commands.h" #include "gpio_signal.h" #include "registers.h" @@ -133,10 +132,6 @@ int board_get_version(void); int board_is_sourcing_vbus(int port); void pogo_adc_interrupt(enum gpio_signal signal); int board_discharge_on_ac(int enable); -int board_charge_port_is_sink(int port); -int board_charge_port_is_connected(int port); -void board_fill_source_power_info(int port, - struct ec_response_usb_pd_power_info *r); #endif /* !__ASSEMBLER__ */ |