summaryrefslogtreecommitdiff
path: root/firmware/system.c
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-02-27 12:35:05 +0000
committerDave Chapman <dave@dchapman.com>2006-02-27 12:35:05 +0000
commit285079138b0baa5cf03221f8abcdaaec8e35f112 (patch)
treee73ba981e762f781ce7a5ea2d5ba24b07a4b2292 /firmware/system.c
parent0bdf0c6342fe1529a1a2f7a9a5086d088f51bc19 (diff)
Patch #3060 from Andrew Scott - iPod mini button driver
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8857 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/system.c')
-rw-r--r--firmware/system.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/firmware/system.c b/firmware/system.c
index 79004f8284..fa07f6364e 100644
--- a/firmware/system.c
+++ b/firmware/system.c
@@ -1140,6 +1140,18 @@ unsigned int ipod_hw_rev;
#ifndef BOOTLOADER
extern void TIMER1(void);
+
+#if defined(APPLE_IPODMINI)
+extern void ipod_mini_button_int(void);
+
+void irq(void)
+{
+ if (CPU_INT_STAT & TIMER1_MASK)
+ TIMER1();
+ else if (CPU_HI_INT_STAT & GPIO_MASK)
+ ipod_mini_button_int();
+}
+#else
extern void ipod_4g_button_int(void);
void irq(void)
@@ -1150,6 +1162,7 @@ void irq(void)
ipod_4g_button_int();
}
#endif
+#endif /* BOOTLOADER */
/* TODO: The following two function have been lifted straight from IPL, and
hence have a lot of numeric addresses used straight. I'd like to use