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

gnrc_gomac: don't use constant as argument for RTT callback

Browse Source 
The RTT callback for a super-frame cycle uses the `arg` pointer to set
the message value that then is handed to the GoMacH thread. However,
in both instances the timer is scheduled the constant
`GNRC_GOMACH_EVENT_RTT_NEW_CYCLE` is provided. This means the argument
is not really necessary.
This commit is contained in:
Martine Lenders 2019-12-02 08:14:25 +01:00
parent 574c7d52d9
commit e1f81f02fd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,8 @@ static void _gomach_rtt_cb(void *arg)
{ {
msg_t msg; msg_t msg;
msg.content.value = ((uint32_t) arg) & 0xffff; (void)arg;
msg.content.value = GNRC_GOMACH_EVENT_RTT_NEW_CYCLE;
msg.type = GNRC_GOMACH_EVENT_RTT_TYPE; msg.type = GNRC_GOMACH_EVENT_RTT_TYPE;
msg_send(&msg, gomach_pid); msg_send(&msg, gomach_pid);
@ -194,7 +195,7 @@ static void _gomach_rtt_handler(uint32_t event, gnrc_netif_t *netif)
/* Set next cycle's starting time. */ /* Set next cycle's starting time. */
uint32_t alarm = netif->mac.prot.gomach.last_wakeup + uint32_t alarm = netif->mac.prot.gomach.last_wakeup +
RTT_US_TO_TICKS(GNRC_GOMACH_SUPERFRAME_DURATION_US); RTT_US_TO_TICKS(GNRC_GOMACH_SUPERFRAME_DURATION_US);
rtt_set_alarm(alarm, _gomach_rtt_cb, (void *) GNRC_GOMACH_EVENT_RTT_NEW_CYCLE); rtt_set_alarm(alarm, _gomach_rtt_cb, NULL);
/* Update neighbors' public channel phases. */ /* Update neighbors' public channel phases. */
gnrc_gomach_update_neighbor_pubchan(netif); gnrc_gomach_update_neighbor_pubchan(netif);
@ -1451,7 +1452,7 @@ static void _gomach_phase_backoff(gnrc_netif_t *netif)
uint32_t alarm = netif->mac.prot.gomach.last_wakeup + uint32_t alarm = netif->mac.prot.gomach.last_wakeup +
RTT_US_TO_TICKS(GNRC_GOMACH_SUPERFRAME_DURATION_US); RTT_US_TO_TICKS(GNRC_GOMACH_SUPERFRAME_DURATION_US);
rtt_set_alarm(alarm, _gomach_rtt_cb, (void *) GNRC_GOMACH_EVENT_RTT_NEW_CYCLE); rtt_set_alarm(alarm, _gomach_rtt_cb, NULL);
gnrc_gomach_update_neighbor_phase(netif); gnrc_gomach_update_neighbor_phase(netif);