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

Merge pull request #9564 from bergzand/pr/netif/use_netdev_getter

Browse Source 
gnrc_netif_ieee802154: rework `netif->state` to getter and flag
This commit is contained in:
Martine Lenders 2018-10-04 12:36:44 +02:00 committed by GitHub
commit da29a437e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/include/net/gnrc/netif/flags.h
View File

@ -130,6 +130,12 @@ enum {
#define GNRC_NETIF_FLAGS_MAC_RX_STARTED (0x00008000U) #define GNRC_NETIF_FLAGS_MAC_RX_STARTED (0x00008000U)
/** @} */ /** @} */
/**
* @brief Network interface is configured in raw mode
*/
#define GNRC_NETIF_FLAGS_RAWMODE (0x00010000U)
/** @} */
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

12
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -315,6 +315,18 @@ int gnrc_netif_set_from_netdev(gnrc_netif_t *netif,
res = sizeof(netopt_enable_t); res = sizeof(netopt_enable_t);
break; break;
#endif /* MODULE_GNRC_SIXLOWPAN_IPHC */ #endif /* MODULE_GNRC_SIXLOWPAN_IPHC */
case NETOPT_RAWMODE:
if (*(((netopt_enable_t *)opt->data)) == NETOPT_ENABLE) {
netif->flags |= GNRC_NETIF_FLAGS_RAWMODE;
}
else {
netif->flags &= ~GNRC_NETIF_FLAGS_RAWMODE;
}
/* Also propagate to the netdev device */
netif->dev->driver->set(netif->dev, NETOPT_RAWMODE, opt->data,
opt->data_len);
res = sizeof(netopt_enable_t);
break;
default: default:
break; break;
} }

5
sys/net/gnrc/netif/gnrc_netif_ieee802154.c
View File

@ -78,7 +78,6 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
{ {
netdev_t *dev = netif->dev; netdev_t *dev = netif->dev;
netdev_ieee802154_rx_info_t rx_info; netdev_ieee802154_rx_info_t rx_info;
netdev_ieee802154_t *state = (netdev_ieee802154_t *)netif->dev;
gnrc_pktsnip_t *pkt = NULL; gnrc_pktsnip_t *pkt = NULL;
int bytes_expected = dev->driver->recv(dev, NULL, 0, NULL); int bytes_expected = dev->driver->recv(dev, NULL, 0, NULL);
@ -97,7 +96,7 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
gnrc_pktbuf_release(pkt); gnrc_pktbuf_release(pkt);
return NULL; return NULL;
} }
if (!(state->flags & NETDEV_IEEE802154_RAW)) { if (!(netif->flags & GNRC_NETIF_FLAGS_RAWMODE)) {
gnrc_pktsnip_t *ieee802154_hdr, *netif_hdr; gnrc_pktsnip_t *ieee802154_hdr, *netif_hdr;
gnrc_netif_hdr_t *hdr; gnrc_netif_hdr_t *hdr;
#if ENABLE_DEBUG #if ENABLE_DEBUG
@ -140,7 +139,7 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
hdr->lqi = rx_info.lqi; hdr->lqi = rx_info.lqi;
hdr->rssi = rx_info.rssi; hdr->rssi = rx_info.rssi;
hdr->if_pid = thread_getpid(); hdr->if_pid = thread_getpid();
pkt->type = state->proto; dev->driver->get(dev, NETOPT_PROTO, &pkt->type, sizeof(pkt->type));
#if ENABLE_DEBUG #if ENABLE_DEBUG
DEBUG("_recv_ieee802154: received packet from %s of length %u\n", DEBUG("_recv_ieee802154: received packet from %s of length %u\n",
gnrc_netif_addr_to_str(gnrc_netif_hdr_get_src_addr(hdr), gnrc_netif_addr_to_str(gnrc_netif_hdr_get_src_addr(hdr),