summaryrefslogtreecommitdiffstats
path: root/firmware/panic.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2008-03-17 00:19:23 +0000
committerJens Arnold <amiconn@rockbox.org>2008-03-17 00:19:23 +0000
commitc6b6bad18fcd68182574086c2eb2a1da30d36d25 (patch)
tree7be19582463e57623a64b674a69893fa771310f5 /firmware/panic.c
parent648104a318e84bb4148eeff2a06e6b533deace40 (diff)
downloadrockbox-c6b6bad18fcd68182574086c2eb2a1da30d36d25.tar.gz
rockbox-c6b6bad18fcd68182574086c2eb2a1da30d36d25.tar.bz2
rockbox-c6b6bad18fcd68182574086c2eb2a1da30d36d25.zip
iAudio M3: ADC driver, making buttons and battery voltage reading work. * Disable the multi-colour LED for now to save power. Proper handling will be added later. * Make reboot on button press work on iAudio X5, M5, M3 in panicf(), and on M3 in UIE().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16684 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/panic.c')
-rw-r--r--firmware/panic.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/panic.c b/firmware/panic.c
index 58f6d1dcb5..0ac458953b 100644
--- a/firmware/panic.c
+++ b/firmware/panic.c
@@ -108,10 +108,12 @@ void panicf( const char *fmt, ...)
#define system_reboot() nop
#elif defined (TOSHIBA_GIGABEAT_F)
if ((GPGDAT & (1 << 0)) != 0)
-#elif defined (IRIVER_H100_SERIES)
- if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */
-#elif defined(IRIVER_H300_SERIES)
+#elif defined(IRIVER_H100_SERIES) || defined(IRIVER_H300_SERIES)
if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */
+#elif defined(IAUDIO_X5) || defined(IAUDIO_M5)
+ if ((GPIO_READ & 0x0c000000) == 0x08000000) /* check for ON button and !hold */
+#elif defined(IAUDIO_M3)
+ if ((GPIO1_READ & 0x202) == 0x200) /* check for ON button and !hold */
#elif CONFIG_CPU == SH7034
#if CONFIG_KEYPAD == PLAYER_PAD
if (!(PADRL & 0x20))