diff options
| author | Vijay Hiremath <vijay.p.hiremath@intel.com> | 2020-02-12 13:40:06 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-02-19 21:25:52 +0000 |
| commit | 0340484f40f22e3e26aaf490c292363be3697445 (patch) | |
| tree | 14aecb6c88f1856e9b1d17bcc9bee0fed210cf10 | |
| parent | bcbc5db23753b91ae59abab78cc74a43a06a7a09 (diff) | |
| download | chrome-ec-0340484f40f22e3e26aaf490c292363be3697445.tar.gz | |
TCPMv1/v2: Move pd_is_vbus_present() to common file
BUG=b:148528713
BRANCH=none
TEST=make buildall -j
Change-Id: I5fb9bda868961008db858a46b7898b5c58cdd922
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2052647
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
| -rw-r--r-- | common/usb_common.c | 8 | ||||
| -rw-r--r-- | common/usb_pd_protocol.c | 8 | ||||
| -rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/common/usb_common.c b/common/usb_common.c index c838252524..a0fe959a3b 100644 --- a/common/usb_common.c +++ b/common/usb_common.c @@ -659,3 +659,11 @@ void pd_deferred_resume(int port) hook_call_deferred(&resume_pd_port_data, 5 * SECOND); } #endif /* CONFIG_USB_PD_TCPM_TCPCI */ + +int pd_is_vbus_present(int port) +{ + if (IS_ENABLED(CONFIG_USB_PD_VBUS_DETECT_TCPC)) + return tcpm_get_vbus_level(port); + else + return pd_snk_is_vbus_provided(port); +} diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index fc6a9f7378..19fb1c5c70 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -380,14 +380,6 @@ void pd_vbus_low(int port) } #endif -int pd_is_vbus_present(int port) -{ -#ifdef CONFIG_USB_PD_VBUS_DETECT_TCPC - return tcpm_get_vbus_level(port); -#else - return pd_snk_is_vbus_provided(port); -#endif -} static void set_polarity(int port, enum tcpc_cc_polarity polarity) { diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 44dd2f0e25..f21568fb39 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -807,14 +807,6 @@ const char *pd_get_task_state_name(int port) return tc_state_names[get_state_tc(port)]; } -int pd_is_vbus_present(int port) -{ - if (IS_ENABLED(CONFIG_USB_PD_VBUS_DETECT_TCPC)) - return tcpm_get_vbus_level(port); - else - return pd_snk_is_vbus_provided(port); -} - void pd_vbus_low(int port) { TC_CLR_FLAG(port, TC_FLAGS_VBUS_NEVER_LOW); |