Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / drv / timer_i196.h

diff --git a/drv/timer_i196.h b/drv/timer_i196.h
old mode 100755 (executable)
new mode 100644 (file)
index d36abf9..3111a6c
--- a/drv/timer_i196.h
+++ b/drv/timer_i196.h
@@ -1,9 +1,10 @@
-/*!
+#error This code must be revised for the new timer API
+/**
  * \file
  * <!--
- * Copyright (C) 2000 Bernardo Innocenti
- * Copyright (C) 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * All Rights Reserved.
+ * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2000 Bernardo Innocenti
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -13,31 +14,48 @@
  * \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.7  2006/07/19 12:56:26  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.6  2006/02/21 21:28:02  bernie
+ *#* New time handling based on TIMER_TICKS_PER_SEC to support slow timers with ticks longer than 1ms.
+ *#*
+ *#* 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
 
-       /*!
-        * Retrigger TIMER2, adjusting the time to account for
-        * the interrupt prologue latency.
-        */
-#      define TIMER_RETRIGGER (TIMER2 -= TICKS_RATE)
+/**
+ * Retrigger TIMER2, adjusting the time to account for
+ * the interrupt prologue latency.
+ */
+#define TIMER_RETRIGGER (TIMER2 -= TICKS_RATE)
 
-#      define TIMER_INIT \
-               TIMER2 = (65535 - TICKS_RATE); \
-               INT_MASK1 |= INT1F_T2OVF; \
-               \
-               DISABLE_INTS; \
+#define TIMER_INIT \
+       TIMER2 = (65535 - TICKS_RATE); \
+       INT_MASK1 |= INT1F_T2OVF; \
+       ATOMIC( \
                WSR = 1; \
                IOC3 |= IOC3F_T2_ENA; \
                WSR = 0; \
-               ENABLE_INTS
+       )
 
 #define DEFINE_TIMER_ISR \
        INTERRUPT(0x38) void TM2_OVFL_interrupt(void);  \