summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-09-23 17:26:42 +0000
committerThomas Martitz <kugel@rockbox.org>2009-09-23 17:26:42 +0000
commitd5797a6e93e11eb689e9e16c55a377dc2555b467 (patch)
tree8e1816f3d9562257cedf4a56e98e37afb9df6114
parentca85c401f58e089b27a4d37ce76265985fa470d7 (diff)
downloadrockbox-d5797a6e93e11eb689e9e16c55a377dc2555b467.tar.gz
rockbox-d5797a6e93e11eb689e9e16c55a377dc2555b467.tar.bz2
rockbox-d5797a6e93e11eb689e9e16c55a377dc2555b467.zip
Fix non-hold button and headphone detection target sims.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22800 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/button.c2
-rw-r--r--uisimulator/sdl/button-sdl.h1
-rw-r--r--uisimulator/sdl/button.c8
3 files changed, 8 insertions, 3 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 7199d99e28..806ae6dcfa 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -87,7 +87,7 @@ static int button_read(void);
#ifdef HAVE_TOUCHSCREEN
static int last_touchscreen_touch;
#endif
-#if defined(HAVE_HEADPHONE_DETECTION) && !defined(SIMULATOR)
+#if defined(HAVE_HEADPHONE_DETECTION)
static struct timeout hp_detect_timeout; /* Debouncer for headphone plug/unplug */
/* This callback can be used for many different functions if needed -
just check to which object tmo points */
diff --git a/uisimulator/sdl/button-sdl.h b/uisimulator/sdl/button-sdl.h
index 0adb434e6a..5a0a7e2620 100644
--- a/uisimulator/sdl/button-sdl.h
+++ b/uisimulator/sdl/button-sdl.h
@@ -27,7 +27,6 @@
#include "config.h"
#include "button-target.h"
-#define HAS_BUTTON_HOLD
#undef HAVE_LCD_FLIP
#undef button_init_device
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index c52cf12f9c..5bda8a3ffd 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -1216,17 +1216,23 @@ int button_read_device(int* data)
int button_read_device(void)
{
#endif
- static int hold_button_old = false;
+
+#ifdef HAS_BUTTON_HOLD
int hold_button = button_hold();
+
+#ifdef HAVE_BACKLIGHT
/* light handling */
+ static int hold_button_old = false;
if (hold_button != hold_button_old)
{
hold_button_old = hold_button;
backlight_hold_changed(hold_button);
}
+#endif
if (hold_button)
return BUTTON_NONE;
+#endif
return btn;
}