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

Adjusted tabs.

Browse source
This commit is contained in:
oliverschmidt 2008-02-28 22:11:30 +00:00
parent 8a4890c9e5
commit 20dc5ee52f
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/sys/timetable.h
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: timetable.h,v 1.1 2008/01/17 12:19:26 adamdunkels Exp $ * $Id: timetable.h,v 1.2 2008/02/28 22:11:30 oliverschmidt Exp $
*/ */
/** /**
@ -58,24 +58,24 @@ struct timetable {
unsigned int * const ptr; unsigned int * const ptr;
}; };
#define TIMETABLE_NONSTATIC(name) \ #define TIMETABLE_NONSTATIC(name) \
struct timetable_timestamp CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_size)]; \ struct timetable_timestamp CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_size)]; \
unsigned int CC_CONCAT(name,_ptr); \ unsigned int CC_CONCAT(name,_ptr); \
struct timetable name = { \ struct timetable name = { \
CC_CONCAT(name,_timestamps), \ CC_CONCAT(name,_timestamps), \
CC_CONCAT(name,_size), \ CC_CONCAT(name,_size), \
&CC_CONCAT(name,_ptr)} &CC_CONCAT(name,_ptr)}
#define TIMETABLE_STATIC(name) \ #define TIMETABLE_STATIC(name) \
static struct timetable_timestamp CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_size)]; \ static struct timetable_timestamp CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_size)]; \
static unsigned int CC_CONCAT(name,_ptr); \ static unsigned int CC_CONCAT(name,_ptr); \
static struct timetable name = { \ static struct timetable name = { \
CC_CONCAT(name,_timestamps), \ CC_CONCAT(name,_timestamps), \
CC_CONCAT(name,_size), \ CC_CONCAT(name,_size), \
&CC_CONCAT(name,_ptr)} &CC_CONCAT(name,_ptr)}
#define TIMETABLE_DECLARE(name) \ #define TIMETABLE_DECLARE(name) \
extern unsigned int CC_CONCAT(name,_ptr); \ extern unsigned int CC_CONCAT(name,_ptr); \
extern struct timetable_timestamp CC_CONCAT(name, _timestamps)[CC_CONCAT(name,_size)]; \ extern struct timetable_timestamp CC_CONCAT(name, _timestamps)[CC_CONCAT(name,_size)]; \
extern struct timetable name extern struct timetable name
@ -86,17 +86,17 @@ do { \
CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].id = str; \ CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].id = str; \
CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].time = RTIMER_NOW(); \ CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].time = RTIMER_NOW(); \
CC_CONCAT(name,_ptr) = (CC_CONCAT(name,_ptr) + 1) % \ CC_CONCAT(name,_ptr) = (CC_CONCAT(name,_ptr) + 1) % \
CC_CONCAT(name,_size); \ CC_CONCAT(name,_size); \
} while(0) } while(0)
#if TIMETABLE_WITH_TYPE #if TIMETABLE_WITH_TYPE
#define TIMETABLE_TIMESTAMP_TYPE(name, str, t) \ #define TIMETABLE_TIMESTAMP_TYPE(name, str, t) \
do { \ do { \
CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].id = str; \ CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].id = str; \
CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].type = t; \ CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].type = t; \
CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].time = RTIMER_NOW(); \ CC_CONCAT(name,_timestamps)[CC_CONCAT(name,_ptr)].time = RTIMER_NOW(); \
CC_CONCAT(name,_ptr) = (CC_CONCAT(name,_ptr) + 1) % \ CC_CONCAT(name,_ptr) = (CC_CONCAT(name,_ptr) + 1) % \
CC_CONCAT(name,_size); \ CC_CONCAT(name,_size); \
} while(0) } while(0)
#else /* TIMETABLE_WITH_TYPE */ #else /* TIMETABLE_WITH_TYPE */
#define TIMETABLE_TIMESTAMP_TYPE(name, str, t) TIMETABLE_TIMESTAMP(name, str) #define TIMETABLE_TIMESTAMP_TYPE(name, str, t) TIMETABLE_TIMESTAMP(name, str)