X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_i196.h;h=c478a8979ab33e3ee3a899b22a7569e8677b038f;hb=20d3c79024c12bb366270c0c1fdda53c4c55e734;hp=d36abf93658857959d5fb34703ba84c9e988de12;hpb=0fee90eca2cd56674ba7708dc113e8794327cee0;p=bertos.git

diff --git a/drv/timer_i196.h b/drv/timer_i196.h
index d36abf93..c478a897 100755
--- a/drv/timer_i196.h
+++ b/drv/timer_i196.h
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright (C) 2000 Bernardo Innocenti
- * Copyright (C) 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * Copyright 2000 Bernardo Innocenti
+ * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -13,12 +13,24 @@
  * \brief Low-level timer module for AVR
  */
 
-/*
- * $Log$
- * Revision 1.1  2004/05/23 18:23:30  bernie
- * Import drv/timer module.
- *
- */
+/*#*
+ *#* $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.2  2004/06/03 11:27:09  bernie
+ *#* Add dual-license information.
+ *#*
+ *#* Revision 1.1  2004/05/23 18:23:30  bernie
+ *#* Import drv/timer module.
+ *#*
+ *#*/
 
 #ifndef TIMER_I196_H
 #define TIMER_I196_H
@@ -32,12 +44,11 @@
 #	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);  \