summaryrefslogtreecommitdiff
path: root/firmware/drivers
diff options
context:
space:
mode:
authorJean-Louis Biasini <jlbiasini@gmail.com>2013-09-02 11:03:56 +0200
committerAmaury Pouly <amaury.pouly@gmail.com>2013-09-05 20:02:07 +0200
commitdf6eb82f5156256e1999374ce9b1a159610ff9a0 (patch)
treeec79d078c7deaba74ad0b83d6dc48c3776e8f7f0 /firmware/drivers
parentef2dd06d5ee7415684f45afadad6deaf0fb0c615 (diff)
downloadrockbox-df6eb82f5156256e1999374ce9b1a159610ff9a0.tar.gz
rockbox-df6eb82f5156256e1999374ce9b1a159610ff9a0.zip
touch devices: Disable touch on softlock.
Target that have a touchpad/touchscreen should disable it while being locked (In order to avoid LCD to drain battery power due to "key locked" constant reporting messages. If they a have a keylock button this was already handled at driver level. If not (e.g. fuze+), they will have to implement a switch at driver level that action.c can operate on softlock. This patch does the following for any target having a touchpad or a touchscreen and no HAS_BUTTON_HOLD (ie any softlock target) 1) it implements the code to call button_enable_touch(bool en) in action.c. 2) button_enable_touch is implemented in button.c and call either touchpad_enable or touchscreen_enable 3) those two function are implemented respectively in touchscreen.c and a new touchpad.c file. They provide a generic way to silents touch's device and call a function at driver level where target specific code can be implemented if possible/needed (for power saving for instance). Those function name are touchpad_enable_device and touchscreen_enable_device 4) we implement an empty function at driver level of targets that need it to have them still being able to compiled. Change-Id: I9ead78a25bd33466a8533f5b9f259b395cb5ce49 Reviewed-on: http://gerrit.rockbox.org/569 Reviewed-by: Thomas Martitz <kugel@rockbox.org> Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'firmware/drivers')
-rw-r--r--firmware/drivers/button.c12
-rw-r--r--firmware/drivers/touchpad.c43
-rw-r--r--firmware/drivers/touchscreen.c16
3 files changed, 71 insertions, 0 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index c165e8f566..1cc95428ab 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -672,3 +672,15 @@ int button_apply_acceleration(const unsigned int data)
672 return delta; 672 return delta;
673} 673}
674#endif /* HAVE_WHEEL_ACCELERATION */ 674#endif /* HAVE_WHEEL_ACCELERATION */
675
676#if (defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN)) && !defined(HAS_BUTTON_HOLD)
677void button_enable_touch(bool en)
678{
679#ifdef HAVE_TOUCHPAD
680 touchpad_enable(en);
681#endif
682#ifdef HAVE_TOUCHSCREEN
683 touchscreen_enable(en);
684#endif
685}
686#endif
diff --git a/firmware/drivers/touchpad.c b/firmware/drivers/touchpad.c
new file mode 100644
index 0000000000..1d78ee1c3e
--- /dev/null
+++ b/firmware/drivers/touchpad.c
@@ -0,0 +1,43 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id$
9 *
10 * Copyright (C) 2013 by Jean-Louis Biasini
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22#include <stdbool.h>
23#include "button.h"
24#include "touchpad.h"
25#include "button-target.h"
26
27static bool touch_enabled = true;
28
29void touchpad_enable(bool en)
30{
31 if(en != touch_enabled)
32 {
33 touch_enabled = en;
34 touchpad_enable_device(en);
35 }
36}
37
38int touchpad_filter(int button)
39{
40 if(!touch_enabled)
41 button &= ~BUTTON_TOUCHPAD;
42 return button;
43}
diff --git a/firmware/drivers/touchscreen.c b/firmware/drivers/touchscreen.c
index 823c2e7a92..8ce2400ca2 100644
--- a/firmware/drivers/touchscreen.c
+++ b/firmware/drivers/touchscreen.c
@@ -31,6 +31,7 @@
31#define BUTTON_MARGIN_X (int)(LCD_WIDTH * 0.03) 31#define BUTTON_MARGIN_X (int)(LCD_WIDTH * 0.03)
32#define BUTTON_MARGIN_Y (int)(LCD_HEIGHT * 0.03) 32#define BUTTON_MARGIN_Y (int)(LCD_HEIGHT * 0.03)
33 33
34static bool touch_enabled = true;
34static enum touchscreen_mode current_mode = TOUCHSCREEN_POINT; 35static enum touchscreen_mode current_mode = TOUCHSCREEN_POINT;
35static const int touchscreen_buttons[3][3] = 36static const int touchscreen_buttons[3][3] =
36{ 37{
@@ -121,6 +122,8 @@ static void map_pixels(int *x, int *y)
121/* TODO: add jitter (and others) filter */ 122/* TODO: add jitter (and others) filter */
122int touchscreen_to_pixels(int x, int y, int *data) 123int touchscreen_to_pixels(int x, int y, int *data)
123{ 124{
125 if(!touch_enabled)
126 return 0;
124 x &= 0xFFFF; 127 x &= 0xFFFF;
125 y &= 0xFFFF; 128 y &= 0xFFFF;
126 129
@@ -169,6 +172,19 @@ enum touchscreen_mode touchscreen_get_mode(void)
169 return current_mode; 172 return current_mode;
170} 173}
171 174
175void touchscreen_enable(bool en)
176{
177 if(en != touch_enabled)
178 {
179 touch_enabled = en;
180 touchscreen_enable_device(en);
181 }
182}
183
184bool touchscreen_is_enabled(void)
185{
186 return touch_enabled;
187}
172 188
173#if ((CONFIG_PLATFORM & PLATFORM_ANDROID) == 0) 189#if ((CONFIG_PLATFORM & PLATFORM_ANDROID) == 0)
174/* android has an API for this */ 190/* android has an API for this */