X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=drv%2Ftimer_avr.h;h=5d0eba36eb8e632738a9b1be21c72caca8a68aa1;hb=be5afe05ba0c8a2c885ee9b5a7251ac95d11ac20;hp=252e772fa59a64bcc98db4adbc14e816c0275457;hpb=b821a72d490197c1d8b4e4ea51cbfcbe5e9a5fa5;p=bertos.git

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
old mode 100755
new mode 100644
index 252e772f..5d0eba36
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -1,9 +1,34 @@
 /**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2000 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -16,6 +41,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.32  2007/10/08 12:14:32  batt
+ *#* Fix some review issues.
+ *#*
+ *#* Revision 1.31  2007/10/07 12:30:55  batt
+ *#* Add default timer for AVR.
+ *#*
+ *#* Revision 1.30  2007/06/07 14:35:12  batt
+ *#* Merge from project_ks.
+ *#*
  *#* Revision 1.29  2007/03/21 11:01:36  batt
  *#* Add missing support for ATMega1281.
  *#*
@@ -68,6 +102,8 @@
 #define TIMER_ON_OVERFLOW1        2
 #define TIMER_ON_OUTPUT_COMPARE2  3
 #define TIMER_ON_OVERFLOW3        4
+
+#define TIMER_DEFAULT TIMER_ON_OUTPUT_COMPARE0 ///< Default system timer
 /* \} */
 
 /*
@@ -100,7 +136,7 @@
 
 	#define TIMER_PRESCALER      64
 	#define TIMER_HW_BITS        8
-	#if CPU_AVR_ATMEGA1281
+	#if CPU_AVR_ATMEGA1281 || CPU_AVR_ATMEGA168
 		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE2A)
 	#else
 		#define DEFINE_TIMER_ISR     SIGNAL(SIG_OUTPUT_COMPARE2)
@@ -142,5 +178,8 @@
 /** Not needed, IRQ timer flag cleared automatically */
 #define timer_hw_irq() do {} while (0)
 
+/** Not needed, timer IRQ handler called only for timer source */
+#define timer_hw_triggered() (true)
+
 
 #endif /* DRV_TIMER_AVR_H */