RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

drivers/at86rf215: make TX/RX IRQs read only

Browse Source 
This brings the implementation in sync with the API.
This commit is contained in:
Marian Buschsieweke 2021-02-26 11:23:45 +01:00
parent 134f323fb1
commit 08063bebfe
No known key found for this signature in database
GPG Key ID: 61F64C6599B1539F
4 changed files with 9 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/at86rf215/at86rf215.c
View File

@ -93,6 +93,9 @@ void at86rf215_reset_and_cfg(at86rf215_t *dev)
/* default to requesting ACKs, just like at86rf2xx */
const netopt_enable_t enable = NETOPT_ENABLE;
netdev_ieee802154_set(&dev->netdev, NETOPT_ACK_REQ, &enable, sizeof(enable));
/* enable RX start IRQs */
at86rf215_reg_or(dev, dev->BBC->RG_IRQM, BB_IRQ_RXAM);
}
void at86rf215_reset(at86rf215_t *dev)

8
drivers/at86rf215/at86rf215_getset.c
View File

@ -269,14 +269,6 @@ void at86rf215_set_option(at86rf215_t *dev, uint16_t option, bool state)
: (dev->flags & ~option);
switch (option) {
case AT86RF215_OPT_TELL_RX_START:
if (state) {
at86rf215_reg_or(dev, dev->BBC->RG_IRQM, BB_IRQ_RXAM);
} else {
at86rf215_reg_and(dev, dev->BBC->RG_IRQM, ~BB_IRQ_RXAM);
}
break;
case AT86RF215_OPT_PROMISCUOUS:
if (state) {
at86rf215_reg_or(dev, dev->BBC->RG_AFC0, AFC0_PM_MASK);

53
drivers/at86rf215/at86rf215_netdev.c
View File

@ -287,23 +287,10 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
return sizeof(netopt_enable_t);
case NETOPT_RX_START_IRQ:
*((netopt_enable_t *)val) =
!!(dev->flags & AT86RF215_OPT_TELL_RX_START);
return sizeof(netopt_enable_t);
case NETOPT_RX_END_IRQ:
*((netopt_enable_t *)val) =
!!(dev->flags & AT86RF215_OPT_TELL_RX_END);
return sizeof(netopt_enable_t);
case NETOPT_TX_START_IRQ:
*((netopt_enable_t *)val) =
!!(dev->flags & AT86RF215_OPT_TELL_TX_START);
return sizeof(netopt_enable_t);
case NETOPT_TX_END_IRQ:
*((netopt_enable_t *)val) =
!!(dev->flags & AT86RF215_OPT_TELL_TX_END);
*((netopt_enable_t *)val) = NETOPT_ENABLE;
return sizeof(netopt_enable_t);
case NETOPT_CSMA:
@ -587,30 +574,6 @@ static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t len)
res = sizeof(netopt_enable_t);
break;
case NETOPT_RX_START_IRQ:
at86rf215_set_option(dev, AT86RF215_OPT_TELL_RX_START,
((const bool *)val)[0]);
res = sizeof(netopt_enable_t);
break;
case NETOPT_RX_END_IRQ:
at86rf215_set_option(dev, AT86RF215_OPT_TELL_RX_END,
((const bool *)val)[0]);
res = sizeof(netopt_enable_t);
break;
case NETOPT_TX_START_IRQ:
at86rf215_set_option(dev, AT86RF215_OPT_TELL_TX_START,
((const bool *)val)[0]);
res = sizeof(netopt_enable_t);
break;
case NETOPT_TX_END_IRQ:
at86rf215_set_option(dev, AT86RF215_OPT_TELL_TX_END,
((const bool *)val)[0]);
res = sizeof(netopt_enable_t);
break;
case NETOPT_CSMA:
at86rf215_set_option(dev, AT86RF215_OPT_CSMA,
((const bool *)val)[0]);
@ -869,7 +832,7 @@ static void _tx_end(at86rf215_t *dev, netdev_event_t event)
at86rf215_tx_done(dev);
if (dev->flags & AT86RF215_OPT_TELL_TX_END) {
if (netdev->event_callback) {
netdev->event_callback(netdev, event);
}
@ -1028,9 +991,7 @@ static void _isr(netdev_t *netdev)
uint8_t bb_irqs_enabled = BB_IRQ_RXFE | BB_IRQ_TXFE;
/* not using IRQMM because we want to know about AGCH */
if (dev->flags & AT86RF215_OPT_TELL_RX_START) {
bb_irqs_enabled |= BB_IRQ_RXAM;
}
bb_irqs_enabled |= BB_IRQ_RXAM;
rf_irq_mask = at86rf215_reg_read(dev, dev->RF->RG_IRQS);
bb_irq_mask = at86rf215_reg_read(dev, dev->BBC->RG_IRQS);
@ -1140,8 +1101,7 @@ static void _isr(netdev_t *netdev)
at86rf215_rf_cmd(dev, CMD_RF_TX);
/* This also tells the upper layer about retransmissions - should it be like that? */
if (netdev->event_callback &&
(dev->flags & AT86RF215_OPT_TELL_TX_START)) {
if (netdev->event_callback) {
netdev->event_callback(netdev, NETDEV_EVENT_TX_STARTED);
}
}
@ -1177,8 +1137,7 @@ static void _isr(netdev_t *netdev)
break;
}
if ((bb_irq_mask & BB_IRQ_RXAM) &&
(dev->flags & AT86RF215_OPT_TELL_RX_END)) {
if ((bb_irq_mask & BB_IRQ_RXAM) && netdev->event_callback) {
/* will be executed in the same thread */
netdev->event_callback(netdev, NETDEV_EVENT_RX_STARTED);
}
@ -1191,7 +1150,7 @@ static void _isr(netdev_t *netdev)
bb_irq_mask &= ~BB_IRQ_RXFE;
if (dev->flags & AT86RF215_OPT_TELL_RX_END) {
if (netdev->event_callback) {
/* will be executed in the same thread */
netdev->event_callback(netdev, NETDEV_EVENT_RX_COMPLETE);
}

4
drivers/include/at86rf215.h
View File

@ -303,10 +303,6 @@ typedef enum {
* @name Internal device option flags
* @{
*/
#define AT86RF215_OPT_TELL_TX_START (0x0001) /**< notify MAC layer on TX start */
#define AT86RF215_OPT_TELL_TX_END (0x0002) /**< notify MAC layer on TX finished */
#define AT86RF215_OPT_TELL_RX_START (0x0004) /**< notify MAC layer on RX start */
#define AT86RF215_OPT_TELL_RX_END (0x0008) /**< notify MAC layer on RX finished */
#define AT86RF215_OPT_CSMA (0x0010) /**< CSMA active */
#define AT86RF215_OPT_PROMISCUOUS (0x0020) /**< promiscuous mode active */
#define AT86RF215_OPT_PRELOADING (0x0040) /**< preloading enabled */