diff options
author | Jean-Louis Biasini <jlbiasini@gmail.com> | 2013-09-02 11:03:56 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-09-05 20:02:07 +0200 |
commit | df6eb82f5156256e1999374ce9b1a159610ff9a0 (patch) | |
tree | ec79d078c7deaba74ad0b83d6dc48c3776e8f7f0 /firmware/export | |
parent | ef2dd06d5ee7415684f45afadad6deaf0fb0c615 (diff) | |
download | rockbox-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/export')
-rw-r--r-- | firmware/export/button.h | 8 | ||||
-rw-r--r-- | firmware/export/touchpad.h | 28 | ||||
-rw-r--r-- | firmware/export/touchscreen.h | 3 |
3 files changed, 39 insertions, 0 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index 6276a033cc..7109c00f97 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -119,4 +119,12 @@ int touchscreen_last_touch(void); | |||
119 | #include "touchscreen.h" | 119 | #include "touchscreen.h" |
120 | #endif | 120 | #endif |
121 | 121 | ||
122 | #ifdef HAVE_TOUCHPAD | ||
123 | #include "touchpad.h" | ||
124 | #endif | ||
125 | |||
126 | #if (defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN)) && !defined(HAS_BUTTON_HOLD) | ||
127 | void button_enable_touch(bool en); | ||
128 | #endif | ||
129 | |||
122 | #endif /* _BUTTON_H_ */ | 130 | #endif /* _BUTTON_H_ */ |
diff --git a/firmware/export/touchpad.h b/firmware/export/touchpad.h new file mode 100644 index 0000000000..ad08469459 --- /dev/null +++ b/firmware/export/touchpad.h | |||
@@ -0,0 +1,28 @@ | |||
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 | #ifndef _TOUCHDEV_H_ | ||
23 | #define _TOUCHDEV_H_ | ||
24 | |||
25 | void touchpad_enable(bool en); | ||
26 | int touchpad_filter(int button); | ||
27 | |||
28 | #endif /* _TOUCHDEV_H_ */ | ||
diff --git a/firmware/export/touchscreen.h b/firmware/export/touchscreen.h index a27e60c653..7421fe0b33 100644 --- a/firmware/export/touchscreen.h +++ b/firmware/export/touchscreen.h | |||
@@ -51,5 +51,8 @@ enum touchscreen_mode touchscreen_get_mode(void); | |||
51 | void touchscreen_disable_mapping(void); | 51 | void touchscreen_disable_mapping(void); |
52 | void touchscreen_reset_mapping(void); | 52 | void touchscreen_reset_mapping(void); |
53 | int touchscreen_get_scroll_threshold(void); | 53 | int touchscreen_get_scroll_threshold(void); |
54 | void touchscreen_enable(bool en); | ||
55 | void touchscreen_enable_device(bool en); | ||
56 | bool touchscreen_is_enabled(void); | ||
54 | 57 | ||
55 | #endif /* __TOUCHSCREEN_INCLUDE_H_ */ | 58 | #endif /* __TOUCHSCREEN_INCLUDE_H_ */ |