diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-05-28 12:09:30 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-05-28 12:09:30 +0000 |
commit | f0085673799e0d7f20d9ba6a799147dfaf2dedc1 (patch) | |
tree | 5976ff13bb58af0f720a912cdc8d630141fe1393 /firmware/drivers | |
parent | 8b9d456bbb626bd40b06886b2dc97492b1d0b685 (diff) | |
download | rockbox-f0085673799e0d7f20d9ba6a799147dfaf2dedc1.tar.gz rockbox-f0085673799e0d7f20d9ba6a799147dfaf2dedc1.zip |
Added 'block' parameter to button_get()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@759 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers')
-rw-r--r-- | firmware/drivers/button.c | 4 | ||||
-rw-r--r-- | firmware/drivers/button.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index ffbb67c463..d3fe8e0a98 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -76,11 +76,11 @@ static void button_tick(void) | |||
76 | } | 76 | } |
77 | } | 77 | } |
78 | 78 | ||
79 | int button_get(void) | 79 | int button_get(bool block) |
80 | { | 80 | { |
81 | struct event ev; | 81 | struct event ev; |
82 | 82 | ||
83 | if ( !queue_empty(&button_queue) ) { | 83 | if ( block || !queue_empty(&button_queue) ) { |
84 | queue_wait(&button_queue, &ev); | 84 | queue_wait(&button_queue, &ev); |
85 | return ev.id; | 85 | return ev.id; |
86 | } | 86 | } |
diff --git a/firmware/drivers/button.h b/firmware/drivers/button.h index a8cc71b875..ef8984466e 100644 --- a/firmware/drivers/button.h +++ b/firmware/drivers/button.h | |||
@@ -16,11 +16,14 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #ifndef _BUTTON_H_ | ||
20 | #define _BUTTON_H_ | ||
19 | 21 | ||
22 | #include <stdbool.h> | ||
20 | #include "config.h" | 23 | #include "config.h" |
21 | 24 | ||
22 | void button_init (void); | 25 | void button_init (void); |
23 | int button_get (void); | 26 | int button_get (bool block); |
24 | 27 | ||
25 | /* Shared button codes */ | 28 | /* Shared button codes */ |
26 | #define BUTTON_NONE 0x0000 | 29 | #define BUTTON_NONE 0x0000 |
@@ -52,3 +55,5 @@ int button_get (void); | |||
52 | #define BUTTON_STOP BUTTON_DOWN | 55 | #define BUTTON_STOP BUTTON_DOWN |
53 | 56 | ||
54 | #endif | 57 | #endif |
58 | |||
59 | #endif | ||