aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/boards
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-10-12 09:29:12 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2014-10-12 09:29:12 +0000
commit0320aa53143ea1bb908c90c599fa6bdd3fce2c46 (patch)
treefb312a61e589d5b70d8f3a6b15d662b97bb0f89a /os/hal/boards
parent66ea340bb19d5af9294f0b348ac1c4550117c367 (diff)
downloadChibiOS-0320aa53143ea1bb908c90c599fa6bdd3fce2c46.tar.gz
ChibiOS-0320aa53143ea1bb908c90c599fa6bdd3fce2c46.tar.bz2
ChibiOS-0320aa53143ea1bb908c90c599fa6bdd3fce2c46.zip
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7387 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/boards')
-rw-r--r--os/hal/boards/OLIMEX_LPC_P2148/board.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/os/hal/boards/OLIMEX_LPC_P2148/board.c b/os/hal/boards/OLIMEX_LPC_P2148/board.c
index e5f856294..1048c6140 100644
--- a/os/hal/boards/OLIMEX_LPC_P2148/board.c
+++ b/os/hal/boards/OLIMEX_LPC_P2148/board.c
@@ -42,9 +42,9 @@ static CH_IRQ_HANDLER(T0IrqHandler) {
CH_IRQ_PROLOGUE();
T0IR = 1; /* Clear interrupt on match MR0. */
- chSysLockFromIsr();
+ chSysLockFromISR();
chSysTimerHandlerI();
- chSysUnlockFromIsr();
+ chSysUnlockFromISR();
VICVectAddr = 0;
CH_IRQ_EPILOGUE();
@@ -87,7 +87,7 @@ void boardInit(void) {
VICIntEnable = INTMASK(SOURCE_Timer0);
TC *timer = T0Base;
timer->TC_PR = VAL_TC0_PRESCALER;
- timer->TC_MR0 = (PCLK / CH_FREQUENCY) / (VAL_TC0_PRESCALER + 1);
+ timer->TC_MR0 = (PCLK / CH_CFG_ST_FREQUENCY) / (VAL_TC0_PRESCALER + 1);
timer->TC_MCR = 3; /* Interrupt and clear TC on match MR0. */
timer->TC_TCR = 2; /* Reset counter and prescaler. */
timer->TC_TCR = 1; /* Timer enabled. */