X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=drv%2Ftimer_avr.h;h=d308608aedf3adca7e2553912a64ca325511b92b;hb=c5049d7bb6178222c952030c2f2a6f52a43ddda1;hp=6009dead991d5bb448976f521694261b71da0f03;hpb=d026292ceba279d56f2540a02cff974e7ca9e5ae;p=bertos.git

diff --git a/drv/timer_avr.h b/drv/timer_avr.h
index 6009dead..d308608a 100755
--- a/drv/timer_avr.h
+++ b/drv/timer_avr.h
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * 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 devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \version $Id$
@@ -15,8 +15,11 @@
 
 /*#*
  *#* $Log$
- *#* Revision 1.22  2005/01/23 12:26:07  bernie
- *#* Add missing header.
+ *#* Revision 1.24  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.23  2005/03/01 23:24:51  bernie
+ *#* Tweaks for avr-libc 1.2.x.
  *#*
  *#* Revision 1.21  2004/12/13 12:07:06  bernie
  *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
@@ -60,8 +63,8 @@
 #ifndef DRV_TIMER_AVR_H
 #define DRV_TIMER_AVR_H
 
-#include <arch_config.h> // ARCH_BOARD_KC
-#include <macros.h> // BV()
+#include <cfg/arch_config.h> // ARCH_BOARD_KC
+#include <cfg/macros.h> // BV()
 #include <hw.h>
 
 #include <avr/signal.h>
@@ -250,6 +253,11 @@
 
 		if (!_adc_trigger_lock)
 		{
+			// Backwards compatibility fix for avr-libc 1.0.4
+			#ifndef ADATE
+			#define ADATE ADFR
+			#endif
+
 			/*
 			 * Disable free-running mode to avoid starting a
 			 * new conversion before the ADC handler has read
@@ -260,7 +268,7 @@
 			 *
 			 * NOTE: writing 0 to ADSC and ADIF has no effect.
 			 */
-			ADCSRA = ADCSRA & ~(BV(ADFR) | BV(ADIF) | BV(ADSC));
+			ADCSRA = ADCSRA & ~(BV(ADATE) | BV(ADIF) | BV(ADSC));
 
 			ADC_SETCHN(_adc_idx_next);
 			_adc_trigger_lock = true;