summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2021-08-30 01:23:39 +0100
committerAidan MacDonald <amachronic@protonmail.com>2021-11-21 20:26:20 +0000
commitbff63a4f909770d86b12217e9003a22c54789c7b (patch)
treece426feda1037c6dc3246fea9ad39230b3d73d50 /firmware
parent7e428ad190dd8d928fbb1451a7bb81dd4e856258 (diff)
downloadrockbox-bff63a4f909770d86b12217e9003a22c54789c7b.tar.gz
rockbox-bff63a4f909770d86b12217e9003a22c54789c7b.zip
touchscreen: change odd sentinel value for time of last touch
Using tick 0xffff does not make any sense, use -1 instead. Change-Id: Id574eb35418c6713c4fc91ed539aadc42fd29aa5
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/button.c6
-rw-r--r--firmware/export/button.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 0af51dc3b2..9979bc0155 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -94,7 +94,7 @@ static int button_read(void);
#endif
#ifdef HAVE_TOUCHSCREEN
-static int last_touchscreen_touch;
+static long last_touchscreen_touch;
#endif
#if defined(HAVE_HEADPHONE_DETECTION)
static struct timeout hp_detect_timeout; /* Debouncer for headphone plug/unplug */
@@ -542,7 +542,7 @@ void button_init(void)
#endif
#endif
#ifdef HAVE_TOUCHSCREEN
- last_touchscreen_touch = 0xffff;
+ last_touchscreen_touch = -1;
#endif
/* Start polling last */
tick_add_task(button_tick);
@@ -714,7 +714,7 @@ void button_clear_queue(void)
}
#ifdef HAVE_TOUCHSCREEN
-int touchscreen_last_touch(void)
+long touchscreen_last_touch(void)
{
return last_touchscreen_touch;
}
diff --git a/firmware/export/button.h b/firmware/export/button.h
index 1745947230..3abad2d4f0 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -107,7 +107,7 @@ int button_apply_acceleration(const unsigned int data);
BUTTON_MULTIMEDIA_FFWD)
#ifdef HAVE_TOUCHSCREEN
-int touchscreen_last_touch(void);
+long touchscreen_last_touch(void);
#if (!defined(BUTTON_TOPLEFT) || !defined(BUTTON_TOPMIDDLE) \
|| !defined(BUTTON_TOPRIGHT) || !defined(BUTTON_MIDLEFT) \