diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2008-11-12 04:15:34 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2008-11-12 04:15:34 +0000 |
commit | 59d4d2025c9f1b0a68b780fe6a6f0e313caf3027 (patch) | |
tree | 600746fc28046ddfc58498fd69d4afef8d40e419 /apps/plugins/rockboy/cpu.c | |
parent | d42041043b95617244ffdb9150c5e2f2720a8a83 (diff) | |
download | rockbox-59d4d2025c9f1b0a68b780fe6a6f0e313caf3027.tar.gz rockbox-59d4d2025c9f1b0a68b780fe6a6f0e313caf3027.zip |
Revert last commit (accidentally committed the whole tree)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19095 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/rockboy/cpu.c')
-rw-r--r-- | apps/plugins/rockboy/cpu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/plugins/rockboy/cpu.c b/apps/plugins/rockboy/cpu.c index f1926fe421..1aca06f337 100644 --- a/apps/plugins/rockboy/cpu.c +++ b/apps/plugins/rockboy/cpu.c | |||
@@ -333,6 +333,8 @@ void cpu_timers(int cnt) | |||
333 | 333 | ||
334 | static int cpu_idle(int max) | 334 | static int cpu_idle(int max) |
335 | { | 335 | { |
336 | int cnt, unit; | ||
337 | |||
336 | if (!(cpu.halt && IME)) return 0; | 338 | if (!(cpu.halt && IME)) return 0; |
337 | if (R_IF & R_IE) | 339 | if (R_IF & R_IE) |
338 | { | 340 | { |
@@ -351,7 +353,6 @@ static int cpu_idle(int max) | |||
351 | return max; | 353 | return max; |
352 | } | 354 | } |
353 | 355 | ||
354 | int cnt, unit; | ||
355 | /* Figure out when the next timer interrupt will happen */ | 356 | /* Figure out when the next timer interrupt will happen */ |
356 | unit = ((-R_TAC) & 3) << 1; | 357 | unit = ((-R_TAC) & 3) << 1; |
357 | cnt = (511 - cpu.tim + (1<<unit)) >> unit; | 358 | cnt = (511 - cpu.tim + (1<<unit)) >> unit; |