From a685acd23a40a3b794918281f46b9d7774b3f594 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Sat, 9 Feb 2008 14:02:12 +0000 Subject: [PATCH] Turned rtimer_arch_now() from a (one line) function into a macro. --- cpu/native/rtimer-arch.c | 8 +------- cpu/native/rtimer-arch.h | 6 ++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cpu/native/rtimer-arch.c b/cpu/native/rtimer-arch.c index 3e73f08ad..a170a4687 100644 --- a/cpu/native/rtimer-arch.c +++ b/cpu/native/rtimer-arch.c @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: rtimer-arch.c,v 1.2 2007/03/31 11:19:08 adamdunkels Exp $ + * $Id: rtimer-arch.c,v 1.3 2008/02/09 14:02:12 oliverschmidt Exp $ */ /** @@ -85,9 +85,3 @@ rtimer_arch_schedule(rtimer_clock_t t) setitimer(ITIMER_REAL, &val, NULL); } /*---------------------------------------------------------------------------*/ -rtimer_clock_t -rtimer_arch_now(void) -{ - return clock_time(); -} -/*---------------------------------------------------------------------------*/ diff --git a/cpu/native/rtimer-arch.h b/cpu/native/rtimer-arch.h index 2080cf6a8..b97e9f57f 100644 --- a/cpu/native/rtimer-arch.h +++ b/cpu/native/rtimer-arch.h @@ -28,7 +28,7 @@ * * This file is part of the Contiki operating system. * - * $Id: rtimer-arch.h,v 1.2 2007/11/17 10:47:22 adamdunkels Exp $ + * $Id: rtimer-arch.h,v 1.3 2008/02/09 14:02:12 oliverschmidt Exp $ */ /** @@ -41,8 +41,10 @@ #ifndef __RTIMER_ARCH_H__ #define __RTIMER_ARCH_H__ +#include "contiki-conf.h" + #define RTIMER_ARCH_SECOND 1000 -rtimer_clock_t rtimer_arch_now(void); +#define rtimer_arch_now() clock_time() #endif /* __RTIMER_ARCH_H__ */