summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2005-01-27 11:49:29 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2005-01-27 11:49:29 +0000
commit72de21ae974fe911e01d98487951c5a2d0a2de65 (patch)
tree9eb8eb380a03849b5da9633048f03d210cb1abc2
parentf4702040d64e86d717a6af80cd4e910f15407a51 (diff)
button_status() no longer calls button_read(), since it isn't interrupt safe
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5670 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/button.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index e60657c82d..9376dace7a 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -36,8 +36,8 @@
struct event_queue button_queue;
-static int lastbtn; /* Last valid button status */
-static int last_read; /* Last button status, for debouncing/filtering */
+static long lastbtn; /* Last valid button status */
+static long last_read; /* Last button status, for debouncing/filtering */
#ifdef HAVE_LCD_BITMAP
static bool flipped; /* buttons can be flipped to match the LCD flip */
#endif
@@ -509,7 +509,7 @@ bool button_hold(void)
int button_status(void)
{
- return button_read();
+ return last_btn;
}
void button_clear_queue(void)