From 11d87ed92347617518d7bb3c8c734917f103d8ec Mon Sep 17 00:00:00 2001 From: utzig Date: Sun, 29 Jun 2014 23:07:40 +0000 Subject: Updated to RT-3 (might temporarily break NIL port) git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7000 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/hal/boards/ARDUINO_MEGA/board.c | 18 ++---------------- os/hal/boards/ARDUINO_MEGA/board.h | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) (limited to 'os/hal/boards/ARDUINO_MEGA') diff --git a/os/hal/boards/ARDUINO_MEGA/board.c b/os/hal/boards/ARDUINO_MEGA/board.c index c3b9957f0..07ead2c7e 100644 --- a/os/hal/boards/ARDUINO_MEGA/board.c +++ b/os/hal/boards/ARDUINO_MEGA/board.c @@ -1,5 +1,5 @@ /* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio + ChibiOS/RT - Copyright (C) 2006-2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -60,20 +60,6 @@ const PALConfig pal_default_config = }; #endif /* HAL_USE_PAL */ -/** - * @brief Timer0 interrupt handler. - */ -CH_IRQ_HANDLER(TIMER0_COMPA_vect) { - - CH_IRQ_PROLOGUE(); - - chSysLockFromIsr(); - chSysTimerHandlerI(); - chSysUnlockFromIsr(); - - CH_IRQ_EPILOGUE(); -} - /** * Board-specific initialization code. */ @@ -94,7 +80,7 @@ void boardInit(void) { (0 << COM0B1) | (0 << COM0B0); /* OC0B disabled. */ TCCR0B = (0 << WGM02) | /* CTC mode. */ (0 << CS02) | (1 << CS01) | (1 << CS00); /* CLK/64 clock. */ - OCR0A = F_CPU / 64 / CH_FREQUENCY - 1; + OCR0A = F_CPU / 64 / CH_CFG_ST_FREQUENCY - 1; TCNT0 = 0; /* Reset counter. */ TIFR0 = (1 << OCF0A); /* Reset pending. */ TIMSK0 = (1 << OCIE0A); /* IRQ on compare. */ diff --git a/os/hal/boards/ARDUINO_MEGA/board.h b/os/hal/boards/ARDUINO_MEGA/board.h index 9dc3b09e4..f39c59a09 100644 --- a/os/hal/boards/ARDUINO_MEGA/board.h +++ b/os/hal/boards/ARDUINO_MEGA/board.h @@ -1,5 +1,5 @@ /* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio + ChibiOS/RT - Copyright (C) 2006-2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. -- cgit v1.2.3