diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-02-10 21:52:54 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-02-10 21:52:54 +0000 |
| commit | abcb16192eef1f54fee0eff5356fff1bc303da39 (patch) | |
| tree | 07f870eb2315e6d936a330cf7c4058a482ff48ff /firmware/drivers/button.c | |
| parent | 703d30cb21f49000754c7903e7814add9f77998b (diff) | |
| download | rockbox-abcb16192eef1f54fee0eff5356fff1bc303da39.zip rockbox-abcb16192eef1f54fee0eff5356fff1bc303da39.tar.gz rockbox-abcb16192eef1f54fee0eff5356fff1bc303da39.tar.bz2 rockbox-abcb16192eef1f54fee0eff5356fff1bc303da39.tar.xz | |
iRiver: added remote hold switch, and allow shutdown when charging
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5886 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.c')
| -rw-r--r-- | firmware/drivers/button.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index e5f12b5..1a0aece 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c @@ -123,7 +123,10 @@ static void button_tick(void) which doesn't shut down easily with the OFF key */ #ifdef HAVE_SW_POWEROFF - if (btn == BUTTON_OFF && !charger_inserted() && + if (btn == BUTTON_OFF && +#ifndef IRIVER_H100 + !charger_inserted() && +#endif repeat_count > POWEROFF_COUNT) queue_post(&button_queue, SYS_POWEROFF, NULL); #endif @@ -378,6 +381,9 @@ static int button_read(void) if ((data & 0x20) == 0) btn |= BUTTON_ON; + if ((data & 0x40) == 0) + btn |= BUTTON_RC_ON; + #elif CONFIG_KEYPAD == RECORDER_PAD #ifdef HAVE_FMADC @@ -508,6 +514,11 @@ bool button_hold(void) { return (GPIO1_READ & 0x00000002)?true:false; } + +bool remote_button_hold(void) +{ + return (GPIO1_READ & 0x00100000)?true:false; +} #endif int button_status(void) |