RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Code Releases Activity

csma_sender: adapt for changes in master

Browse Source
This commit is contained in:
Martine Lenders 2016-06-05 13:06:12 +02:00
parent 1b74fcab6e
commit c1c797496c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/include/net/gnrc/csma_sender.h
View File

@ -22,8 +22,8 @@
#ifndef GNRC_CSMA_SENDER_H_
#define GNRC_CSMA_SENDER_H_
#include <stdint.h>
#include "kernel.h"
#include "net/gnrc.h"

5
sys/net/gnrc/link_layer/csma_sender/gnrc_csma_sender.c
View File

@ -19,7 +19,6 @@
#include <errno.h>
#include <stdbool.h>
#include "kernel.h"
#include "xtimer.h"
#include "random.h"
#include "net/gnrc/csma_sender.h"
@ -65,7 +64,7 @@ static inline uint32_t choose_backoff_period(int be)
}
uint32_t max_backoff = ((1 << be) - 1) * A_UNIT_BACKOFF_PERIOD_MICROSEC;
uint32_t period = genrand_uint32() % max_backoff;
uint32_t period = random_uint32() % max_backoff;
if (period < A_UNIT_BACKOFF_PERIOD_MICROSEC) {
period = A_UNIT_BACKOFF_PERIOD_MICROSEC;
}
@ -167,7 +166,7 @@ int csma_ca_send(gnrc_netdev_t *dev, gnrc_pktsnip_t *pkt)
/* if we arrive here, then we must perform the CSMA/CA procedure
ourselves by software */
genrand_init(xtimer_now());
random_init(xtimer_now());
DEBUG("csma: Starting software CSMA/CA....\n");
int nb = 0, be = mac_min_be;