Skip to content

crc validity variable in netdev_radio_rx_info and gnrc_netif_hdr_t and read it for at86rf2xx and cc2420 #9755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gvz wants to merge 4 commits into from
Closed

crc validity variable in netdev_radio_rx_info and gnrc_netif_hdr_t and read it for at86rf2xx and cc2420 #9755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9d26ae
CRC checks: added crc to netdef and netif hdr
gvz Aug 9, 2018
df21801
CRC checks: reading crc_ok form cc2420 and at86rf2xx
gvz Aug 9, 2018
75e2556
CRC checks: added FCS to netif hdr and netdef info
gvz Aug 9, 2018
4671e95
at86rf2xx: implemented reading of FCS to netdev info
gvz Aug 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions drivers/at86rf2xx/at86rf2xx_netdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
at86rf2xx_t *dev = (at86rf2xx_t *)netdev;
uint8_t phr;
size_t pkt_len;
uint16_t fcs;

/* frame buffer protection will be unlocked as soon as at86rf2xx_fb_stop()
* is called*/
Expand Down Expand Up @@ -159,25 +160,32 @@ static int _recv(netdev_t *netdev, void *buf, size_t len, void *info)
#endif
/* copy payload */
at86rf2xx_fb_read(dev, (uint8_t *)buf, pkt_len);

/* Ignore FCS but advance fb read - we must give a temporary buffer here,
* as we are not allowed to issue SPI transfers without any buffer */
uint8_t tmp[2];
at86rf2xx_fb_read(dev, tmp, 2);
(void)tmp;
/* copy fcs */
at86rf2xx_fb_read(dev, (uint8_t *)&fcs, sizeof(uint16_t));

if (info != NULL) {
uint8_t rssi = 0;
int8_t crc_ok = -1;
netdev_ieee802154_rx_info_t *radio_info = info;
at86rf2xx_fb_read(dev, &(radio_info->lqi), 1);
#ifndef MODULE_AT86RF231
at86rf2xx_fb_read(dev, &(rssi), 1);
uint8_t rx_status = 0xFF;
at86rf2xx_fb_read(dev, &(rx_status), 1);
if((rx_status & 0xF) == 0) {
crc_ok = (rx_status & AT86RF2XX_PHY_RSSI_MASK__RX_CRC_VALID) ? 1 : 0;
}
at86rf2xx_fb_stop(dev);
#else
at86rf2xx_fb_stop(dev);
rssi = at86rf2xx_reg_read(dev, AT86RF2XX_REG__PHY_ED_LEVEL);
crc_ok = at86rf2xx_reg_read(dev, AT86RF2XX_REG__PHY_RSSI) & AT86RF2XX_PHY_RSSI_MASK__RX_CRC_VALID ? 1 : 0;
rssi &= AT86RF2XX_PHY_RSSI_MASK__RSSI;
#endif
radio_info->rssi = RSSI_BASE_VAL + rssi;
radio_info->crc_ok = crc_ok;
radio_info->fcs = fcs;
(void)crc_ok;
}
else {
at86rf2xx_fb_stop(dev);
Expand Down
1 change: 1 addition & 0 deletions drivers/cc2420/cc2420.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ int cc2420_rx(cc2420_t *dev, uint8_t *buf, size_t max_len, void *info)
netdev_ieee802154_rx_info_t *radio_info = info;
radio_info->rssi = CC2420_RSSI_OFFSET + rssi;
radio_info->lqi = crc_corr & CC2420_CRCCOR_COR_MASK;
radio_info->crc_ok = (uint16_t) ((crc_corr & ~CC2420_CRCCOR_COR_MASK)>>7);
}

/* finally flush the FIFO */
Expand Down
2 changes: 2 additions & 0 deletions drivers/include/net/netdev.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ typedef enum {
struct netdev_radio_rx_info {
int16_t rssi; /**< RSSI of a received packet in dBm */
uint8_t lqi; /**< LQI of a received packet */
uint16_t crc_ok; /**< CRC Ok of received packet */
uint16_t fcs; /**< FCS of received packet */
};

/**
Expand Down
2 changes: 2 additions & 0 deletions sys/include/net/gnrc/netif/hdr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ typedef struct {
uint8_t flags; /**< flags as defined above */
uint8_t lqi; /**< lqi of received packet (optional) */
int16_t rssi; /**< rssi of received packet in dBm (optional) */
uint8_t crc_ok; /**< crc valid indicator (optional) */
uint16_t fcs; /**< FCS of received packet */
} gnrc_netif_hdr_t;

/**
Expand Down
2 changes: 2 additions & 0 deletions sys/net/gnrc/link_layer/lwmac/lwmac.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,8 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)

hdr->lqi = rx_info.lqi;
hdr->rssi = rx_info.rssi;
hdr->crc_ok = rx_info.crc_ok;
hdr->fcs = rx_info.fcs;
hdr->if_pid = thread_getpid();
pkt->type = state->proto;
#if ENABLE_DEBUG
Expand Down
2 changes: 2 additions & 0 deletions sys/net/gnrc/netif/gnrc_netif_ieee802154.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)

hdr->lqi = rx_info.lqi;
hdr->rssi = rx_info.rssi;
hdr->crc_ok = rx_info.crc_ok;
hdr->fcs = rx_info.fcs;
hdr->if_pid = thread_getpid();
pkt->type = state->proto;
#if ENABLE_DEBUG
Expand Down
4 changes: 3 additions & 1 deletion sys/net/gnrc/netif/hdr/gnrc_netif_hdr_print.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ void gnrc_netif_hdr_print(gnrc_netif_hdr_t *hdr)

printf("if_pid: %u ", (unsigned) hdr->if_pid);
printf("rssi: %d ", (signed) hdr->rssi);
printf("lqi: %u\n", (unsigned) hdr->lqi);
printf("lqi: %u ", (unsigned) hdr->lqi);
printf("crc_ok: %u ", (unsigned) hdr->crc_ok);
printf("fcs: %04x\n", (unsigned) hdr->fcs);
printf("flags: ");

if (hdr->flags) {
Expand Down