diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2008-06-03 05:08:24 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2008-06-03 05:08:24 +0000 |
commit | 191320cd0f39a1dd831273f6ad57602d1b2e6cf9 (patch) | |
tree | ceedf028763a7855bf1b2caeb11765e7c6dd79af /firmware/timer.c | |
parent | 606d9d0c83f8396fa418fa16a23da68aa2e4d784 (diff) | |
download | rockbox-191320cd0f39a1dd831273f6ad57602d1b2e6cf9.tar.gz rockbox-191320cd0f39a1dd831273f6ad57602d1b2e6cf9.zip |
Rename CPU/COP_INT_CLR to CPU/COP_INT_DIS since it's really a 'write one to disable' register and hasn't anything to do with acknowledging interrupts-- that's handled at the module level.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17683 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/timer.c')
-rw-r--r-- | firmware/timer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/timer.c b/firmware/timer.c index bd9050f872..eefebb38f8 100644 --- a/firmware/timer.c +++ b/firmware/timer.c | |||
@@ -201,8 +201,8 @@ static bool timer_set(long cycles, bool start) | |||
201 | pfn_unregister(); | 201 | pfn_unregister(); |
202 | pfn_unregister = NULL; | 202 | pfn_unregister = NULL; |
203 | } | 203 | } |
204 | CPU_INT_CLR = TIMER2_MASK; | 204 | CPU_INT_DIS = TIMER2_MASK; |
205 | COP_INT_CLR = TIMER2_MASK; | 205 | COP_INT_DIS = TIMER2_MASK; |
206 | } | 206 | } |
207 | if (start || (cycles_new == -1)) /* within isr, cycles_new is "locked" */ | 207 | if (start || (cycles_new == -1)) /* within isr, cycles_new is "locked" */ |
208 | TIMER2_CFG = 0xc0000000 | (cycles - 1); /* enable timer */ | 208 | TIMER2_CFG = 0xc0000000 | (cycles - 1); /* enable timer */ |
@@ -311,8 +311,8 @@ void timer_unregister(void) | |||
311 | or_l((1<<10), &IMR); /* disable interrupt */ | 311 | or_l((1<<10), &IMR); /* disable interrupt */ |
312 | #elif defined(CPU_PP) | 312 | #elif defined(CPU_PP) |
313 | TIMER2_CFG = 0; /* stop timer 2 */ | 313 | TIMER2_CFG = 0; /* stop timer 2 */ |
314 | CPU_INT_CLR = TIMER2_MASK; | 314 | CPU_INT_DIS = TIMER2_MASK; |
315 | COP_INT_CLR = TIMER2_MASK; | 315 | COP_INT_DIS = TIMER2_MASK; |
316 | #elif CONFIG_CPU == PNX0101 | 316 | #elif CONFIG_CPU == PNX0101 |
317 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ | 317 | TIMER1.ctrl &= ~0x80; /* disable timer 1 */ |
318 | irq_disable_int(IRQ_TIMER1); | 318 | irq_disable_int(IRQ_TIMER1); |