move tx

Signed-off-by: Adrian Gielniewski <[email protected]>

Author: adigie

modules/openthread/platform/radio_nrf5.c

@@ -92,10 +92,8 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME, CONFIG_OPENTHREAD_PLATFORM_LOG_LEVEL);
 #endif
 
 enum nrf5_pending_events {
-	PENDING_EVENT_FRAME_TO_SEND,	  /* There is a tx frame to send  */
 	PENDING_EVENT_FRAME_RECEIVED,	  /* Radio has received new frame */
 	PENDING_EVENT_RX_FAILED,	  /* The RX failed */
-	PENDING_EVENT_TX_STARTED,	  /* Radio has started transmitting */
 	PENDING_EVENT_TX_DONE,		  /* Radio transmission finished */
 	PENDING_EVENT_DETECT_ENERGY,	  /* Requested to start Energy Detection procedure */
 	PENDING_EVENT_DETECT_ENERGY_DONE, /* Energy Detection finished */
@@ -575,6 +573,9 @@ static void openthread_handle_received_frame(otInstance *instance, struct nrf5_r
 	recv_frame.mInfo.mRxInfo.mTimestamp = rx_frame->time;
 	recv_frame.mInfo.mRxInfo.mAckedWithSecEnhAck = rx_frame->ack_seb;
 
+	LOG_DBG("RX %p len: %u, ch: %u, rssi: %d", (void *)recv_frame.mPsdu, recv_frame.mLength,
+		recv_frame.mChannel, recv_frame.mInfo.mRxInfo.mRssi);
+
 	if (IS_ENABLED(CONFIG_OPENTHREAD_DIAG) && otPlatDiagModeGet()) {
 		otPlatDiagRadioReceiveDone(instance, &recv_frame, OT_ERROR_NONE);
 	} else {
@@ -688,20 +689,18 @@ static void handle_rx_failed(otInstance *aInstance)
 	}
 }
 
-static void handle_frame_to_send(otInstance *aInstance)
+static otError transmit_frame(otInstance *aInstance)
 {
-	bool ret = false;
+	bool result = true;
 
 	ARG_UNUSED(aInstance);
 
 	if (nrf5_data.tx.frame.mLength > MAX_PACKET_SIZE) {
 		LOG_ERR("Payload (with FCS) too large: %d", nrf5_data.tx.frame.mLength);
-		nrf5_data.tx.result = OT_ERROR_ABORT;
-		set_pending_event(PENDING_EVENT_TX_DONE);
-		return;
+		return OT_ERROR_INVALID_ARGS;
 	}
 
-	LOG_DBG("%p (%u)", nrf5_data.tx.frame.mPsdu, nrf5_data.tx.frame.mLength);
+	LOG_DBG("TX %p len: %u", (void *)nrf5_data.tx.frame.mPsdu, nrf5_data.tx.frame.mLength);
 
 	nrf5_data.tx.psdu[0] = nrf5_data.tx.frame.mLength;
 
@@ -720,33 +719,29 @@ static void handle_frame_to_send(otInstance *aInstance)
 
 	if ((nrf5_data.capabilities & OT_RADIO_CAPS_TRANSMIT_TIMING) &&
 	    (nrf5_data.tx.frame.mInfo.mTxInfo.mTxDelay != 0)) {
-		ret = nrf5_tx_at(&nrf5_data.tx.frame, nrf5_data.tx.psdu);
+		if (!nrf5_tx_at(&nrf5_data.tx.frame, nrf5_data.tx.psdu)) {
+			LOG_ERR("TX at failed");
+			return OT_ERROR_INVALID_STATE;
+		}
 	} else if (nrf5_data.tx.frame.mInfo.mTxInfo.mCsmaCaEnabled) {
 		if (nrf5_data.capabilities & OT_RADIO_CAPS_CSMA_BACKOFF) {
-			ret = nrf5_tx_csma_ca(&nrf5_data.tx.frame, nrf5_data.tx.psdu);
+			result = nrf5_tx_csma_ca(&nrf5_data.tx.frame, nrf5_data.tx.psdu);
 		} else {
-			ret = nrf5_tx(&nrf5_data.tx.frame, nrf5_data.tx.psdu, true);
+			result = nrf5_tx(&nrf5_data.tx.frame, nrf5_data.tx.psdu, true);
 		}
 	} else {
-		ret = nrf5_tx(&nrf5_data.tx.frame, nrf5_data.tx.psdu, false);
+		result = nrf5_tx(&nrf5_data.tx.frame, nrf5_data.tx.psdu, false);
 	}
 
-	if (!ret) {
-		LOG_ERR("Cannot send frame");
-		nrf5_data.tx.result = OT_ERROR_ABORT;
+	otPlatRadioTxStarted(aInstance, &nrf5_data.tx.frame);
+
+	if (!result) {
+		LOG_ERR("TX failed");
+		nrf5_data.tx.result = OT_ERROR_CHANNEL_ACCESS_FAILURE;
 		set_pending_event(PENDING_EVENT_TX_DONE);
-		return;
 	}
 
-	set_pending_event(PENDING_EVENT_TX_STARTED);
-
-	LOG_DBG("Sending frame (ch:%d, txpower:%d)", nrf_802154_channel_get(),
-		nrf_802154_tx_power_get());
-}
-
-static void handle_tx_started(otInstance *aInstance)
-{
-	otPlatRadioTxStarted(aInstance, &nrf5_data.tx.frame);
+	return OT_ERROR_NONE;
 }
 
 static void handle_tx_done(otInstance *aInstance)
@@ -800,16 +795,6 @@ void platformRadioProcess(otInstance *aInstance)
 		handle_rx_failed(aInstance);
 	}
 
-	if (is_pending_event_set(PENDING_EVENT_FRAME_TO_SEND)) {
-		reset_pending_event(PENDING_EVENT_FRAME_TO_SEND);
-		handle_frame_to_send(aInstance);
-	}
-
-	if (is_pending_event_set(PENDING_EVENT_TX_STARTED)) {
-		reset_pending_event(PENDING_EVENT_TX_STARTED);
-		handle_tx_started(aInstance);
-	}
-
 	if (is_pending_event_set(PENDING_EVENT_TX_DONE)) {
 		reset_pending_event(PENDING_EVENT_TX_DONE);
 		handle_tx_done(aInstance);
@@ -1220,8 +1205,7 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aFrame)
 
 	if (nrf5_data.state == OT_RADIO_STATE_RECEIVE || nrf5_data.state == OT_RADIO_STATE_SLEEP) {
 		nrf5_data.state = OT_RADIO_STATE_TRANSMIT;
-		error = OT_ERROR_NONE;
-		set_pending_event(PENDING_EVENT_FRAME_TO_SEND);
+		error = transmit_frame(aInstance);
 	}
 
 	return error;
@@ -1746,16 +1730,15 @@ void nrf_802154_transmitted_raw(uint8_t *frame, const nrf_802154_transmit_done_m
 static otError nrf5_tx_error_to_ot_error(nrf_802154_tx_error_t error)
 {
 	switch (error) {
-	case NRF_802154_TX_ERROR_NO_MEM:
-		return OT_ERROR_NO_BUFS;
 	case NRF_802154_TX_ERROR_BUSY_CHANNEL:
+	case NRF_802154_TX_ERROR_TIMESLOT_ENDED:
+	case NRF_802154_TX_ERROR_TIMESLOT_DENIED:
 		return OT_ERROR_CHANNEL_ACCESS_FAILURE;
 	case NRF_802154_TX_ERROR_INVALID_ACK:
+	case NRF_802154_TX_ERROR_NO_MEM:
 	case NRF_802154_TX_ERROR_NO_ACK:
 		return OT_ERROR_NO_ACK;
 	case NRF_802154_TX_ERROR_ABORTED:
-	case NRF_802154_TX_ERROR_TIMESLOT_DENIED:
-	case NRF_802154_TX_ERROR_TIMESLOT_ENDED:
 	default:
 		return OT_ERROR_ABORT;
 	}
@@ -1766,9 +1749,10 @@ void nrf_802154_transmit_failed(uint8_t *frame, nrf_802154_tx_error_t error,
 {
 	ARG_UNUSED(frame);
 
-	LOG_DBG("nrf_802154_transmit_failed: %u", error);
-
 	nrf5_data.tx.result = nrf5_tx_error_to_ot_error(error);
+
+	LOG_DBG("nrf_802154_transmit_failed: %u, tx result: %u", error, nrf5_data.tx.result);
+
 	update_tx_frame_info(&nrf5_data.tx.frame, metadata);
 
 	set_pending_event(PENDING_EVENT_TX_DONE);