summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2014-03-14 16:21:34 +0100
committerThomas Martitz <kugel@rockbox.org>2014-03-18 10:56:19 +0100
commit1cf17436b77659aa59e205c1dcf62b4fe485e95e (patch)
treeaa2428a0036ee4e3403eae617e40ec333a7158f9
parent915bc0999676b1d42f8c9dd57e5911931cd34fcd (diff)
downloadrockbox-1cf17436b77659aa59e205c1dcf62b4fe485e95e.tar.gz
rockbox-1cf17436b77659aa59e205c1dcf62b4fe485e95e.tar.bz2
rockbox-1cf17436b77659aa59e205c1dcf62b4fe485e95e.zip
Fix (unintentional) linkage of HAVE_BUTTON_DATA with HAVE_TOUCHSCREEN
Defining HAVE_BUTTON_DATA without simultaneously defining HAVE_TOUCHSCREEN caused compile errors. (I need them separated for a scrollstrip driver.) Change-Id: I945d3437d840035ccc0c147f8155029b403c6ec2 Reviewed-on: http://gerrit.rockbox.org/771 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com> Reviewed-by: Thomas Martitz <kugel@rockbox.org>
-rw-r--r--firmware/drivers/button.c2
-rw-r--r--firmware/target/hosted/sdl/button-sdl.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 1cc95428ab..718fb6a6da 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -87,13 +87,13 @@ static bool phones_present = false;
#ifdef HAVE_BUTTON_DATA
static int button_read(int *data);
+static int lastdata = 0;
#else
static int button_read(void);
#endif
#ifdef HAVE_TOUCHSCREEN
static int last_touchscreen_touch;
-static int lastdata = 0;
#endif
#if defined(HAVE_HEADPHONE_DETECTION)
static struct timeout hp_detect_timeout; /* Debouncer for headphone plug/unplug */
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 9677f1dd23..2a3202b6bc 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -444,11 +444,15 @@ static void button_event(int key, bool pressed)
else
btn &= ~new_btn;
}
-#if defined(HAVE_BUTTON_DATA) && defined(HAVE_TOUCHSCREEN)
+#if defined(HAVE_BUTTON_DATA)
int button_read_device(int* data)
{
+#if defined(HAVE_TOUCHSCREEN)
*data = mouse_coords;
#else
+ (void) *data; /* suppress compiler warnings */
+#endif
+#else
int button_read_device(void)
{
#endif