projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename event macros to look like regular functions.
[bertos.git]
/
drv
/
timer.h
diff --git
a/drv/timer.h
b/drv/timer.h
index 489a4e8d55ce6136a30007b7f8b0575a7492c76c..3484c5a6386ffcd8148edb28c80dd72c290c33b4 100755
(executable)
--- a/
drv/timer.h
+++ b/
drv/timer.h
@@
-15,6
+15,12
@@
/*
* $Log$
/*
* $Log$
+ * Revision 1.4 2004/06/06 18:25:44 bernie
+ * Rename event macros to look like regular functions.
+ *
+ * Revision 1.3 2004/06/06 16:57:18 bernie
+ * Mark some functions INLINE instead of 'extern inline'.
+ *
* Revision 1.2 2004/06/03 11:27:09 bernie
* Add dual-license information.
*
* Revision 1.2 2004/06/03 11:27:09 bernie
* Add dual-license information.
*
@@
-48,21
+54,21
@@
extern void timer_add(Timer *timer);
extern Timer *timer_abort(Timer *timer);
extern void timer_delay(time_t time);
extern void timer_udelay(utime_t utime);
extern Timer *timer_abort(Timer *timer);
extern void timer_delay(time_t time);
extern void timer_udelay(utime_t utime);
-
extern inline
time_t timer_gettick(void);
-
extern inline
time_t timer_gettick_irq(void);
+
INLINE
time_t timer_gettick(void);
+
INLINE
time_t timer_gettick_irq(void);
#ifdef CONFIG_KERN_SIGNALS
/*! Set the timer so that it sends a signal when it expires */
INLINE void timer_set_event_signal(Timer* timer, struct Process* proc, sigset_t sigs)
{
#ifdef CONFIG_KERN_SIGNALS
/*! Set the timer so that it sends a signal when it expires */
INLINE void timer_set_event_signal(Timer* timer, struct Process* proc, sigset_t sigs)
{
-
INITEVENT_SIG
(&timer->expire, proc, sigs);
+
event_initSignal
(&timer->expire, proc, sigs);
}
#endif
/*! Set the timer so that it calls an user hook when it expires */
INLINE void timer_set_event_softint(Timer* timer, Hook func, void* user_data)
{
}
#endif
/*! Set the timer so that it calls an user hook when it expires */
INLINE void timer_set_event_softint(Timer* timer, Hook func, void* user_data)
{
-
INITEVENT_INT
(&timer->expire, func, user_data);
+
event_initSoftInt
(&timer->expire, func, user_data);
}
/*! Set the timer delay (the time before the event will be triggered) */
}
/*! Set the timer delay (the time before the event will be triggered) */
@@
-78,7
+84,7
@@
INLINE void timer_set_delay(Timer* timer, time_t delay)
* clock variable is larger than the processor word size and can't
* be copied atomically.
*/
* clock variable is larger than the processor word size and can't
* be copied atomically.
*/
-
extern inline
time_t timer_gettick(void)
+
INLINE
time_t timer_gettick(void)
{
extern volatile time_t _clock;
{
extern volatile time_t _clock;
@@
-97,7
+103,7
@@
extern inline time_t timer_gettick(void)
* Like \c timer_gettick, faster version to be called
* from interrupt context only.
*/
* Like \c timer_gettick, faster version to be called
* from interrupt context only.
*/
-
extern inline
time_t timer_gettick_irq(void)
+
INLINE
time_t timer_gettick_irq(void)
{
extern volatile time_t _clock;
{
extern volatile time_t _clock;