diff options
| author | utzig <utzig@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-09 21:42:49 +0000 |
|---|---|---|
| committer | utzig <utzig@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-09 21:42:49 +0000 |
| commit | 8b1fe26bfd5a23521833f8dfc445f6ca917d5222 (patch) | |
| tree | 12974d500e2821073c2e83b187c75af178f4221c | |
| parent | 07cb74bbff52acd9e282d09b8ef00902876e4496 (diff) | |
| download | ChibiOS-8b1fe26bfd5a23521833f8dfc445f6ca917d5222.tar.gz ChibiOS-8b1fe26bfd5a23521833f8dfc445f6ca917d5222.tar.bz2 ChibiOS-8b1fe26bfd5a23521833f8dfc445f6ca917d5222.zip | |
[AVR] Fix timer 0 support for AT90CANxx
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5946 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/AVR/hal_lld.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/os/hal/platforms/AVR/hal_lld.c b/os/hal/platforms/AVR/hal_lld.c index f8afbfdb2..b574a9dc8 100644 --- a/os/hal/platforms/AVR/hal_lld.c +++ b/os/hal/platforms/AVR/hal_lld.c @@ -70,7 +70,7 @@ void hal_lld_init(void) { /*
* Timer 0 setup.
*/
-#if defined(TCCR0A) /* Timer has multiple output comparators */
+#if defined(TCCR0B) /* Timer has multiple output comparators */
TCCR0A = (1 << WGM01) | (0 << WGM00) | /* CTC mode. */
(0 << COM0A1) | (0 << COM0A0) | /* OC0A disabled. */
(0 << COM0B1) | (0 << COM0B0); /* OC0B disabled. */
@@ -80,6 +80,14 @@ void hal_lld_init(void) { TIFR0 = (1 << OCF0A); /* Reset pending. */
TIMSK0 = (1 << OCIE0A); /* IRQ on compare. */
+#elif defined(TCCR0A) /* AT90CAN doesn't have TCCR0B and slightly different TCCR0A */
+ TCCR0A = (1 << WGM01) | (0 << WGM00) | /* CTC mode. */
+ (0 << COM0A1) | (0 << COM0A0); /* OC0A disabled. */
+ OCR0A = AVR_TIMER_COUNTER - 1;
+ TCNT0 = 0; /* Reset counter. */
+ TIFR0 = (1 << OCF0A); /* Reset pending. */
+ TIMSK0 = (1 << OCIE0A); /* IRQ on compare. */
+
#elif defined(TCCR0) /* Timer has single output comparator */
TCCR0 = (1 << WGM01) | (0 << WGM00) | /* CTC mode. */
(0 << COM01) | (0 << COM00) | /* OC0A disabled. */
|