diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2006-06-08 22:08:24 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2006-06-08 22:08:24 +0000 |
| commit | 4ba0a33204b0667933d99c48280272c24e1bfce4 (patch) | |
| tree | 79a7b424c61f782c307a9bf733bbda1d2d7e05c8 /firmware | |
| parent | 9931cbd82185d0d7ebb73796cea3094507d2ae00 (diff) | |
| download | rockbox-4ba0a33204b0667933d99c48280272c24e1bfce4.tar.gz rockbox-4ba0a33204b0667933d99c48280272c24e1bfce4.zip | |
Let panicf() also check on/play button on h300
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10094 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/panic.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/panic.c b/firmware/panic.c index 07b7a5f4de..dc9876e272 100644 --- a/firmware/panic.c +++ b/firmware/panic.c | |||
| @@ -100,6 +100,8 @@ void panicf( const char *fmt, ...) | |||
| 100 | /* try to restart firmware if ON is pressed */ | 100 | /* try to restart firmware if ON is pressed */ |
| 101 | #ifdef IRIVER_H100_SERIES | 101 | #ifdef IRIVER_H100_SERIES |
| 102 | if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */ | 102 | if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */ |
| 103 | #elif IRIVER_H300_SERIES | ||
| 104 | if ((GPIO1_READ & 0x22) == 0) /* check for ON button and !hold */ | ||
| 103 | #elif CONFIG_CPU == SH7034 | 105 | #elif CONFIG_CPU == SH7034 |
| 104 | #if CONFIG_KEYPAD == PLAYER_PAD | 106 | #if CONFIG_KEYPAD == PLAYER_PAD |
| 105 | if (!(PADRL & 0x20)) | 107 | if (!(PADRL & 0x20)) |