summaryrefslogtreecommitdiff
path: root/firmware/system.c
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2006-03-17 00:08:39 +0000
committerThom Johansen <thomj@rockbox.org>2006-03-17 00:08:39 +0000
commit46de4c21fee7d31b8a76c4ae7df75e29800cd587 (patch)
treed9efe96f84d81fecbfd84cb2cfcb86bbb41ac8fd /firmware/system.c
parentf7b14efc7f8d1ac6c8cd5bb4dc7fd8b9f36c33d0 (diff)
downloadrockbox-46de4c21fee7d31b8a76c4ae7df75e29800cd587.zip
rockbox-46de4c21fee7d31b8a76c4ae7df75e29800cd587.tar.gz
rockbox-46de4c21fee7d31b8a76c4ae7df75e29800cd587.tar.bz2
rockbox-46de4c21fee7d31b8a76c4ae7df75e29800cd587.tar.xz
Add timer.c module support for ipods. Remove uneeded SIMULATOR check.
Introduce TIMER_FREQ define. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9067 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/system.c')
-rw-r--r--firmware/system.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/firmware/system.c b/firmware/system.c
index fa07f63..1a8ee34 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -1140,6 +1140,7 @@ unsigned int ipod_hw_rev;
#ifndef BOOTLOADER
extern void TIMER1(void);
+extern void TIMER2(void);
#if defined(APPLE_IPODMINI)
extern void ipod_mini_button_int(void);
@@ -1148,6 +1149,8 @@ void irq(void)
{
if (CPU_INT_STAT & TIMER1_MASK)
TIMER1();
+ else if (CPU_INT_STAT & TIMER2_MASK)
+ TIMER2();
else if (CPU_HI_INT_STAT & GPIO_MASK)
ipod_mini_button_int();
}
@@ -1158,6 +1161,8 @@ void irq(void)
{
if (CPU_INT_STAT & TIMER1_MASK)
TIMER1();
+ else if (CPU_INT_STAT & TIMER2_MASK)
+ TIMER2();
else if (CPU_HI_INT_STAT & I2C_MASK)
ipod_4g_button_int();
}
@@ -1243,11 +1248,14 @@ int system_memory_guard(int newmode)
unsigned int ipod_hw_rev;
#ifndef BOOTLOADER
extern void TIMER1(void);
+extern void TIMER2(void);
void irq(void)
{
if (CPU_INT_STAT & TIMER1_MASK)
TIMER1();
+ else if (CPU_INT_STAT & TIMER2_MASK)
+ TIMER2();
}
#endif