projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add progmem datatypes; PSTR() definition.
[bertos.git]
/
drv
/
timer.h
diff --git
a/drv/timer.h
b/drv/timer.h
index a75adfd26e1ec8dc8e5077cdeb38a7981b18d339..e66ed6188cfd7157685f3ec27c09f61d87d15df0 100755
(executable)
--- a/
drv/timer.h
+++ b/
drv/timer.h
@@
-15,6
+15,9
@@
/*#*
*#* $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.21 2004/12/09 08:35:21 bernie
*#* Replace IPTR with iptr_t.
*#*
@@
-173,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;
}