summaryrefslogtreecommitdiff
path: root/firmware/drivers/button.c
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2003-02-14 09:44:34 +0000
committerBjörn Stenberg <bjorn@haxx.se>2003-02-14 09:44:34 +0000
commitc4d8d970f6602c80d7362a41da8851dbbf59ae1b (patch)
tree7e8f936eae5c1854c006c4fe134c4c2ce6f91291 /firmware/drivers/button.c
parent84706a4188cea193a5a095855c1068b1c31a3875 (diff)
downloadrockbox-c4d8d970f6602c80d7362a41da8851dbbf59ae1b.zip
rockbox-c4d8d970f6602c80d7362a41da8851dbbf59ae1b.tar.gz
rockbox-c4d8d970f6602c80d7362a41da8851dbbf59ae1b.tar.bz2
rockbox-c4d8d970f6602c80d7362a41da8851dbbf59ae1b.tar.xz
The power-saving SLEEP patch by Simon Elén.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3259 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r--firmware/drivers/button.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 2c33440..69d041f 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -163,19 +163,8 @@ int button_get(bool block)
int button_get_w_tmo(int ticks)
{
struct event ev;
- unsigned int timeout = current_tick + ticks;
-
- while (TIME_BEFORE( current_tick, timeout ))
- {
- if(!queue_empty(&button_queue))
- {
- queue_wait(&button_queue, &ev);
- return ev.id;
- }
- yield();
- }
-
- return BUTTON_NONE;
+ queue_wait_w_tmo(&button_queue, &ev, ticks);
+ return (ev.id != SYS_TIMEOUT)? ev.id: BUTTON_NONE;
}
#ifdef HAVE_RECORDER_KEYPAD