projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reomove old TODOs; Add new TODOs.
[bertos.git]
/
drv
/
timer_i196.h
diff --git
a/drv/timer_i196.h
b/drv/timer_i196.h
index f2a0f9eba8b5b1e4185d31bb288672f2ed5efc2d..c478a8979ab33e3ee3a899b22a7569e8677b038f 100755
(executable)
--- a/
drv/timer_i196.h
+++ b/
drv/timer_i196.h
@@
-3,7
+3,7
@@
* <!--
* Copyright 2000 Bernardo Innocenti
* Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
* <!--
* Copyright 2000 Bernardo Innocenti
* Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See
devlib/README
for information.
+ * This file is part of DevLib - See
README.devlib
for information.
* -->
*
* \version $Id$
* -->
*
* \version $Id$
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.5 2005/11/04 16:20:02 bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
+ *#* Revision 1.4 2004/12/13 11:51:08 bernie
+ *#* DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.
+ *#*
*#* Revision 1.3 2004/08/25 14:12:08 rasky
*#* Aggiornato il comment block dei log RCS
*#*
*#* Revision 1.3 2004/08/25 14:12:08 rasky
*#* Aggiornato il comment block dei log RCS
*#*
@@
-38,12
+44,11
@@
# define TIMER_INIT \
TIMER2 = (65535 - TICKS_RATE); \
INT_MASK1 |= INT1F_T2OVF; \
# define TIMER_INIT \
TIMER2 = (65535 - TICKS_RATE); \
INT_MASK1 |= INT1F_T2OVF; \
- \
- DISABLE_INTS; \
- WSR = 1; \
- IOC3 |= IOC3F_T2_ENA; \
- WSR = 0; \
- ENABLE_INTS
+ ATOMIC( \
+ WSR = 1; \
+ IOC3 |= IOC3F_T2_ENA; \
+ WSR = 0; \
+ )
#define DEFINE_TIMER_ISR \
INTERRUPT(0x38) void TM2_OVFL_interrupt(void); \
#define DEFINE_TIMER_ISR \
INTERRUPT(0x38) void TM2_OVFL_interrupt(void); \