Lib: USB-C: Apply clang-format

Apply clang-format to USB-C in preparation for code changes

No code is changed, only formatting.

Signed-off-by: Glenn Andrews <[email protected]>

Author: glenn-andrews

subsys/usb/usb_c/usbc_pe_common.c

@@ -309,8 +309,7 @@ void pe_report_error(const struct device *dev, const enum pe_error e,
 	 * Generate Hard Reset if Protocol Error occurred
 	 * while in PE_Send_Soft_Reset state.
 	 */
-	if (pe_get_state(dev) == PE_SEND_SOFT_RESET ||
-	    pe_get_state(dev) == PE_SOFT_RESET) {
+	if (pe_get_state(dev) == PE_SEND_SOFT_RESET || pe_get_state(dev) == PE_SOFT_RESET) {
 		atomic_set_bit(pe->flags, PE_FLAGS_PROTOCOL_ERROR);
 		return;
 	}
@@ -479,7 +478,7 @@ void pe_send_soft_reset(const struct device *dev, const enum pd_packet_type type
  * @brief Send a Power Delivery Data Message
  */
 void pe_send_data_msg(const struct device *dev, const enum pd_packet_type type,
-			const enum pd_data_msg_type msg)
+		      const enum pd_data_msg_type msg)
 {
 	struct usbc_port_data *data = dev->data;
 	struct policy_engine *pe = data->pe;
@@ -493,7 +492,7 @@ void pe_send_data_msg(const struct device *dev, const enum pd_packet_type type,
  * @brief Send a Power Delivery Control Message
  */
 void pe_send_ctrl_msg(const struct device *dev, const enum pd_packet_type type,
-			const enum pd_ctrl_msg_type msg)
+		      const enum pd_ctrl_msg_type msg)
 {
 	struct usbc_port_data *data = dev->data;
 	struct policy_engine *pe = data->pe;
@@ -669,9 +668,8 @@ void policy_get_snk_cap(const struct device *dev, uint32_t **pdos, int *num_pdos
 /**
  * @brief Send the received sink caps to the DPM
  */
-void policy_set_port_partner_snk_cap(const struct device *dev,
-			const uint32_t *pdos,
-			const int num_pdos)
+void policy_set_port_partner_snk_cap(const struct device *dev, const uint32_t *pdos,
+				     const int num_pdos)
 {
 	struct usbc_port_data *data = dev->data;
 
@@ -684,28 +682,26 @@ void policy_set_port_partner_snk_cap(const struct device *dev,
  * @brief Check if Sink Request can be met by DPM
  */
 enum usbc_snk_req_reply_t policy_check_sink_request(const struct device *dev,
-				const uint32_t request_msg)
+						    const uint32_t request_msg)
 {
 	struct usbc_port_data *data = dev->data;
 
 	/* This callback must be implemented */
-	__ASSERT(data->policy_cb_check_sink_request != NULL,
-		"Callback pointer should not be NULL");
+	__ASSERT(data->policy_cb_check_sink_request != NULL, "Callback pointer should not be NULL");
 
 	return data->policy_cb_check_sink_request(dev, request_msg);
 }
 
 /**
  * @brief Check if the present contract is still valid
  */
-bool policy_present_contract_is_valid(const struct device *dev,
-				const uint32_t present_contract)
+bool policy_present_contract_is_valid(const struct device *dev, const uint32_t present_contract)
 {
 	struct usbc_port_data *data = dev->data;
 
 	/* This callback must be implemented */
 	__ASSERT(data->policy_present_contract_is_valid != NULL,
-		"Callback pointer should not be NULL");
+		 "Callback pointer should not be NULL");
 
 	return data->policy_present_contract_is_valid(dev, present_contract);
 }
@@ -718,8 +714,7 @@ bool policy_is_ps_ready(const struct device *dev)
 	struct usbc_port_data *data = dev->data;
 
 	/* This callback must be implemented */
-	__ASSERT(data->policy_is_ps_ready != NULL,
-		"Callback pointer should not be NULL");
+	__ASSERT(data->policy_is_ps_ready != NULL, "Callback pointer should not be NULL");
 
 	return data->policy_is_ps_ready(dev);
 }
@@ -783,8 +778,8 @@ static void pe_drs_evaluate_swap_run(void *obj)
 		/* Only update data roles if last message sent was Accept */
 		if (prl_tx->msg_type == PD_CTRL_ACCEPT) {
 			/* Update Data Role */
-			pe_set_data_role(dev, (pe->data_role == TC_ROLE_UFP)
-						? TC_ROLE_DFP : TC_ROLE_UFP);
+			pe_set_data_role(dev, (pe->data_role == TC_ROLE_UFP) ? TC_ROLE_DFP
+									     : TC_ROLE_UFP);
 			/* Inform Device Policy Manager of Data Role Change */
 			policy_notify(dev, (pe->data_role == TC_ROLE_UFP) ? DATA_ROLE_IS_UFP
 									  : DATA_ROLE_IS_DFP);
@@ -922,16 +917,16 @@ void pe_get_sink_cap_run(void *obj)
 				if (received_data_message(dev, header, PD_DATA_SINK_CAP)) {
 #ifdef CONFIG_USBC_CSM_SOURCE_ONLY
 					uint32_t *pdos = (uint32_t *)prl_rx->emsg.data;
-					uint32_t num_pdos =
-					PD_CONVERT_BYTES_TO_PD_HEADER_COUNT(prl_rx->emsg.len);
+					uint32_t num_pdos = PD_CONVERT_BYTES_TO_PD_HEADER_COUNT(
+						prl_rx->emsg.len);
 
 					policy_set_port_partner_snk_cap(dev, pdos, num_pdos);
 #endif
 					pe_set_ready_state(dev);
 					return;
 				} else if (received_control_message(dev, header, PD_CTRL_REJECT) ||
-					received_control_message(dev,
-							header, PD_CTRL_NOT_SUPPORTED)) {
+					   received_control_message(dev, header,
+								    PD_CTRL_NOT_SUPPORTED)) {
 					pe_set_ready_state(dev);
 					return;
 				}
@@ -1114,7 +1109,7 @@ static void pe_send_not_supported_run(void *obj)
 	const struct device *dev = pe->dev;
 
 	if (atomic_test_bit(pe->flags, PE_FLAGS_TX_COMPLETE) ||
-			atomic_test_bit(pe->flags, PE_FLAGS_MSG_DISCARDED)) {
+	    atomic_test_bit(pe->flags, PE_FLAGS_MSG_DISCARDED)) {
 		atomic_clear_bit(pe->flags, PE_FLAGS_TX_COMPLETE);
 		atomic_clear_bit(pe->flags, PE_FLAGS_MSG_DISCARDED);
 		pe_set_ready_state(dev);
@@ -1194,8 +1189,8 @@ static void pe_sender_response_run(void *obj)
 			 *      2) And the NoResponseTimer times out
 			 *      3) And the HardResetCounter > nHardResetCount.
 			 */
-			if ((atomic_test_bit(pe->flags, PE_FLAGS_HAS_BEEN_PD_CONNECTED) == false)
-					&& pe->hard_reset_counter > PD_N_HARD_RESET_COUNT) {
+			if ((atomic_test_bit(pe->flags, PE_FLAGS_HAS_BEEN_PD_CONNECTED) == false) &&
+			    pe->hard_reset_counter > PD_N_HARD_RESET_COUNT) {
 				pe_set_state(dev, PE_SUSPEND);
 			}
 			break;
@@ -1206,8 +1201,8 @@ static void pe_sender_response_run(void *obj)
 			 *      2) And the NoResponseTimer times out
 			 *      3) And the HardResetCounter > nHardResetCount
 			 */
-			if (atomic_test_bit(pe->flags, PE_FLAGS_HAS_BEEN_PD_CONNECTED)
-					&& pe->hard_reset_counter > PD_N_HARD_RESET_COUNT) {
+			if (atomic_test_bit(pe->flags, PE_FLAGS_HAS_BEEN_PD_CONNECTED) &&
+			    pe->hard_reset_counter > PD_N_HARD_RESET_COUNT) {
 				usbc_request(dev, REQUEST_TC_ERROR_RECOVERY);
 			}
 			/*
@@ -1253,8 +1248,8 @@ static void pe_sender_response_exit(void *obj)
 /**
  * @brief Policy engine State table
  */
+/* clang-format off */
 static const struct smf_state pe_states[PE_STATE_COUNT] = {
-	/* PE Super States */
 	[PE_SENDER_RESPONSE_PARENT] = SMF_CREATE_STATE(
 		NULL,
 		pe_sender_response_run,
@@ -1452,5 +1447,7 @@ static const struct smf_state pe_states[PE_STATE_COUNT] = {
 		NULL,
 		NULL,
 		NULL),
+
 };
+/* clang-format off */
 BUILD_ASSERT(ARRAY_SIZE(pe_states) == PE_STATE_COUNT);

subsys/usb/usb_c/usbc_pe_src_states.c

@@ -79,8 +79,7 @@ static void send_src_caps(struct policy_engine *pe)
 	uint32_t num_pdos = 0;
 
 	/* This callback must be implemented */
-	__ASSERT(data->policy_cb_get_src_caps != NULL,
-			"Callback pointer should not be NULL");
+	__ASSERT(data->policy_cb_get_src_caps != NULL, "Callback pointer should not be NULL");
 
 	data->policy_cb_get_src_caps(dev, &pdos, &num_pdos);
 
@@ -216,8 +215,8 @@ void pe_src_send_capabilities_run(void *obj)
 		 *	2) And we are presently not Connected.
 		 */
 		else if ((atomic_test_and_clear_bit(pe->flags, PE_FLAGS_MSG_XMIT_ERROR) ||
-			atomic_test_and_clear_bit(pe->flags, PE_FLAGS_MSG_DISCARDED))
-			&& (atomic_test_bit(pe->flags, PE_FLAGS_PD_CONNECTED) == false)) {
+			  atomic_test_and_clear_bit(pe->flags, PE_FLAGS_MSG_DISCARDED)) &&
+			 (atomic_test_bit(pe->flags, PE_FLAGS_PD_CONNECTED) == false)) {
 			pe_set_state(dev, PE_SRC_DISCOVERY);
 		}
 		break;
@@ -232,7 +231,7 @@ void pe_src_send_capabilities_run(void *obj)
 			if (received_data_message(dev, header, PD_DATA_REQUEST)) {
 				/* Set to highest revision supported by both ports */
 				prl_set_rev(dev, PD_PACKET_SOP,
-					MIN(PD_REV30, header.specification_revision));
+					    MIN(PD_REV30, header.specification_revision));
 				pe_set_state(dev, PE_SRC_NEGOTIATE_CAPABILITY);
 			}
 		}
@@ -267,8 +266,7 @@ void pe_src_negotiate_capability_entry(void *obj)
 	 * Ask the Device Policy Manager to evaluate the Request
 	 * from the Attached Sink.
 	 */
-	pe->snk_request_reply =
-		policy_check_sink_request(dev, pe->snk_request);
+	pe->snk_request_reply = policy_check_sink_request(dev, pe->snk_request);
 
 	/*
 	 * The Policy Engine Shall transition to the
@@ -380,8 +378,7 @@ void pe_src_ready_entry(void *obj)
 	 * Else on entry to the PE_SRC_Ready state the Source Shall notify the
 	 * Protocol Layer of the end of the Atomic Message Sequence (AMS).
 	 */
-	if (atomic_test_and_clear_bit(pe->flags,
-				PE_FLAGS_PROTOCOL_ERROR_NO_SOFT_RESET)) {
+	if (atomic_test_and_clear_bit(pe->flags, PE_FLAGS_PROTOCOL_ERROR_NO_SOFT_RESET)) {
 		pe_dpm_end_ams(dev);
 	}
 }
@@ -605,9 +602,9 @@ void pe_src_capability_response_run(void *obj)
 	 *	3: A Wait Message has been sent.
 	 */
 	if (atomic_test_bit(pe->flags, PE_FLAGS_EXPLICIT_CONTRACT) &&
-			((pe->snk_request_reply == SNK_REQUEST_REJECT &&
-			policy_present_contract_is_valid(dev, pe->present_contract)) ||
-			(pe->snk_request_reply == SNK_REQUEST_WAIT))) {
+	    ((pe->snk_request_reply == SNK_REQUEST_REJECT &&
+	      policy_present_contract_is_valid(dev, pe->present_contract)) ||
+	     (pe->snk_request_reply == SNK_REQUEST_WAIT))) {
 		pe_set_state(dev, PE_SRC_READY);
 	}
 	/*
@@ -618,7 +615,7 @@ void pe_src_capability_response_run(void *obj)
 	 *	   is Invalid
 	 */
 	else if (atomic_test_bit(pe->flags, PE_FLAGS_EXPLICIT_CONTRACT) &&
-			policy_present_contract_is_valid(dev, pe->present_contract) == false) {
+		 policy_present_contract_is_valid(dev, pe->present_contract) == false) {
 		pe_set_state(dev, PE_SRC_HARD_RESET);
 	}
 	/*
@@ -718,5 +715,4 @@ void pe_src_hard_reset_entry(void *obj)
 	 * the PHY Layer
 	 */
 	prl_execute_hard_reset(dev);
-
 }

subsys/usb/usb_c/usbc_prl.c

@@ -624,7 +624,7 @@ static void prl_tx_wait_for_message_request_run(void *obj)
 	 */
 	if (data->rev[PD_PACKET_SOP] == PD_REV30 && pe_dpm_initiated_ams(dev)) {
 		if (atomic_test_bit(&prl_tx->flags, PRL_FLAGS_WAIT_SINK_OK) ||
-			atomic_test_bit(&prl_tx->flags, PRL_FLAGS_SINK_NG)) {
+		    atomic_test_bit(&prl_tx->flags, PRL_FLAGS_SINK_NG)) {
 			/*
 			 * If we are already in an AMS then allow the
 			 * multi-message AMS to continue.
@@ -637,7 +637,7 @@ static void prl_tx_wait_for_message_request_run(void *obj)
 			 * Policy Engine
 			 */
 			if (IS_ENABLED(CONFIG_USBC_CSM_SOURCE_ONLY) &&
-				pe_get_power_role(dev) == TC_ROLE_SOURCE) {
+			    pe_get_power_role(dev) == TC_ROLE_SOURCE) {
 				atomic_set_bit(&prl_tx->flags, PRL_FLAGS_SINK_NG);
 				prl_tx_set_state(dev, PRL_TX_SRC_SOURCE_TX);
 			} else {
@@ -1260,6 +1260,7 @@ static void prl_rx_wait_for_phy_message(const struct device *dev)
 /**
  * @brief Protocol Layer Transmit State table
  */
+/* clang-format off */
 static const struct smf_state prl_tx_states[PRL_TX_STATE_COUNT] = {
 	[PRL_TX_PHY_LAYER_RESET] = SMF_CREATE_STATE(
 		prl_tx_phy_layer_reset_entry,
@@ -1320,11 +1321,13 @@ static const struct smf_state prl_tx_states[PRL_TX_STATE_COUNT] = {
 		NULL),
 #endif
 };
+/* clang-format on */
 BUILD_ASSERT(ARRAY_SIZE(prl_tx_states) == PRL_TX_STATE_COUNT);
 
 /**
  * @brief Protocol Layer Hard Reset State table
  */
+/* clang-format off */
 static const struct smf_state prl_hr_states[PRL_HR_STATE_COUNT] = {
 	[PRL_HR_WAIT_FOR_REQUEST] = SMF_CREATE_STATE(
 		prl_hr_wait_for_request_entry,
@@ -1357,4 +1360,5 @@ static const struct smf_state prl_hr_states[PRL_HR_STATE_COUNT] = {
 		NULL,
 		NULL),
 };
+/* clang-format on */
 BUILD_ASSERT(ARRAY_SIZE(prl_hr_states) == PRL_HR_STATE_COUNT);

subsys/usb/usb_c/usbc_stack.c

@@ -45,6 +45,8 @@ static ALWAYS_INLINE void usbc_handler(void *port_dev)
 	}
 }
 
+/* format makes the backslashes exceed 100 lines: */
+/* clang-format off */
 #define USBC_SUBSYS_INIT(inst)                                                                     \
 	K_THREAD_STACK_DEFINE(my_stack_area_##inst, CONFIG_USBC_STACK_SIZE);                       \
                                                                                                    \
@@ -91,7 +93,7 @@ static ALWAYS_INLINE void usbc_handler(void *port_dev)
 	DEVICE_DT_INST_DEFINE(inst, &usbc_subsys_init, NULL, &usbc_port_data_##inst,               \
 			      &usbc_port_config_##inst, POST_KERNEL,                               \
 			      CONFIG_USBC_STACK_INIT_PRIORITY, NULL);
-
+/* clang-format on */
 DT_INST_FOREACH_STATUS_OKAY(USBC_SUBSYS_INIT)
 
 /**
@@ -207,8 +209,8 @@ void usbc_set_policy_cb_get_rdo(const struct device *dev,
  * @brief Set the callback for checking if Sink Power Supply is at
  *	  default level
  */
-void usbc_set_policy_cb_is_snk_at_default(const struct device *dev,
-				const policy_cb_is_snk_at_default_t policy_cb_is_snk_at_default)
+void usbc_set_policy_cb_is_snk_at_default(
+	const struct device *dev, const policy_cb_is_snk_at_default_t policy_cb_is_snk_at_default)
 {
 	struct usbc_port_data *data = dev->data;
 
@@ -221,7 +223,7 @@ void usbc_set_policy_cb_is_snk_at_default(const struct device *dev,
  * @brief Set the callback for sending the Sink Caps to the DPM
  */
 void usbc_set_policy_cb_set_port_partner_snk_cap(const struct device *dev,
-				    const policy_cb_set_port_partner_snk_cap_t cb)
+						 const policy_cb_set_port_partner_snk_cap_t cb)
 {
 	struct usbc_port_data *data = dev->data;
 
@@ -232,8 +234,7 @@ void usbc_set_policy_cb_set_port_partner_snk_cap(const struct device *dev,
  * @brief Set the callback that gets the Source Capabilities from the
  *        Device Policy Manager
  */
-void usbc_set_policy_cb_get_src_caps(const struct device *dev,
-				     const policy_cb_get_src_caps_t cb)
+void usbc_set_policy_cb_get_src_caps(const struct device *dev, const policy_cb_get_src_caps_t cb)
 {
 	struct usbc_port_data *data = dev->data;
 
@@ -256,8 +257,7 @@ void usbc_set_policy_cb_get_src_rp(const struct device *dev,
  * @brief Set the callback that controls the sourcing of VBUS from the
  *        Device Policy Manager
  */
-void usbc_set_policy_cb_src_en(const struct device *dev,
-			       const policy_cb_src_en_t policy_cb_src_en)
+void usbc_set_policy_cb_src_en(const struct device *dev, const policy_cb_src_en_t policy_cb_src_en)
 {
 	struct usbc_port_data *data = dev->data;
 
@@ -278,8 +278,7 @@ void usbc_set_policy_cb_check_sink_request(const struct device *dev,
 /**
  * @brief Set the callback for checking if the Source Power Supply is ready
  */
-void usbc_set_policy_cb_is_ps_ready(const struct device *dev,
-					const policy_cb_is_ps_ready_t cb)
+void usbc_set_policy_cb_is_ps_ready(const struct device *dev, const policy_cb_is_ps_ready_t cb)
 {
 	struct usbc_port_data *data = dev->data;
 
@@ -290,7 +289,7 @@ void usbc_set_policy_cb_is_ps_ready(const struct device *dev,
  * @brief Set the callback for checking if the Present Contract is still valid
  */
 void usbc_set_policy_cb_present_contract_is_valid(const struct device *dev,
-					const policy_cb_present_contract_is_valid_t cb)
+						  const policy_cb_present_contract_is_valid_t cb)
 {
 	struct usbc_port_data *data = dev->data;
 
@@ -313,8 +312,7 @@ void usbc_set_policy_cb_change_src_caps(const struct device *dev,
  * @brief Set the callback that controls the sourcing of VCONN from the
  *        Device Policy Manager
  */
-void usbc_set_vconn_control_cb(const struct device *dev,
-			       const tcpc_vconn_control_cb_t cb)
+void usbc_set_vconn_control_cb(const struct device *dev, const tcpc_vconn_control_cb_t cb)
 {
 	struct usbc_port_data *data = dev->data;
 	const struct device *tcpc = data->tcpc;
@@ -326,8 +324,7 @@ void usbc_set_vconn_control_cb(const struct device *dev,
  * @brief Set the callback that discharges VCONN from the
  *        Device Policy Manager
  */
-void usbc_set_vconn_discharge(const struct device *dev,
-			      const tcpc_vconn_discharge_cb_t cb)
+void usbc_set_vconn_discharge(const struct device *dev, const tcpc_vconn_discharge_cb_t cb)
 {
 	struct usbc_port_data *data = dev->data;
 	const struct device *tcpc = data->tcpc;