From 37e15ab537e3392d20dd18eaed424815c2ea1475 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Mon, 9 Feb 2009 20:54:49 +0000 Subject: [PATCH] Use C rand() instead of random_rand() --- apps/shell/shell-rime.c | 6 +++--- apps/shell/shell-time.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/shell/shell-rime.c b/apps/shell/shell-rime.c index 1136be084..49e27dfa0 100644 --- a/apps/shell/shell-rime.c +++ b/apps/shell/shell-rime.c @@ -28,7 +28,7 @@ * * 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 "lib/crc16.h" -#include "lib/random.h" +#include "lib/rand.h" #include "net/rime.h" #include "net/rime/neighbor.h" @@ -461,7 +461,7 @@ recv_netflood(struct netflood_conn *c, rimeaddr_t *from, msg = rimebuf_dataptr(); if(msg->type == NETFLOOD_TYPE_NODES) { - ctimer_set(&ctimer, random_rand() % (CLOCK_SECOND * 8), + ctimer_set(&ctimer, rand() % (CLOCK_SECOND * 8), send_collect, NULL); } return 1; diff --git a/apps/shell/shell-time.c b/apps/shell/shell-time.c index 0f5e1274c..9876226e2 100644 --- a/apps/shell/shell-time.c +++ b/apps/shell/shell-time.c @@ -28,7 +28,7 @@ * * 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 "net/rime/timesynch.h" -#include "lib/random.h" +#include "lib/rand.h" #include #include @@ -318,7 +318,7 @@ PROCESS_THREAD(shell_randwait_process, ev, data) /* printf("randwait %d command '%s'\n", maxwait, command);*/ - etimer_set(&etimer, random_rand() % (CLOCK_SECOND * maxwait)); + etimer_set(&etimer, rand() % (CLOCK_SECOND * maxwait)); PROCESS_WAIT_UNTIL(etimer_expired(&etimer)); /* printf("Starting '%s' child %p (%s)\n", command, randwait_command.child, */