From 946402100fd0589b5480eebd8444a7c3eb9b6aa5 Mon Sep 17 00:00:00 2001 From: Ayushee Date: Thu, 31 Oct 2019 11:32:51 -0700 Subject: Cleanup: Renaming pd_is_ufp to pd_partner_is_ufp pd_is_ufp function returns port partner CC status, renaming it to pd_partner_is_ufp to avoid ambiguity between host and port partner's CC status. BUG=b:141971044 BRANCH=None TEST=make buildall -j Change-Id: I19da8c8470db134e438271b92918994d77e4eb5d Signed-off-by: Ayushee Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1894119 Reviewed-by: Keith Short Reviewed-by: Vijay P Hiremath --- common/usb_pd_protocol.c | 7 +++++-- common/usbc/usb_tc_drp_acc_trysrc_sm.c | 7 +++++-- driver/retimer/bb_retimer.c | 2 +- include/usb_pd.h | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 03a2f84c95..a08027ad5e 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -394,9 +394,12 @@ int pd_is_vbus_present(int port) } #ifdef CONFIG_USB_PD_RETIMER -int pd_is_ufp(int port) +/** + * This function checks the current CC status of the port partner + * and returns true if the attached partner is UFP. + */ +int pd_partner_is_ufp(int port) { - /* Returns true if port partner is UFP */ return pd[port].cc_state == PD_CC_UFP_ATTACHED || pd[port].cc_state == PD_CC_UFP_DEBUG_ACC || pd[port].cc_state == PD_CC_UFP_AUDIO_ACC; diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index b0550fca90..2423855c8f 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -2672,9 +2672,12 @@ void tc_run(const int port) run_state(port, &tc[port].ctx); } -int pd_is_ufp(int port) +/** + * This function checks the current CC status of the port partner + * and returns true if the attached partner is UFP. + */ +int pd_partner_is_ufp(int port) { - /* Returns true if port partner is UFP */ return tc[port].cc_state == PD_CC_UFP_ATTACHED || tc[port].cc_state == PD_CC_UFP_DEBUG_ACC || tc[port].cc_state == PD_CC_UFP_AUDIO_ACC; diff --git a/driver/retimer/bb_retimer.c b/driver/retimer/bb_retimer.c index bef247363a..c89ae925f3 100644 --- a/driver/retimer/bb_retimer.c +++ b/driver/retimer/bb_retimer.c @@ -142,7 +142,7 @@ int retimer_set_state(int port, mux_state_t mux_state) * 0 - DFP * 1 - UPF */ - if (pd_is_ufp(port)) + if (pd_partner_is_ufp(port)) set_retimer_con |= BB_RETIMER_USB_DATA_ROLE; } diff --git a/include/usb_pd.h b/include/usb_pd.h index f94686f599..2593762a59 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h @@ -2259,11 +2259,11 @@ uint8_t board_get_dp_pin_mode(int port); #ifdef CONFIG_USB_PD_RETIMER /** - * Return true if specified PD port is UFP. + * Return true if specified PD port partner is UFP. * * @param port USB-C port number */ -int pd_is_ufp(int port); +int pd_partner_is_ufp(int port); /** * Return true if specified PD port is debug accessory. -- cgit v1.2.1