diff options
| author | Daisuke Nojiri <dnojiri@chromium.org> | 2018-10-25 15:11:56 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2019-01-11 23:14:38 +0000 |
| commit | b77dc1c92a18cbfef96862f759d9a801daab93b4 (patch) | |
| tree | 191d968354912e8abcdcac17b80424fe49da2cb0 /common/usb_pd_protocol.c | |
| parent | 11db391ca382797a11308f683056d6a068a2f5ba (diff) | |
| download | chrome-ec-b77dc1c92a18cbfef96862f759d9a801daab93b4.tar.gz | |
USB-PD: Fix build errors for non-DRP
This patch fixes build errors for devices which don't use DRP ports.
pd_restart_tcpc is called within DRP context. So, the static definition
has to be excluded accordingly.
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
BUG=
BRANCH=none
TEST=buildall
Change-Id: I51decb0a2071230da3cdd91139f77d94b685ca5f
Previous-Reviewed-on: https://chromium-review.googlesource.com/1300616
(cherry picked from commit 894b5032fd3ffa8eb7517ec6e0889f2c51fbd06b)
Reviewed-on: https://chromium-review.googlesource.com/c/1405402
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>
Commit-Queue: Edward Hill <ecgh@chromium.org>
Tested-by: Edward Hill <ecgh@chromium.org>
Diffstat (limited to 'common/usb_pd_protocol.c')
| -rw-r--r-- | common/usb_pd_protocol.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 08e48de5a7..151fa64280 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -2149,7 +2149,7 @@ static void pd_update_try_source(void) } DECLARE_HOOK(HOOK_BATTERY_SOC_CHANGE, pd_update_try_source, HOOK_PRIO_DEFAULT); -#endif +#endif /* CONFIG_USB_PD_TRY_SRC */ static inline void pd_set_dual_role_no_wakeup(int port, enum pd_dual_role_states state) @@ -2477,7 +2477,7 @@ static void pd_init_tasks(void) } #endif /* CONFIG_COMMON_RUNTIME */ -#ifndef CONFIG_USB_PD_TCPC +#if !defined(CONFIG_USB_PD_TCPC) && defined(CONFIG_USB_PD_DUAL_ROLE) static int pd_restart_tcpc(int port) { if (board_set_tcpc_power_mode) { @@ -4655,6 +4655,7 @@ DECLARE_HOST_COMMAND(EC_CMD_USB_PD_PORTS, hc_pd_ports, EC_VER_MASK(0)); +#ifdef CONFIG_USB_PD_DUAL_ROLE static const enum pd_dual_role_states dual_role_map[USB_PD_CTRL_ROLE_COUNT] = { [USB_PD_CTRL_ROLE_TOGGLE_ON] = PD_DRP_TOGGLE_ON, [USB_PD_CTRL_ROLE_TOGGLE_OFF] = PD_DRP_TOGGLE_OFF, @@ -4662,6 +4663,7 @@ static const enum pd_dual_role_states dual_role_map[USB_PD_CTRL_ROLE_COUNT] = { [USB_PD_CTRL_ROLE_FORCE_SOURCE] = PD_DRP_FORCE_SOURCE, [USB_PD_CTRL_ROLE_FREEZE] = PD_DRP_FREEZE, }; +#endif #ifdef CONFIG_USBC_SS_MUX static const enum typec_mux typec_mux_map[USB_PD_CTRL_MUX_COUNT] = { @@ -4687,7 +4689,11 @@ static int hc_usb_pd_control(struct host_cmd_handler_args *args) return EC_RES_INVALID_PARAM; if (p->role != USB_PD_CTRL_ROLE_NO_CHANGE) +#ifdef CONFIG_USB_PD_DUAL_ROLE pd_set_dual_role(p->port, dual_role_map[p->role]); +#else + return EC_RES_INVALID_PARAM; +#endif #ifdef CONFIG_USBC_SS_MUX if (p->mux != USB_PD_CTRL_MUX_NO_CHANGE) |