michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ieee802154: rf2xx: Add RX improvements

Browse source 
The current version of at86rf2xx RX implementation don't uses advanced
capabilities offer by the transceiver. This access SRAM space to gatter
PHR information in parallel with transceiver frame reception. It allows
improve RX reception by handling properlly the frame protection feature
removing transceiver states changes.

Signed-off-by: Gerson Fernando Budke <nandojve@gmail.com>
This commit is contained in:
Gerson Fernando Budke 2020-01-26 14:57:24 -03:00 • committed by Johan Hedberg
commit be56e36fe4
2 changed files with 52 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

72
drivers/ieee802154/ieee802154_rf2xx.c
View file

@ -1,7 +1,7 @@
/* ieee802154_rf2xx.c - ATMEL RF2XX IEEE 802.15.4 Driver */ /* ieee802154_rf2xx.c - ATMEL RF2XX IEEE 802.15.4 Driver */
/* /*
* Copyright (c) 2019 Gerson Fernando Budke * Copyright (c) 2019-2020 Gerson Fernando Budke
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -104,6 +104,25 @@ static void rf2xx_trx_set_state(struct device *dev,
RF2XX_TRX_PHY_STATUS_MASK)); RF2XX_TRX_PHY_STATUS_MASK));
} }
static void rf2xx_trx_set_tx_state(struct device *dev)
{
u8_t status;
/**
* Ensures that RX automatically ACK will be sent when requested.
* Datasheet: Chapter 7.2.3 RX_AACK_ON – Receive with Automatic ACK
* Datasheet: Figure 7-13. Timing Example of an RX_AACK Transaction
* for Slotted Operation.
*/
do {
status = (rf2xx_iface_reg_read(dev, RF2XX_TRX_STATUS_REG) &
RF2XX_TRX_PHY_STATUS_MASK);
} while (status == RF2XX_TRX_PHY_STATUS_BUSY_RX_AACK ||
status == RF2XX_TRX_PHY_STATUS_STATE_TRANSITION);
rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TX_ARET_ON);
}
static void rf2xx_trx_set_rx_state(struct device *dev) static void rf2xx_trx_set_rx_state(struct device *dev)
{ {
rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TRX_OFF); rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TRX_OFF);
@ -131,8 +150,12 @@ static void rf2xx_trx_rx(struct device *dev)
* This obligate the driver to have rx_buf statically allocated with * This obligate the driver to have rx_buf statically allocated with
* RX2XX_MAX_FRAME_SIZE. * RX2XX_MAX_FRAME_SIZE.
*/ */
rf2xx_iface_frame_read(dev, rx_buf, RX2XX_FRAME_HEADER_SIZE); if (ctx->trx_model != RF2XX_TRX_MODEL_231) {
pkt_len = rx_buf[RX2XX_FRAME_PHR_INDEX]; pkt_len = ctx->rx_phr;
} else {
rf2xx_iface_frame_read(dev, rx_buf, RX2XX_FRAME_HEADER_SIZE);
pkt_len = rx_buf[RX2XX_FRAME_PHR_INDEX];
}
if (pkt_len < RX2XX_FRAME_MIN_PHR_SIZE) { if (pkt_len < RX2XX_FRAME_MIN_PHR_SIZE) {
LOG_ERR("invalid RX frame length"); LOG_ERR("invalid RX frame length");
@ -195,21 +218,26 @@ static void rf2xx_process_rx_frame(struct device *dev)
{ {
struct rf2xx_context *ctx = dev->driver_data; struct rf2xx_context *ctx = dev->driver_data;
/* Ensures that automatically ACK will be sent
* when requested
*/
while (rf2xx_iface_reg_read(dev, RF2XX_TRX_STATUS_REG) ==
RF2XX_TRX_PHY_STATUS_BUSY_RX_AACK) {
;
};
/* Set PLL_ON to avoid transceiver receive
* new data until finish reading process
*/
rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_PLL_ON);
k_timer_stop(&ctx->trx_isr_timeout); k_timer_stop(&ctx->trx_isr_timeout);
rf2xx_trx_rx(dev);
rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_RX_AACK_ON); if (ctx->trx_model != RF2XX_TRX_MODEL_231) {
rf2xx_trx_rx(dev);
} else {
/* Ensures that automatically ACK will be sent
* when requested
*/
while (rf2xx_iface_reg_read(dev, RF2XX_TRX_STATUS_REG) ==
RF2XX_TRX_PHY_STATUS_BUSY_RX_AACK) {
;
};
/* Set PLL_ON to avoid transceiver receive
* new data until finish reading process
*/
rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_PLL_ON);
rf2xx_trx_rx(dev);
rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_RX_AACK_ON);
}
} }
static void rf2xx_process_tx_frame(struct device *dev) static void rf2xx_process_tx_frame(struct device *dev)
@ -274,6 +302,10 @@ static void rf2xx_thread_main(void *arg)
if (isr_status & (1 << RF2XX_RX_START)) { if (isr_status & (1 << RF2XX_RX_START)) {
ctx->trx_state = RF2XX_TRX_PHY_BUSY_RX; ctx->trx_state = RF2XX_TRX_PHY_BUSY_RX;
k_timer_start(&ctx->trx_isr_timeout, K_MSEC(10), 0); k_timer_start(&ctx->trx_isr_timeout, K_MSEC(10), 0);
if (ctx->trx_model != RF2XX_TRX_MODEL_231) {
rf2xx_iface_sram_read(dev, 0, &ctx->rx_phr, 1);
}
} else if (isr_status & (1 << RF2XX_TRX_END)) { } else if (isr_status & (1 << RF2XX_TRX_END)) {
rf2xx_process_trx_end(dev); rf2xx_process_trx_end(dev);
} }
@ -462,11 +494,7 @@ static int rf2xx_tx(struct device *dev,
ctx->trx_state = RF2XX_TRX_PHY_BUSY_TX; ctx->trx_state = RF2XX_TRX_PHY_BUSY_TX;
abort = false; abort = false;
/** rf2xx_trx_set_tx_state(dev);
* Set extended TX mode
* Datasheet: chapter 7.2 Extended Operating Mode
*/
rf2xx_trx_set_state(dev, RF2XX_TRX_PHY_STATE_CMD_TX_ARET_ON);
rf2xx_iface_reg_read(dev, RF2XX_IRQ_STATUS_REG); rf2xx_iface_reg_read(dev, RF2XX_IRQ_STATUS_REG);
rf2xx_iface_frame_write(dev, frag->data, frag->len); rf2xx_iface_frame_write(dev, frag->data, frag->len);
rf2xx_iface_phy_tx_start(dev); rf2xx_iface_phy_tx_start(dev);

3
drivers/ieee802154/ieee802154_rf2xx.h
View file

@ -1,7 +1,7 @@
/* ieee802154_rf2xx.h - IEEE 802.15.4 Driver definition for ATMEL RF2XX */ /* ieee802154_rf2xx.h - IEEE 802.15.4 Driver definition for ATMEL RF2XX */
/* /*
* Copyright (c) 2019 Gerson Fernando Budke * Copyright (c) 2019-2020 Gerson Fernando Budke
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -139,6 +139,7 @@ struct rf2xx_context {
u8_t pkt_ed; u8_t pkt_ed;
s8_t trx_rssi_base; s8_t trx_rssi_base;
u8_t trx_version; u8_t trx_version;
u8_t rx_phr;
}; };
#endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_RF2XX_H_ */ #endif /* ZEPHYR_DRIVERS_IEEE802154_IEEE802154_RF2XX_H_ */