espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-16 15:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

KW41Z: Pass up ACK frames to support the new transmit done callback (#1848)

Browse Source 
* KW41Z: Pass up ACK frames to support the new transmit done callback #1840

* Remove support for legacy transmit done
This commit is contained in:
georgecpr
2017-05-31 09:05:47 -07:00
committed by Jonathan Hui
parent 915261b36b
commit 7b478b9320
2 changed files with 81 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/kw41z/openthread-core-kw41z-config.h
-8
View File
@@ -75,12 +75,4 @@
*/
#define OPENTHREAD_CONFIG_ENABLE_SOFTWARE_RETRANSMIT 1
/**
* @def OPENTHREAD_CONFIG_LEGACY_TRANSMIT_DONE
*
* Define to 1 if you want use legacy transmit done.
*
*/
#define OPENTHREAD_CONFIG_LEGACY_TRANSMIT_DONE 1
#endif // OPENTHREAD_CORE_KW41Z_CONFIG_H_
examples/platforms/kw41z/radio.c
+81 -35
View File
@@ -41,18 +41,25 @@
#include "openthread/platform/diag.h"
#include <utils/code_utils.h>
#define DOUBLE_BUFFERING (1)
#define DEFAULT_CHANNEL (11)
#define IEEE802154_ACK_REQUEST (1 << 5)
#define DEFAULT_CCA_MODE (XCVR_CCA_MODE1_c)
#define IEEE802154_TURNAROUND_LEN (12)
#define IEEE802154_CCA_LEN (8)
#define IEEE802154_PHY_SHR_LEN (10)
#define IEEE802154_ACK_WAIT (54)
#define ZLL_IRQSTS_TMR_ALL_MSK_MASK (ZLL_IRQSTS_TMR1MSK_MASK | \
ZLL_IRQSTS_TMR2MSK_MASK | \
ZLL_IRQSTS_TMR3MSK_MASK | \
ZLL_IRQSTS_TMR4MSK_MASK )
#define DOUBLE_BUFFERING (1)
#define DEFAULT_CHANNEL (11)
#define DEFAULT_CCA_MODE (XCVR_CCA_MODE1_c)
#define IEEE802154_ACK_REQUEST (1 << 5)
#define IEEE802154_MAX_LENGTH (127)
#define IEEE802154_MIN_LENGTH (5)
#define IEEE802154_ACK_LENGTH (IEEE802154_MIN_LENGTH)
#define IEEE802154_FRM_CTL_LO_OFFSET (0)
#define IEEE802154_DSN_OFFSET (2)
#define IEEE802154_FRM_TYPE_MASK (0x7)
#define IEEE802154_FRM_TYPE_ACK (0x2)
#define IEEE802154_TURNAROUND_LEN (12)
#define IEEE802154_CCA_LEN (8)
#define IEEE802154_PHY_SHR_LEN (10)
#define IEEE802154_ACK_WAIT (54)
#define ZLL_IRQSTS_TMR_ALL_MSK_MASK (ZLL_IRQSTS_TMR1MSK_MASK | \
ZLL_IRQSTS_TMR2MSK_MASK | \
ZLL_IRQSTS_TMR3MSK_MASK | \
ZLL_IRQSTS_TMR4MSK_MASK )
typedef enum xcvr_state_tag
{
@@ -83,7 +90,6 @@ static int8_t sAutoTxPwrLevel = 0;
static bool sTxDone = false;
static bool sRxDone = false;
static bool sEdScanDone = false;
static bool sAckFpState;
static otError sTxStatus;
static otRadioFrame sTxFrame;
@@ -105,6 +111,7 @@ static uint16_t rf_get_addr_checksum(uint8_t *pAddr, bool ExtendedAddr, uint
static otError rf_add_addr_table_entry(uint16_t checksum, bool extendedAddr);
static otError rf_remove_addr_table_entry(uint16_t checksum);
static otError rf_remove_addr_table_entry_index(uint8_t index);
static bool rf_process_rx_frame(void);
otRadioState otPlatRadioGetState(otInstance *aInstance)
{
@@ -351,9 +358,8 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aFrame)
ZLL->IRQSTS = ZLL->IRQSTS;
/* Perform automatic reception of ACK frame, if required */
if (aFrame->mPsdu[0] & IEEE802154_ACK_REQUEST)
if (aFrame->mPsdu[IEEE802154_FRM_CTL_LO_OFFSET] & IEEE802154_ACK_REQUEST)
{
ZLL->PHY_CTRL |= ZLL_PHY_CTRL_RXACKRQD_MASK;
ZLL->PHY_CTRL |= XCVR_TR_c;
/* Set ACK wait time-out */
timeout = rf_get_timestamp();
@@ -365,11 +371,10 @@ otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aFrame)
}
else
{
ZLL->PHY_CTRL &= ~ZLL_PHY_CTRL_RXACKRQD_MASK;
ZLL->PHY_CTRL |= XCVR_TX_c;
}
sAckFpState = false;
sTxStatus = OT_ERROR_NONE;
sState = OT_RADIO_STATE_TRANSMIT;
/* Unmask SEQ interrupt */
ZLL->PHY_CTRL &= ~ZLL_PHY_CTRL_SEQMSK_MASK;
@@ -706,11 +711,39 @@ static void rf_set_timeout(uint32_t abs_timeout)
ZLL->PHY_CTRL |= ZLL_PHY_CTRL_TMR3CMP_EN_MASK;
}
static bool rf_process_rx_frame(void)
{
uint8_t temp;
bool status = true;
/* Get Rx length */
temp = (ZLL->IRQSTS & ZLL_IRQSTS_RX_FRAME_LENGTH_MASK) >> ZLL_IRQSTS_RX_FRAME_LENGTH_SHIFT;
/* Check if frame is valid */
otEXPECT_ACTION((IEEE802154_MIN_LENGTH <= temp) && (temp <= IEEE802154_MAX_LENGTH), status = false);
sRxFrame.mLength = temp;
temp = (ZLL->LQI_AND_RSSI & ZLL_LQI_AND_RSSI_LQI_VALUE_MASK) >> ZLL_LQI_AND_RSSI_LQI_VALUE_SHIFT;
sRxFrame.mLqi = rf_lqi_adjust(temp);
sRxFrame.mPower = rf_lqi_to_rssi(sRxFrame.mLqi);
#if DOUBLE_BUFFERING
for (temp = 0; temp < sRxFrame.mLength - 2; temp++)
{
sRxData[temp] = ((uint8_t *)ZLL->PKT_BUFFER_RX)[temp];
}
#endif
exit:
return status;
}
void Radio_1_IRQHandler(void)
{
xcvr_state_t state = rf_get_state();
uint32_t irqStatus = ZLL->IRQSTS;
uint8_t temp;
int8_t temp;
ZLL->IRQSTS = irqStatus;
@@ -745,39 +778,43 @@ void Radio_1_IRQHandler(void)
switch (state)
{
case XCVR_RX_c:
temp = (ZLL->LQI_AND_RSSI & ZLL_LQI_AND_RSSI_LQI_VALUE_MASK) >> ZLL_LQI_AND_RSSI_LQI_VALUE_SHIFT;
sRxFrame.mLength = (ZLL->IRQSTS & ZLL_IRQSTS_RX_FRAME_LENGTH_MASK) >> ZLL_IRQSTS_RX_FRAME_LENGTH_SHIFT;
sRxFrame.mLqi = rf_lqi_adjust(temp);
sRxFrame.mPower = rf_lqi_to_rssi(sRxFrame.mLqi);
#if DOUBLE_BUFFERING
memcpy(sRxData, (void *)ZLL->PKT_BUFFER_RX, sRxFrame.mLength);
#endif
sRxDone = true;
sRxDone = rf_process_rx_frame();
break;
case XCVR_TX_c:
case XCVR_TR_c:
sState = OT_RADIO_STATE_RECEIVE;
if ((ZLL->PHY_CTRL & ZLL_PHY_CTRL_CCABFRTX_MASK) && (irqStatus & ZLL_IRQSTS_CCA_MASK))
{
sTxStatus = OT_ERROR_CHANNEL_ACCESS_FAILURE;
}
else
else if (!(irqStatus & ZLL_IRQSTS_RXIRQ_MASK) ||
(rf_process_rx_frame() == false) ||
(sRxFrame.mLength != IEEE802154_ACK_LENGTH) ||
((sRxFrame.mPsdu[IEEE802154_FRM_CTL_LO_OFFSET] & IEEE802154_FRM_TYPE_MASK) != IEEE802154_FRM_TYPE_ACK) ||
(sRxFrame.mPsdu[IEEE802154_DSN_OFFSET] != sTxFrame.mPsdu[IEEE802154_DSN_OFFSET]))
{
sAckFpState = (irqStatus & ZLL_IRQSTS_RX_FRM_PEND_MASK) > 0;
sTxStatus = OT_ERROR_NONE;
sTxStatus = OT_ERROR_NO_ACK;
}
sState = OT_RADIO_STATE_RECEIVE;
sTxDone = true;
break;
case XCVR_TX_c:
if ((ZLL->PHY_CTRL & ZLL_PHY_CTRL_CCABFRTX_MASK) && (irqStatus & ZLL_IRQSTS_CCA_MASK))
{
sTxStatus = OT_ERROR_CHANNEL_ACCESS_FAILURE;
}
sState = OT_RADIO_STATE_RECEIVE;
sTxDone = true;
break;
case XCVR_CCA_c:
temp = (ZLL->LQI_AND_RSSI & ZLL_LQI_AND_RSSI_CCA1_ED_FNL_MASK) >> ZLL_LQI_AND_RSSI_CCA1_ED_FNL_SHIFT;
if ((int8_t)temp > sMaxED)
if (temp > sMaxED)
{
sMaxED = (int8_t)temp;
sMaxED = temp;
}
if (!sEdScanDone)
@@ -838,6 +875,7 @@ void kw41zRadioInit(void)
ZLL->RX_FRAME_FILTER = ZLL_RX_FRAME_FILTER_FRM_VER_FILTER(3) |
ZLL_RX_FRAME_FILTER_CMD_FT_MASK |
ZLL_RX_FRAME_FILTER_DATA_FT_MASK |
ZLL_RX_FRAME_FILTER_ACK_FT_MASK |
ZLL_RX_FRAME_FILTER_BEACON_FT_MASK;
/* Set prescaller to obtain 1 symbol (16us) timebase */
@@ -875,7 +913,15 @@ void kw41zRadioProcess(otInstance *aInstance)
{
if (sTxDone)
{
otPlatRadioTransmitDone(aInstance, &sTxFrame, sAckFpState, sTxStatus);
if (sTxFrame.mPsdu[IEEE802154_FRM_CTL_LO_OFFSET] & IEEE802154_ACK_REQUEST)
{
otPlatRadioTxDone(aInstance, &sTxFrame, &sRxFrame, sTxStatus);
}
else
{
otPlatRadioTxDone(aInstance, &sTxFrame, NULL, sTxStatus);
}
sTxDone = false;
}