michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb_c: Fix comments before "else" statements

Browse source 
Move comments that precede an "else" into the "else"
statement.

Signed-off-by: Sam Hurst <sbh1187@gmail.com>
This commit is contained in:
Sam Hurst 2023-01-10 09:13:16 -08:00 • committed by Carles Cufí
commit d9c4ec31fc
2 changed files with 63 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

103
subsys/usb/usb_c/usbc_pe_snk_states.c
View file

@ -289,12 +289,11 @@ void pe_snk_select_capability_run(void *obj)
} }
pe_set_state(dev, PE_SNK_READY); pe_set_state(dev, PE_SNK_READY);
} } else {
/* /*
* No previous explicit contract, so transition * No previous explicit contract, so transition
* to PE_SNK_Wait_For_Capabilities * to PE_SNK_Wait_For_Capabilities
*/ */
else {
pe_set_state(dev, PE_SNK_WAIT_FOR_CAPABILITIES); pe_set_state(dev, PE_SNK_WAIT_FOR_CAPABILITIES);
} }
} else { } else {
@ -426,9 +425,8 @@ void pe_snk_ready_run(void *obj)
if (header.extended) { if (header.extended) {
extended_message_not_supported(dev); extended_message_not_supported(dev);
return; return;
} } else if (header.number_of_data_objects > 0) {
/* Data Messages */ /* Data Messages */
else if (header.number_of_data_objects > 0) {
switch (header.message_type) { switch (header.message_type) {
case PD_DATA_SOURCE_CAP: case PD_DATA_SOURCE_CAP:
pe_set_state(dev, PE_SNK_EVALUATE_CAPABILITY); pe_set_state(dev, PE_SNK_EVALUATE_CAPABILITY);
@ -437,9 +435,8 @@ void pe_snk_ready_run(void *obj)
pe_set_state(dev, PE_SEND_NOT_SUPPORTED); pe_set_state(dev, PE_SEND_NOT_SUPPORTED);
} }
return; return;
} } else {
/* Control Messages */ /* Control Messages */
else {
switch (header.message_type) { switch (header.message_type) {
case PD_CTRL_GOOD_CRC: case PD_CTRL_GOOD_CRC:
/* Do nothing */ /* Do nothing */
@ -632,25 +629,23 @@ void pe_snk_get_source_cap_run(void *obj)
if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_TX_COMPLETE)) { if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_TX_COMPLETE)) {
/* The Policy Engine Shall then start the SenderResponseTimer. */ /* The Policy Engine Shall then start the SenderResponseTimer. */
usbc_timer_start(&pe->pd_t_sender_response); usbc_timer_start(&pe->pd_t_sender_response);
} } else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_MSG_RECEIVED)) {
/* /*
* The Policy Engine Shall transition to the PE_SNK_Evaluate_Capability * The Policy Engine Shall transition to the PE_SNK_Evaluate_Capability
* State when: * State when:
* 1: In SPR Mode and SPR Source Capabilities were requested and * 1: In SPR Mode and SPR Source Capabilities were requested and
* a Source_Capabilities Message is received * a Source_Capabilities Message is received
*/ */
else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_MSG_RECEIVED)) {
header = prl_rx->emsg.header; header = prl_rx->emsg.header;
if (received_control_message(dev, header, PD_DATA_SOURCE_CAP)) { if (received_control_message(dev, header, PD_DATA_SOURCE_CAP)) {
pe_set_state(dev, PE_SNK_EVALUATE_CAPABILITY); pe_set_state(dev, PE_SNK_EVALUATE_CAPABILITY);
} }
} } else if (usbc_timer_expired(&pe->pd_t_sender_response)) {
/* /*
* The Policy Engine Shall transition to the PE_SNK_Ready state when: * The Policy Engine Shall transition to the PE_SNK_Ready state when:
* 1: The SenderResponseTimer times out. * 1: The SenderResponseTimer times out.
*/ */
else if (usbc_timer_expired(&pe->pd_t_sender_response)) {
pe_set_state(dev, PE_SNK_READY); pe_set_state(dev, PE_SNK_READY);
/* Inform the DPM of the sender response timeout */ /* Inform the DPM of the sender response timeout */
policy_notify(dev, SENDER_RESPONSE_TIMEOUT); policy_notify(dev, SENDER_RESPONSE_TIMEOUT);
@ -710,26 +705,24 @@ void pe_send_soft_reset_run(void *obj)
} else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_TX_COMPLETE)) { } else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_TX_COMPLETE)) {
/* Start SenderResponse timer */ /* Start SenderResponse timer */
usbc_timer_start(&pe->pd_t_sender_response); usbc_timer_start(&pe->pd_t_sender_response);
} } else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_MSG_RECEIVED)) {
/* /*
* The Policy Engine Shall transition to the PE_SNK_Wait_for_Capabilities * The Policy Engine Shall transition to the PE_SNK_Wait_for_Capabilities
* state when: * state when:
* 1: An Accept Message has been received on SOP * 1: An Accept Message has been received on SOP
*/ */
else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_MSG_RECEIVED)) {
header = prl_rx->emsg.header; header = prl_rx->emsg.header;
if (received_control_message(dev, header, PD_CTRL_ACCEPT)) { if (received_control_message(dev, header, PD_CTRL_ACCEPT)) {
pe_set_state(dev, PE_SNK_WAIT_FOR_CAPABILITIES); pe_set_state(dev, PE_SNK_WAIT_FOR_CAPABILITIES);
} }
} } else if (usbc_timer_expired(&pe->pd_t_sender_response) ||
/* atomic_test_and_clear_bit(pe->flags, PE_FLAGS_PROTOCOL_ERROR)) {
* The Policy Engine Shall transition to the PE_SNK_Hard_Reset state when: /*
* 1: A SenderResponseTimer timeout occurs * The Policy Engine Shall transition to the PE_SNK_Hard_Reset state when:
* 2: Or the Protocol Layer indicates that a transmission error has occurred * 1: A SenderResponseTimer timeout occurs
*/ * 2: Or the Protocol Layer indicates that a transmission error has occurred
else if (usbc_timer_expired(&pe->pd_t_sender_response) || */
atomic_test_and_clear_bit(pe->flags, PE_FLAGS_PROTOCOL_ERROR)) {
pe_set_state(dev, PE_SNK_HARD_RESET); pe_set_state(dev, PE_SNK_HARD_RESET);
} }
} }
@ -775,22 +768,20 @@ void pe_soft_reset_run(void *obj)
if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_SEND_SOFT_RESET)) { if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_SEND_SOFT_RESET)) {
/* Send Accept message */ /* Send Accept message */
pe_send_ctrl_msg(dev, PD_PACKET_SOP, PD_CTRL_ACCEPT); pe_send_ctrl_msg(dev, PD_PACKET_SOP, PD_CTRL_ACCEPT);
} } else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_TX_COMPLETE)) {
/* /*
* The Policy Engine Shall transition to the PE_SNK_Wait_for_Capabilities * The Policy Engine Shall transition to the PE_SNK_Wait_for_Capabilities
* state when: * state when:
* 1: The Accept Message has been sent on SOP. * 1: The Accept Message has been sent on SOP.
*/ */
else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_TX_COMPLETE)) {
pe_set_state(dev, PE_SNK_WAIT_FOR_CAPABILITIES); pe_set_state(dev, PE_SNK_WAIT_FOR_CAPABILITIES);
} } else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_PROTOCOL_ERROR)) {
/* /*
* The Policy Engine Shall transition to the PE_SNK_Hard_Reset * The Policy Engine Shall transition to the PE_SNK_Hard_Reset
* state when: * state when:
* 1: The Protocol Layer indicates that a transmission error * 1: The Protocol Layer indicates that a transmission error
* has occurred. * has occurred.
*/ */
else if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_PROTOCOL_ERROR)) {
pe_set_state(dev, PE_SNK_HARD_RESET); pe_set_state(dev, PE_SNK_HARD_RESET);
} }
} }

34
subsys/usb/usb_c/usbc_prl.c
View file

@ -620,11 +620,9 @@ static void prl_tx_wait_for_message_request_run(void *obj)
*/ */
if ((prl_tx->msg_type == PD_CTRL_SOFT_RESET) && (prl_tx->emsg.len == 0)) { if ((prl_tx->msg_type == PD_CTRL_SOFT_RESET) && (prl_tx->emsg.len == 0)) {
prl_tx_set_state(dev, PRL_TX_LAYER_RESET_FOR_TRANSMIT); prl_tx_set_state(dev, PRL_TX_LAYER_RESET_FOR_TRANSMIT);
} } else {
/* /* Message pending (except Soft Reset) */
* Message pending (except Soft Reset)
*/
else {
/* NOTE: PRL_TX_Construct_Message State embedded here */ /* NOTE: PRL_TX_Construct_Message State embedded here */
prl_tx_construct_message(dev); prl_tx_construct_message(dev);
prl_tx_set_state(dev, PRL_TX_WAIT_FOR_PHY_RESPONSE); prl_tx_set_state(dev, PRL_TX_WAIT_FOR_PHY_RESPONSE);
@ -796,13 +794,13 @@ static void prl_tx_snk_pending_run(void *obj)
*/ */
if ((prl_tx->msg_type == PD_CTRL_SOFT_RESET) && (prl_tx->emsg.len == 0)) { if ((prl_tx->msg_type == PD_CTRL_SOFT_RESET) && (prl_tx->emsg.len == 0)) {
prl_tx_set_state(dev, PRL_TX_LAYER_RESET_FOR_TRANSMIT); prl_tx_set_state(dev, PRL_TX_LAYER_RESET_FOR_TRANSMIT);
} } else if (cc1 == TC_CC_VOLT_RP_3A0 || cc2 == TC_CC_VOLT_RP_3A0) {
/* /*
* The Protocol Layer Shall transition to the PRL_Tx_Construct_Message * The Protocol Layer Shall transition to the PRL_Tx_Construct_Message
* state when Rp is set to SinkTxOk and a Soft_Reset Message is not * state when Rp is set to SinkTxOk and a Soft_Reset Message is not
* pending. * pending.
*/ */
else if (cc1 == TC_CC_VOLT_RP_3A0 || cc2 == TC_CC_VOLT_RP_3A0) {
/* /*
* Message pending (except Soft Reset) & * Message pending (except Soft Reset) &
* Rp = SinkTxOk * Rp = SinkTxOk
@ -932,12 +930,12 @@ static void prl_hr_reset_layer_entry(void *obj)
*/ */
prl_hr_send_msg_to_phy(dev); prl_hr_send_msg_to_phy(dev);
prl_hr_set_state(dev, PRL_HR_WAIT_FOR_PHY_HARD_RESET_COMPLETE); prl_hr_set_state(dev, PRL_HR_WAIT_FOR_PHY_HARD_RESET_COMPLETE);
} } else {
/* /*
* Protocol Layer reset complete & * Protocol Layer reset complete &
* Hard Reset was initiated by Port Partner * Hard Reset was initiated by Port Partner
*/ */
else {
/* Inform Policy Engine of the Hard Reset */ /* Inform Policy Engine of the Hard Reset */
pe_got_hard_reset(dev); pe_got_hard_reset(dev);
prl_hr_set_state(dev, PRL_HR_WAIT_FOR_PE_HARD_RESET_COMPLETE); prl_hr_set_state(dev, PRL_HR_WAIT_FOR_PE_HARD_RESET_COMPLETE);