projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Misc PGM fixes.
[bertos.git]
/
drv
/
timer_avr.h
diff --git
a/drv/timer_avr.h
b/drv/timer_avr.h
index 52dea9cf362d754525e631114c2f169b6e0bf127..d308608aedf3adca7e2553912a64ca325511b92b 100755
(executable)
--- a/
drv/timer_avr.h
+++ b/
drv/timer_avr.h
@@
-1,9
+1,9
@@
/*!
* \file
* <!--
/*!
* \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>
* 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$
* -->
*
* \version $Id$
@@
-15,6
+15,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* 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.
*#*
*#* Revision 1.21 2004/12/13 12:07:06 bernie
*#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
*#*
@@
-57,8
+63,9
@@
#ifndef DRV_TIMER_AVR_H
#define DRV_TIMER_AVR_H
#ifndef DRV_TIMER_AVR_H
#define DRV_TIMER_AVR_H
-#include <arch_config.h> // ARCH_BOARD_KC
-#include "hw.h"
+#include <cfg/arch_config.h> // ARCH_BOARD_KC
+#include <cfg/macros.h> // BV()
+#include <hw.h>
#include <avr/signal.h>
#include <avr/io.h>
#include <avr/signal.h>
#include <avr/io.h>
@@
-246,6
+253,11
@@
if (!_adc_trigger_lock)
{
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
/*
* Disable free-running mode to avoid starting a
* new conversion before the ADC handler has read
@@
-256,7
+268,7
@@
*
* NOTE: writing 0 to ADSC and ADIF has no effect.
*/
*
* NOTE: writing 0 to ADSC and ADIF has no effect.
*/
- ADCSRA = ADCSRA & ~(BV(AD
FR
) | BV(ADIF) | BV(ADSC));
+ ADCSRA = ADCSRA & ~(BV(AD
ATE
) | BV(ADIF) | BV(ADSC));
ADC_SETCHN(_adc_idx_next);
_adc_trigger_lock = true;
ADC_SETCHN(_adc_idx_next);
_adc_trigger_lock = true;