projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove compatibility hack.
[bertos.git]
/
drv
/
timer.h
diff --git
a/drv/timer.h
b/drv/timer.h
index 1851ab1f64df128a2b1a363643f9cd02da4cc178..e66ed6188cfd7157685f3ec27c09f61d87d15df0 100755
(executable)
--- a/
drv/timer.h
+++ b/
drv/timer.h
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.22 2004/12/13 12:07:06 bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
+ *#* Revision 1.21 2004/12/09 08:35:21 bernie
+ *#* Replace IPTR with iptr_t.
+ *#*
*#* Revision 1.20 2004/12/08 08:56:41 bernie
*#* Rename sigset_t to sigmask_t; Reformat.
*#*
*#* Revision 1.20 2004/12/08 08:56:41 bernie
*#* Rename sigset_t to sigmask_t; Reformat.
*#*
@@
-128,7
+134,7
@@
INLINE void timer_set_event_signal(Timer *timer, struct Process *proc, sigmask_t
#endif /* CONFIG_KERN_SIGNALS */
/*! Set the timer so that it calls an user hook when it expires */
#endif /* CONFIG_KERN_SIGNALS */
/*! Set the timer so that it calls an user hook when it expires */
-INLINE void timer_set_event_softint(Timer *timer, Hook func,
IPTR
user_data)
+INLINE void timer_set_event_softint(Timer *timer, Hook func,
iptr_t
user_data)
{
event_initSoftInt(&timer->expire, func, user_data);
}
{
event_initSoftInt(&timer->expire, func, user_data);
}
@@
-170,11
+176,8
@@
extern volatile mtime_t _clock;
INLINE mtime_t timer_ticks(void)
{
mtime_t result;
INLINE mtime_t timer_ticks(void)
{
mtime_t result;
- cpuflags_t flags;
- DISABLE_IRQSAVE(flags);
- result = _clock;
- ENABLE_IRQRESTORE(flags);
+ ATOMIC(result = _clock);
return result;
}
return result;
}