summaryrefslogtreecommitdiffstats
path: root/firmware/timer.c
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2009-06-13 15:01:25 +0000
committerBertrik Sikken <bertrik@sikken.nl>2009-06-13 15:01:25 +0000
commit52c46f2ec67ce76e9f4906e2cc263a7086a86608 (patch)
tree1b9d9ed8575270c9cf237b73606221491cf56402 /firmware/timer.c
parent73f9bde9088f0bc447725fdb512a78034060dc9d (diff)
downloadrockbox-52c46f2ec67ce76e9f4906e2cc263a7086a86608.tar.gz
rockbox-52c46f2ec67ce76e9f4906e2cc263a7086a86608.tar.bz2
rockbox-52c46f2ec67ce76e9f4906e2cc263a7086a86608.zip
Fix bug in earlier commit of FS#10317: don't mix TIMER1 and TIMER2 settings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21273 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/timer.c')
-rw-r--r--firmware/timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/timer.c b/firmware/timer.c
index 85e50ae3ca..1cd913bb35 100644
--- a/firmware/timer.c
+++ b/firmware/timer.c
@@ -184,7 +184,7 @@ static bool timer_set(long cycles, bool start)
TIMER1_LOAD = TIMER1_BGLOAD = cycles;
/* /!\ bit 4 (reserved) must not be modified
* periodic mode, interrupt enabled, no prescale, 32 bits counter */
- TIMER1_CONTROL = (TIMER2_CONTROL & (1<<4)) |
+ TIMER1_CONTROL = (TIMER1_CONTROL & (1<<4)) |
TIMER_ENABLE |
TIMER_PERIODIC |
TIMER_INT_ENABLE |