riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8167 from smlng/enh/net/lwmac

Browse Source 
net, lwmac: cleanup, restructured code
This commit is contained in:
Martine Lenders 2017-11-28 17:58:38 +01:00 committed by GitHub
commit e3547cef23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/net/gnrc/link_layer/lwmac/lwmac.c
View File

@ -198,8 +198,7 @@ static gnrc_pktsnip_t *_recv(gnrc_netif_t *netif)
static gnrc_mac_tx_neighbor_t *_next_tx_neighbor(gnrc_netif_t *netif) static gnrc_mac_tx_neighbor_t *_next_tx_neighbor(gnrc_netif_t *netif)
{ {
int next = -1; gnrc_mac_tx_neighbor_t *next = NULL;
uint32_t phase_nearest = GNRC_LWMAC_PHASE_MAX; uint32_t phase_nearest = GNRC_LWMAC_PHASE_MAX;
for (unsigned i = 0; i < GNRC_MAC_NEIGHBOR_COUNT; i++) { for (unsigned i = 0; i < GNRC_MAC_NEIGHBOR_COUNT; i++) {
@ -210,14 +209,14 @@ static gnrc_mac_tx_neighbor_t *_next_tx_neighbor(gnrc_netif_t *netif)
uint32_t phase_check = _gnrc_lwmac_ticks_until_phase(netif->mac.tx.neighbors[i].phase); uint32_t phase_check = _gnrc_lwmac_ticks_until_phase(netif->mac.tx.neighbors[i].phase);
if (phase_check <= phase_nearest) { if (phase_check <= phase_nearest) {
next = (int)i; next = &(netif->mac.tx.neighbors[i]);
phase_nearest = phase_check; phase_nearest = phase_check;
DEBUG("[LWMAC-int] Advancing queue #%u\n", i); DEBUG("[LWMAC-int] Advancing queue #%u\n", i);
} }
} }
} }
return (next < 0) ? NULL : &(netif->mac.tx.neighbors[next]); return next;
} }
static uint32_t _next_inphase_event(uint32_t last, uint32_t interval) static uint32_t _next_inphase_event(uint32_t last, uint32_t interval)