espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-09-01 23:09:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[platform] attach timestamp in promiscuous mode (#2954)

Browse Source
This commit is contained in:
Yakun Xu
2018-08-10 09:26:11 -07:00
committed by Jonathan Hui
parent d2e59fd645
commit 0c07c53ce3
10 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/platforms/cc2538/radio.c
+8 -7
View File
@@ -497,7 +497,7 @@ void otPlatRadioSetPromiscuous(otInstance *aInstance, bool aEnable)
}
}
void readFrame(void)
void readFrame(otInstance *aInstance)
{
uint8_t length;
uint8_t crcCorr;
@@ -510,11 +510,12 @@ void readFrame(void)
length = HWREG(RFCORE_SFR_RFDATA);
otEXPECT(IEEE802154_MIN_LENGTH <= length && length <= IEEE802154_MAX_LENGTH);
#if OPENTHREAD_ENABLE_RAW_LINK_API
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(aInstance))
{
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
// read psdu
for (i = 0; i < length - 2; i++)
@@ -553,7 +554,7 @@ exit:
void cc2538RadioProcess(otInstance *aInstance)
{
readFrame();
readFrame(aInstance);
if ((sState == OT_RADIO_STATE_RECEIVE && sReceiveFrame.mLength > 0) ||
(sState == OT_RADIO_STATE_TRANSMIT && sReceiveFrame.mLength > IEEE802154_ACK_LENGTH))
examples/platforms/cc2650/radio.c
+6 -5
View File
@@ -1824,11 +1824,12 @@ static void cc2650RadioProcessReceiveQueue(otInstance *aInstance)
if (crcCorr->status.bCrcErr == 0 && (len - 2) < OT_RADIO_FRAME_MAX_SIZE)
{
#if OPENTHREAD_ENABLE_RAW_LINK_API
// TODO: Propagate CM0 timestamp
receiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
receiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(aInstance))
{
// TODO: Propagate CM0 timestamp
receiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
receiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
receiveFrame.mLength = len;
receiveFrame.mPsdu = &(payload[1]);
examples/platforms/cc2652/radio.c
+6 -5
View File
@@ -1860,11 +1860,12 @@ static void cc2652RadioProcessReceiveQueue(otInstance *aInstance)
if (crcCorr->status.bCrcErr == 0 && (len - 2) < OT_RADIO_FRAME_MAX_SIZE)
{
#if OPENTHREAD_ENABLE_RAW_LINK_API
// TODO: Propagate CM0 timestamp
receiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
receiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(aInstance))
{
// TODO: Propagate CM0 timestamp
receiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
receiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
receiveFrame.mLength = len;
receiveFrame.mPsdu = &(payload[1]);
examples/platforms/da15000/radio.c
+8 -6
View File
@@ -140,7 +140,7 @@ void da15000RadioInit(void)
sReceiveFrame[ptr].mPsdu = &sReceivePsdu[ptr][0];
}
otLogInfoPlat(sInstance, "Radio initialized", NULL);
otLogInfoPlat(sThreadInstance, "Radio initialized", NULL);
}
void otPlatRadioGetIeeeEui64(otInstance *aInstance, uint8_t *aIeeeEui64)
@@ -587,11 +587,13 @@ void ftdf_rcv_frame_transparent(ftdf_data_length_t frame_length,
{
radioRssiCalc(link_quality);
#if OPENTHREAD_ENABLE_RAW_LINK_API
// Timestamp
sReceiveFrame[sWriteFrame].mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame[sWriteFrame].mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(sThreadInstance))
{
// Timestamp
sReceiveFrame[sWriteFrame].mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame[sWriteFrame].mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
sReceiveFrame[sWriteFrame].mChannel = sChannel;
sReceiveFrame[sWriteFrame].mLength = frame_length;
sReceiveFrame[sWriteFrame].mInfo.mRxInfo.mLqi = OT_RADIO_LQI_NONE;
examples/platforms/emsk/radio.c
+8 -7
View File
@@ -429,7 +429,7 @@ void otPlatRadioSetPromiscuous(otInstance *aInstance, bool aEnable)
mrf24j40_set_promiscuous(~aEnable);
}
void readFrame(void)
void readFrame(otInstance *aInstance)
{
/* readBuffer
* 1 bit -- 5 to 127 bits -- 1 bit -- 1bit
@@ -462,11 +462,12 @@ void readFrame(void)
otEXPECT_ACTION(IEEE802154_MIN_LENGTH <= length && length <= IEEE802154_MAX_LENGTH, ;);
#if OPENTHREAD_ENABLE_RAW_LINK_API
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(aInstance))
{
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
/* Read PSDU */
memcpy(sReceiveFrame.mPsdu, readBuffer, length - 2);
@@ -535,7 +536,7 @@ void emskRadioProcess(otInstance *aInstance)
{
numRadioProcess++;
readFrame();
readFrame(aInstance);
uint8_t reg = mrf24j40_read_short_ctrl_reg(MRF24J40_TXSTAT);
if (reg & MRF24J40_TXNSTAT)
examples/platforms/kw41z/radio.c
+8 -5
View File
@@ -105,6 +105,7 @@ static uint8_t sTxData[OT_RADIO_FRAME_MAX_SIZE];
#if DOUBLE_BUFFERING
static uint8_t sRxData[OT_RADIO_FRAME_MAX_SIZE];
#endif
static otInstance *sInstance = NULL;
/* Private functions */
static void rf_abort(void);
@@ -182,6 +183,7 @@ otError otPlatRadioEnable(otInstance *aInstance)
{
otEXPECT(!otPlatRadioIsEnabled(aInstance));
sInstance = aInstance;
ZLL->PHY_CTRL &= ~ZLL_PHY_CTRL_TRCV_MSK_MASK;
NVIC_ClearPendingIRQ(Radio_1_IRQn);
NVIC_EnableIRQ(Radio_1_IRQn);
@@ -749,11 +751,12 @@ static bool rf_process_rx_frame(void)
/* Check if frame is valid */
otEXPECT_ACTION((IEEE802154_MIN_LENGTH <= temp) && (temp <= IEEE802154_MAX_LENGTH), status = false);
#if OPENTHREAD_ENABLE_RAW_LINK_API
// Timestamp
sRxFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sRxFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(sInstance))
{
// Timestamp
sRxFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sRxFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
sRxFrame.mLength = temp;
temp = (ZLL->LQI_AND_RSSI & ZLL_LQI_AND_RSSI_LQI_VALUE_MASK) >> ZLL_LQI_AND_RSSI_LQI_VALUE_SHIFT;
examples/platforms/nrf52840/radio.c
+8 -11
View File
@@ -82,8 +82,8 @@ static uint8_t sTransmitPsdu[OT_RADIO_FRAME_MAX_SIZE + 1];
#if OPENTHREAD_CONFIG_HEADER_IE_SUPPORT
static otRadioIeInfo sTransmitIeInfo;
static otRadioIeInfo sReceivedIeInfos[NRF_802154_RX_BUFFERS];
static otInstance * sInstance = NULL;
#endif
static otInstance *sInstance = NULL;
static otRadioFrame sAckFrame;
@@ -258,7 +258,7 @@ otRadioState otPlatRadioGetState(otInstance *aInstance)
otError otPlatRadioEnable(otInstance *aInstance)
{
(void)aInstance;
sInstance = aInstance;
otError error;
@@ -334,10 +334,6 @@ otError otPlatRadioReceive(otInstance *aInstance, uint8_t aChannel)
otError otPlatRadioTransmit(otInstance *aInstance, otRadioFrame *aFrame)
{
#if OPENTHREAD_CONFIG_HEADER_IE_SUPPORT
sInstance = aInstance;
#endif
otError result = OT_ERROR_NONE;
aFrame->mPsdu[-1] = aFrame->mLength;
@@ -704,11 +700,12 @@ void nrf_802154_received_raw(uint8_t *p_data, int8_t power, uint8_t lqi)
receivedFrame->mInfo.mRxInfo.mRssi = power;
receivedFrame->mInfo.mRxInfo.mLqi = lqi;
receivedFrame->mChannel = nrf_802154_channel_get();
#if OPENTHREAD_ENABLE_RAW_LINK_API
uint64_t timestamp = nrf5AlarmGetCurrentTime();
receivedFrame->mInfo.mRxInfo.mMsec = timestamp / US_PER_MS;
receivedFrame->mInfo.mRxInfo.mUsec = timestamp - receivedFrame->mInfo.mRxInfo.mMsec * US_PER_MS;
#endif
if (otPlatRadioGetPromiscuous(sInstance))
{
uint64_t timestamp = nrf5AlarmGetCurrentTime();
receivedFrame->mInfo.mRxInfo.mMsec = timestamp / US_PER_MS;
receivedFrame->mInfo.mRxInfo.mUsec = timestamp - receivedFrame->mInfo.mRxInfo.mMsec * US_PER_MS;
}
#if OPENTHREAD_CONFIG_ENABLE_TIME_SYNC
// Get the timestamp when the SFD was received.
uint32_t offset =
examples/platforms/posix/radio.c
+6 -5
View File
@@ -571,11 +571,12 @@ void radioReceive(otInstance *aInstance)
exit(EXIT_FAILURE);
}
#if OPENTHREAD_ENABLE_RAW_LINK_API
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(aInstance))
{
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
#if OPENTHREAD_CONFIG_ENABLE_TIME_SYNC
sReceiveFrame.mIeInfo->mTimestamp = otPlatTimeGet();
examples/platforms/posix/sim/radio-sim.c
+6 -5
View File
@@ -475,11 +475,12 @@ void platformRadioReceive(otInstance *aInstance, uint8_t *aBuf, uint16_t aBufLen
memcpy(&sReceiveMessage, aBuf, aBufLength);
#if OPENTHREAD_ENABLE_RAW_LINK_API
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(aInstance))
{
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
sReceiveFrame.mLength = (uint8_t)(aBufLength - 1);
examples/platforms/samr21/radio.c
+6 -5
View File
@@ -214,11 +214,12 @@ static void handleRx(void)
{
sRxDone = false;
#if OPENTHREAD_ENABLE_RAW_LINK_API
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
#endif
if (otPlatRadioGetPromiscuous(sInstance))
{
// Timestamp
sReceiveFrame.mInfo.mRxInfo.mMsec = otPlatAlarmMilliGetNow();
sReceiveFrame.mInfo.mRxInfo.mUsec = 0; // Don't support microsecond timer for now.
}
#if OPENTHREAD_ENABLE_DIAG