diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2004-12-01 00:33:18 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2004-12-01 00:33:18 +0000 |
| commit | 303b4abfc5b6e7f1fd85876a2c644a4661d9dd02 (patch) | |
| tree | de3df45eca3b504a5975526fb3a09ff187566a8f /firmware/system.c | |
| parent | bbc593128066d258002bb0a17a09c8dd33c07c46 (diff) | |
Button driver overhaul: (1) Unified the button driver functions as much as possible (2) Proper #defines for FM recorder button ADC channels (3) Got rid of old port B #defines only valid for recorder (4) button filtering for all models (5) RoLo with ON after panic should now work for FM/V2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5472 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/system.c')
| -rw-r--r-- | firmware/system.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/firmware/system.c b/firmware/system.c index 0628eb64cb..726d7fd6cc 100644 --- a/firmware/system.c +++ b/firmware/system.c @@ -534,11 +534,15 @@ void UIE (unsigned int pc) /* Unexpected Interrupt or Exception */ for (i = 0; i < 240000; ++i); /* try to restart firmware if ON is pressed */ -#ifdef HAVE_LCD_CHARCELLS - if (!(PADR & 0x20)) +#if CONFIG_KEYPAD == PLAYER_PAD + if (!(PADR & 0x0020)) rolo_load("/archos.mod"); +#elif CONFIG_KEYPAD == RECORDER_PAD +#ifdef HAVE_FMADC + if (!(PCDR & 0x0008)) #else - if (!(PBDR & PBDR_BTN_ON)) + if (!(PBDR & 0x0100)) +#endif rolo_load("/ajbrec.ajz"); #endif } |