michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/ieee802154: Switch CC1200 to new net_ptk allocator

Browse source 
Now buffer is allocated at the same time.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2019-02-20 12:05:53 +01:00 • committed by Anas Nashif
commit 7981c2792b
1 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/ieee802154/ieee802154_cc1200.c
View file

@ -419,15 +419,15 @@ static inline bool verify_rxfifo_validity(struct cc1200_context *ctx,
}
static inline bool read_rxfifo_content(struct cc1200_context *ctx,
struct net_buf *frag, u8_t len)
struct net_buf *buf, u8_t len)
{
if (!read_rxfifo(ctx, frag->data, len) ||
if (!read_rxfifo(ctx, buf->data, len) ||
(get_status(ctx) == CC1200_STATUS_RX_FIFO_ERROR)) {
return false;
}
net_buf_add(frag, len);
net_buf_add(buf, len);
return true;
}
@ -453,7 +453,6 @@ static inline bool verify_crc(struct cc1200_context *ctx, struct net_pkt *pkt)
static void cc1200_rx(struct device *dev)
{
struct cc1200_context *cc1200 = dev->driver_data;
struct net_buf *pkt_frag;
struct net_pkt *pkt;
u8_t pkt_len;
@ -473,21 +472,14 @@ static void cc1200_rx(struct device *dev)
goto flush;
}
pkt = net_pkt_get_reserve_rx(K_NO_WAIT);
pkt = net_pkt_alloc_with_buffer(cc1200->iface, pkt_len,
AF_UNSPEC, 0, K_NO_WAIT);
if (!pkt) {
LOG_ERR("No free pkt available");
goto flush;
}
pkt_frag = net_pkt_get_frag(pkt, K_NO_WAIT);
if (!pkt_frag) {
LOG_ERR("No free frag available");
goto flush;
}
net_pkt_frag_insert(pkt, pkt_frag);
if (!read_rxfifo_content(cc1200, pkt_frag, pkt_len)) {
if (!read_rxfifo_content(cc1200, pkt->buffer, pkt_len)) {
LOG_ERR("No content read");
goto flush;
}