deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use C rand() instead of random_rand()

Browse source
This commit is contained in:
adamdunkels 2009-02-09 20:54:49 +00:00
parent 51006b3f8d
commit 37e15ab537
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/shell/shell-rime.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: shell-rime.c,v 1.10 2008/11/17 22:52:10 oliverschmidt Exp $ * $Id: shell-rime.c,v 1.11 2009/02/09 20:54:49 adamdunkels Exp $
*/ */
/** /**
@ -45,7 +45,7 @@
#include "dev/leds.h" #include "dev/leds.h"
#include "lib/crc16.h" #include "lib/crc16.h"
#include "lib/random.h" #include "lib/rand.h"
#include "net/rime.h" #include "net/rime.h"
#include "net/rime/neighbor.h" #include "net/rime/neighbor.h"
@ -461,7 +461,7 @@ recv_netflood(struct netflood_conn *c, rimeaddr_t *from,
msg = rimebuf_dataptr(); msg = rimebuf_dataptr();
if(msg->type == NETFLOOD_TYPE_NODES) { if(msg->type == NETFLOOD_TYPE_NODES) {
ctimer_set(&ctimer, random_rand() % (CLOCK_SECOND * 8), ctimer_set(&ctimer, rand() % (CLOCK_SECOND * 8),
send_collect, NULL); send_collect, NULL);
} }
return 1; return 1;

6
apps/shell/shell-time.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: shell-time.c,v 1.5 2008/11/13 07:51:23 adamdunkels Exp $ * $Id: shell-time.c,v 1.6 2009/02/09 20:54:49 adamdunkels Exp $
*/ */
/** /**
@ -44,7 +44,7 @@
#include "sys/clock.h" #include "sys/clock.h"
#include "net/rime/timesynch.h" #include "net/rime/timesynch.h"
#include "lib/random.h" #include "lib/rand.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -318,7 +318,7 @@ PROCESS_THREAD(shell_randwait_process, ev, data)
/* printf("randwait %d command '%s'\n", /* printf("randwait %d command '%s'\n",
maxwait, command);*/ maxwait, command);*/
etimer_set(&etimer, random_rand() % (CLOCK_SECOND * maxwait)); etimer_set(&etimer, rand() % (CLOCK_SECOND * maxwait));
PROCESS_WAIT_UNTIL(etimer_expired(&etimer)); PROCESS_WAIT_UNTIL(etimer_expired(&etimer));
/* printf("Starting '%s' child %p (%s)\n", command, randwait_command.child, */ /* printf("Starting '%s' child %p (%s)\n", command, randwait_command.child, */