From d4800fa3851d2d89c1be03ec99af81f277892579 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Fri, 17 Jun 2011 03:09:47 +0000 Subject: Coldfire: Fix the modification of IMR. Interrupts must be masked at the core level at at least the level of the interrupt being masked. Not following the datasheet and relying strictly on and/or_l causes unhandled 'Levelx' exceptions (showing itself quite often in PCM mixer work which more greatly stresses PCM lockout). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30009 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/coldfire/timer-coldfire.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'firmware/target/coldfire/timer-coldfire.c') diff --git a/firmware/target/coldfire/timer-coldfire.c b/firmware/target/coldfire/timer-coldfire.c index 49d22bb5fa..cc665cb9c6 100644 --- a/firmware/target/coldfire/timer-coldfire.c +++ b/firmware/target/coldfire/timer-coldfire.c @@ -89,7 +89,7 @@ bool timer_set(long cycles, bool start) bool timer_start(void) { ICR2 = 0x90; /* interrupt on level 4.0 */ - and_l(~(1<<10), &IMR); + coldfire_imr_mod(0, 1 << 10); TMR1 |= 1; /* start timer */ return true; } @@ -97,7 +97,7 @@ bool timer_start(void) void timer_stop(void) { TMR1 = 0; /* disable timer 1 */ - or_l((1<<10), &IMR); /* disable interrupt */ + coldfire_imr_mod(1 << 10, 1 << 10); /* disable interrupt */ } void timers_adjust_prescale(int multiplier, bool enable_irq) -- cgit v1.2.3