diff options
author | Jett Rink <jettrink@chromium.org> | 2019-09-25 07:50:15 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-09-26 05:58:44 +0000 |
commit | 068b917ef17383c1cf8987d070b27fea30a72d75 (patch) | |
tree | 1c036c36ef0f7d0b6c44b4eb437ccc11edd9d994 /common | |
parent | 881d05951d94345c7c5bdea909cf5d393bd66a57 (diff) | |
download | chrome-ec-068b917ef17383c1cf8987d070b27fea30a72d75.tar.gz |
cleanup: remove copy of pd_cc_state enum
The EC command interface created a separate copy of the enum
pd_cc_state. Remove the EC command version and move the pd_cc_state
definition to the command interface.
Also remove PD_CC_NO_UFP option as there is no difference between that
value and PD_CC_NONE.
Split PD_CC_DEBUG_ACC into separate UFP and DFP values for clarity.
BRANCH=none
BUG=none
TEST=builds
Change-Id: Ic8c4c5ac4dd340b1e605100e35acb147c226a455
Signed-off-by: Jett Rink <jettrink@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1825503
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Sam Hurst <shurst@google.com>
Diffstat (limited to 'common')
-rw-r--r-- | common/usb_pd_protocol.c | 19 | ||||
-rw-r--r-- | common/usbc/usb_tc_ctvpd_sm.c | 6 | ||||
-rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 16 |
3 files changed, 21 insertions, 20 deletions
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 97d2722b4d..6f6d360928 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -388,7 +388,8 @@ int pd_is_ufp(int port) int pd_is_debug_acc(int port) { - return pd[port].cc_state == PD_CC_DEBUG_ACC; + return pd[port].cc_state == PD_CC_UFP_DEBUG_ACC || + pd[port].cc_state == PD_CC_DFP_DEBUG_ACC; } #endif @@ -3308,13 +3309,13 @@ void pd_task(void *u) if (cc_is_snk_dbg_acc(cc1, cc2)) { /* Debug accessory */ - new_cc_state = PD_CC_DEBUG_ACC; + new_cc_state = PD_CC_UFP_DEBUG_ACC; } else if (cc_is_at_least_one_rd(cc1, cc2)) { /* UFP attached */ new_cc_state = PD_CC_UFP_ATTACHED; } else if (cc_is_audio_acc(cc1, cc2)) { /* Audio accessory */ - new_cc_state = PD_CC_AUDIO_ACC; + new_cc_state = PD_CC_UFP_AUDIO_ACC; } else { /* No UFP */ set_state(port, PD_STATE_SRC_DISCONNECTED); @@ -3351,7 +3352,7 @@ void pd_task(void *u) /* UFP is attached */ if (new_cc_state == PD_CC_UFP_ATTACHED || - new_cc_state == PD_CC_DEBUG_ACC) { + new_cc_state == PD_CC_UFP_DEBUG_ACC) { #ifdef CONFIG_USBC_PPC /* Inform PPC that a sink is connected. */ ppc_sink_is_connected(port, 1); @@ -3362,7 +3363,7 @@ void pd_task(void *u) /* initial data role for source is DFP */ pd_set_data_role(port, PD_ROLE_DFP); - if (new_cc_state == PD_CC_DEBUG_ACC) + if (new_cc_state == PD_CC_UFP_DEBUG_ACC) pd[port].flags |= PD_FLAGS_TS_DTS_PARTNER; @@ -3372,7 +3373,7 @@ void pd_task(void *u) * detected. Section 4.5.2.2.17.1 in USB spec * v1-3 */ - if (new_cc_state != PD_CC_DEBUG_ACC) { + if (new_cc_state != PD_CC_UFP_DEBUG_ACC) { /* * Start sourcing Vconn before Vbus to * ensure we are within USB Type-C @@ -3929,7 +3930,7 @@ void pd_task(void *u) if (cc_is_rp(cc1) && cc_is_rp(cc2)) { /* Debug accessory */ - new_cc_state = PD_CC_DEBUG_ACC; + new_cc_state = PD_CC_DFP_DEBUG_ACC; } else if (cc_is_rp(cc1) || cc_is_rp(cc2)) { new_cc_state = PD_CC_DFP_ATTACHED; } else { @@ -3994,14 +3995,14 @@ void pd_task(void *u) /* DFP is attached */ if (new_cc_state == PD_CC_DFP_ATTACHED || - new_cc_state == PD_CC_DEBUG_ACC) { + new_cc_state == PD_CC_DFP_DEBUG_ACC) { pd[port].flags |= PD_FLAGS_CHECK_PR_ROLE | PD_FLAGS_CHECK_DR_ROLE | PD_FLAGS_CHECK_IDENTITY; /* Reset cable attributes and flags */ reset_pd_cable(port); - if (new_cc_state == PD_CC_DEBUG_ACC) + if (new_cc_state == PD_CC_DFP_DEBUG_ACC) pd[port].flags |= PD_FLAGS_TS_DTS_PARTNER; set_state(port, PD_STATE_SNK_DISCOVERY); diff --git a/common/usbc/usb_tc_ctvpd_sm.c b/common/usbc/usb_tc_ctvpd_sm.c index 46be033514..9aeb7742b0 100644 --- a/common/usbc/usb_tc_ctvpd_sm.c +++ b/common/usbc/usb_tc_ctvpd_sm.c @@ -1009,9 +1009,9 @@ static void tc_ct_attach_wait_unsupported_run(const int port) vpd_ct_get_cc(&cc1, &cc2); if (cc_is_at_least_one_rd(cc1, cc2)) - new_cc_state = PD_CC_DFP_ATTACHED; + new_cc_state = PD_CC_UFP_ATTACHED; else if (cc_is_audio_acc(cc1, cc2)) - new_cc_state = PD_CC_AUDIO_ACC; + new_cc_state = PD_CC_UFP_AUDIO_ACC; else /* (cc1 == TYPEC_CC_VOLT_OPEN or cc2 == TYPEC_CC_VOLT_OPEN */ new_cc_state = PD_CC_NONE; @@ -1047,7 +1047,7 @@ static void tc_ct_attach_wait_unsupported_run(const int port) */ if (new_cc_state == PD_CC_NONE) set_state_tc(port, TC_CT_UNATTACHED_VPD); - else /* PD_CC_DFP_ATTACHED or PD_CC_AUDIO_ACC */ + else /* PD_CC_UFP_ATTACHED or PD_CC_UFP_AUDIO_ACC */ set_state_tc(port, TC_CT_TRY_SNK); } diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 9293a2c6a1..de9381742b 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -1753,7 +1753,7 @@ static void tc_attach_wait_snk_run(const int port) tcpm_get_cc(port, &cc1, &cc2); if (cc_is_rp(cc1) && cc_is_rp(cc2)) - new_cc_state = PD_CC_DEBUG_ACC; + new_cc_state = PD_CC_DFP_DEBUG_ACC; else if (cc_is_rp(cc1) || cc_is_rp(cc2)) new_cc_state = PD_CC_DFP_ATTACHED; else @@ -1810,7 +1810,7 @@ static void tc_attach_wait_snk_run(const int port) #endif set_state_tc(port, TC_ATTACHED_SNK); } else { - /* new_cc_state is PD_CC_DEBUG_ACC */ + /* new_cc_state is PD_CC_DFP_DEBUG_ACC */ TC_SET_FLAG(port, TC_FLAGS_TS_DTS_PARTNER); set_state_tc(port, TC_DBG_ACC_SNK); } @@ -2199,13 +2199,13 @@ static void tc_attach_wait_src_run(const int port) /* Debug accessory */ if (cc_is_snk_dbg_acc(cc1, cc2)) { /* Debug accessory */ - new_cc_state = PD_CC_DEBUG_ACC; + new_cc_state = PD_CC_UFP_DEBUG_ACC; } else if (cc_is_at_least_one_rd(cc1, cc2)) { /* UFP attached */ new_cc_state = PD_CC_UFP_ATTACHED; } else if (cc_is_audio_acc(cc1, cc2)) { /* AUDIO Accessory not supported. Just ignore */ - new_cc_state = PD_CC_AUDIO_ACC; + new_cc_state = PD_CC_UFP_AUDIO_ACC; } else { /* No UFP */ set_state_tc(port, TC_UNATTACHED_SNK); @@ -2237,7 +2237,7 @@ static void tc_attach_wait_src_run(const int port) if (new_cc_state == PD_CC_UFP_ATTACHED) { set_state_tc(port, TC_ATTACHED_SRC); return; - } else if (new_cc_state == PD_CC_DEBUG_ACC) { + } else if (new_cc_state == PD_CC_UFP_DEBUG_ACC) { set_state_tc(port, TC_UNORIENTED_DBG_ACC_SRC); return; } @@ -2428,9 +2428,9 @@ static void tc_attached_src_run(const int port) cc1 = cc2; if (cc1 == TYPEC_CC_VOLT_OPEN) - new_cc_state = PD_CC_NO_UFP; - else new_cc_state = PD_CC_NONE; + else + new_cc_state = PD_CC_UFP_ATTACHED; /* Debounce the cc state */ if (new_cc_state != tc[port].cc_state) { @@ -2451,7 +2451,7 @@ static void tc_attached_src_run(const int port) * AttachWait.SNK shall enter TryWait.SNK for a Sink detach from * Attached.SRC. */ - if (tc[port].cc_state == PD_CC_NO_UFP && + if (tc[port].cc_state == PD_CC_NONE && !TC_CHK_FLAG(port, TC_FLAGS_PR_SWAP_IN_PROGRESS) && !TC_CHK_FLAG(port, TC_FLAGS_DISC_IDENT_IN_PROGRESS)) { |