diff options
| author | Jett Rink <jettrink@chromium.org> | 2019-08-08 12:31:23 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-09 21:50:56 +0000 |
| commit | 85d086a15e2dca92c573e5d36ef03db6b428a76b (patch) | |
| tree | 6518a4221df0290165aeddf81ddcfd0f00829329 /common/usbc | |
| parent | a34c6b36d254ad7f537976ba5a3b18844c25e1dc (diff) | |
| download | chrome-ec-85d086a15e2dca92c573e5d36ef03db6b428a76b.tar.gz | |
usb: convert cc1 from int to enum
Refactor code to use proper type for cc1 and cc2 lines.
BRANCH=none
BUG=none
TEST=builds. No functional change.
Change-Id: Id292db8480920e2b191bac9d9ecc2685f61e4ea9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1744654
Tested-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'common/usbc')
| -rw-r--r-- | common/usbc/usb_prl_sm.c | 3 | ||||
| -rw-r--r-- | common/usbc/usb_tc_drp_acc_trysrc_sm.c | 32 | ||||
| -rw-r--r-- | common/usbc/usbc_task.c | 3 |
3 files changed, 14 insertions, 24 deletions
diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c index f013497cc4..a08f662e76 100644 --- a/common/usbc/usb_prl_sm.c +++ b/common/usbc/usb_prl_sm.c @@ -811,8 +811,7 @@ static int prl_tx_snk_pending_entry(int port) static int prl_tx_snk_pending_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; tcpm_get_cc(port, &cc1, &cc2); if (cc1 == TYPEC_CC_VOLT_RP_3_0 || cc2 == TYPEC_CC_VOLT_RP_3_0) { diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 8ec2d27d54..810fc5476e 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -761,7 +761,7 @@ void pd_prevent_low_power_mode(int port, int prevent) static void sink_power_sub_states(int port) { - int cc1, cc2, cc; + enum tcpc_cc_voltage_status cc1, cc2, cc; enum tcpc_cc_voltage_status new_cc_voltage; tcpm_get_cc(port, &cc1, &cc2); @@ -920,8 +920,7 @@ static int tc_unattached_snk_entry(int port) static int tc_unattached_snk_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; /* * TODO(b/137498392): Add wait before sampling the CC @@ -978,8 +977,7 @@ static int tc_attach_wait_snk_entry(int port) static int tc_attach_wait_snk_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; enum pd_cc_states new_cc_state; /* Check for connection */ @@ -1059,8 +1057,7 @@ static int tc_attached_snk(int port, enum sm_signal sig) static int tc_attached_snk_entry(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; tc[port].state_id = TC_ATTACHED_SNK; CPRINTS("C%d: %s", port, tc_state_names[tc[port].state_id]); @@ -1143,8 +1140,7 @@ static int tc_unoriented_dbg_acc_src_entry(int port) static int tc_unoriented_dbg_acc_src_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; /* Check for connection */ tcpm_get_cc(port, &cc1, &cc2); @@ -1253,8 +1249,7 @@ static int tc_unattached_src_entry(int port) static int tc_unattached_src_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; /* Check for connection */ tcpm_get_cc(port, &cc1, &cc2); @@ -1303,8 +1298,7 @@ static int tc_attach_wait_src_entry(int port) static int tc_attach_wait_src_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; enum pd_cc_states new_cc_state; /* Check for connection */ @@ -1371,8 +1365,7 @@ static int tc_attached_src(int port, enum sm_signal sig) static int tc_attached_src_entry(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; tc[port].state_id = TC_ATTACHED_SRC; CPRINTS("C%d: %s", port, tc_state_names[tc[port].state_id]); @@ -1421,8 +1414,7 @@ static int tc_attached_src_entry(int port) static int tc_attached_src_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; enum pd_cc_states new_cc_state; /* Check for connection */ @@ -1508,8 +1500,7 @@ static int tc_try_src_entry(int port) static int tc_try_src_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; enum pd_cc_states new_cc_state; /* Check for connection */ @@ -1582,8 +1573,7 @@ static int tc_try_wait_snk_entry(int port) static int tc_try_wait_snk_run(int port) { - int cc1; - int cc2; + enum tcpc_cc_voltage_status cc1, cc2; enum pd_cc_states new_cc_state; /* Check for connection */ diff --git a/common/usbc/usbc_task.c b/common/usbc/usbc_task.c index 7ff8bbf44f..b5b94c126a 100644 --- a/common/usbc/usbc_task.c +++ b/common/usbc/usbc_task.c @@ -129,7 +129,8 @@ enum typec_state_id get_typec_state_id(int port) * DTS USB-C @ 3 A Rp3A0 RpUSB */ -inline enum pd_cc_polarity_type get_snk_polarity(int cc1, int cc2) +enum pd_cc_polarity_type get_snk_polarity(enum tcpc_cc_voltage_status cc1, + enum tcpc_cc_voltage_status cc2) { /* the following assumes: * TYPEC_CC_VOLT_RP_3_0 > TYPEC_CC_VOLT_RP_1_5 |