michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: ieee802154: b91: Fix Set Channel API and ACK detection

Browse source 
- B91 SoC requires to set RX mode again if channel is changed
- Fixed wrong ACK packet detection, mask should be used

Signed-off-by: Yuriy Vynnychek <yura.vynnychek@telink-semi.com>
This commit is contained in:
Yuriy Vynnychek 2021-12-06 13:52:47 +02:00 • committed by Maureen Helm
commit 8ef807f624
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
drivers/ieee802154/ieee802154_b91.c
View file

@ -281,7 +281,7 @@ static void b91_rf_rx_isr(void)
/* handle acknowledge packet if enabled */ /* handle acknowledge packet if enabled */
if ((length == (B91_ACK_FRAME_LEN + B91_FCS_LENGTH)) && if ((length == (B91_ACK_FRAME_LEN + B91_FCS_LENGTH)) &&
(payload[B91_FRAME_TYPE_OFFSET] == B91_ACK_TYPE)) { ((payload[B91_FRAME_TYPE_OFFSET] & B91_FRAME_TYPE_MASK) == B91_ACK_TYPE)) {
if (data.ack_handler_en) { if (data.ack_handler_en) {
b91_handle_ack(); b91_handle_ack();
} }
@ -309,6 +309,7 @@ static void b91_rf_rx_isr(void)
/* update packet data */ /* update packet data */
if (net_pkt_write(pkt, payload, length)) { if (net_pkt_write(pkt, payload, length)) {
LOG_ERR("Failed to write to a packet."); LOG_ERR("Failed to write to a packet.");
net_pkt_unref(pkt);
goto exit; goto exit;
} }
@ -347,6 +348,8 @@ static void b91_rf_isr(void)
b91_rf_rx_isr(); b91_rf_rx_isr();
} else if (rf_get_irq_status(FLD_RF_IRQ_TX)) { } else if (rf_get_irq_status(FLD_RF_IRQ_TX)) {
b91_rf_tx_isr(); b91_rf_tx_isr();
} else {
rf_clr_irq_status(FLD_RF_IRQ_ALL);
} }
} }
@ -375,6 +378,7 @@ static int b91_init(const struct device *dev)
/* init data variables */ /* init data variables */
data.is_started = true; data.is_started = true;
data.ack_handler_en = false; data.ack_handler_en = false;
data.current_channel = 0;
return 0; return 0;
} }
@ -427,7 +431,11 @@ static int b91_set_channel(const struct device *dev, uint16_t channel)
return -EINVAL; return -EINVAL;
} }
rf_set_chn(B91_LOGIC_CHANNEL_TO_PHYSICAL(channel)); if (data.current_channel != channel) {
data.current_channel = channel;
rf_set_chn(B91_LOGIC_CHANNEL_TO_PHYSICAL(channel));
rf_set_rxmode();
}
return 0; return 0;
} }

2
drivers/ieee802154/ieee802154_b91.h
View file

@ -16,6 +16,7 @@
#define B91_PAYLOAD_MIN (5) #define B91_PAYLOAD_MIN (5)
#define B91_PAYLOAD_MAX (127) #define B91_PAYLOAD_MAX (127)
#define B91_FRAME_TYPE_OFFSET (0) #define B91_FRAME_TYPE_OFFSET (0)
#define B91_FRAME_TYPE_MASK (0x07)
#define B91_DEST_ADDR_TYPE_OFFSET (1) #define B91_DEST_ADDR_TYPE_OFFSET (1)
#define B91_DEST_ADDR_TYPE_MASK (0x0c) #define B91_DEST_ADDR_TYPE_MASK (0x0c)
#define B91_DEST_ADDR_TYPE_SHORT (8) #define B91_DEST_ADDR_TYPE_SHORT (8)
@ -100,6 +101,7 @@ struct b91_data {
uint8_t filter_ieee_addr[B91_IEEE_ADDRESS_SIZE]; uint8_t filter_ieee_addr[B91_IEEE_ADDRESS_SIZE];
bool is_started; bool is_started;
bool ack_handler_en; bool ack_handler_en;
uint16_t current_channel;
}; };
#endif #endif