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/target/arm/imx233 | |
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/target/arm/imx233')
3 files changed, 14 insertions, 4 deletions
diff --git a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c index 74b8d649b3..4f2a2775bf 100644 --- a/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c +++ b/firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | |||
@@ -66,7 +66,7 @@ void button_init_device(void) | |||
66 | 66 | ||
67 | bottomright.px_x = LCD_WIDTH; | 67 | bottomright.px_x = LCD_WIDTH; |
68 | bottomright.px_y = LCD_HEIGHT; | 68 | bottomright.px_y = LCD_HEIGHT; |
69 | 69 | ||
70 | imx233_touchscreen_init(); | 70 | imx233_touchscreen_init(); |
71 | imx233_touchscreen_enable(true); | 71 | imx233_touchscreen_enable(true); |
72 | 72 | ||
@@ -104,6 +104,11 @@ static int touch_to_pixels(int *val_x, int *val_y) | |||
104 | return (x<<16)|y; | 104 | return (x<<16)|y; |
105 | } | 105 | } |
106 | 106 | ||
107 | void touchscreen_enable_device(bool en) | ||
108 | { | ||
109 | imx233_touchscreen_enable(en); | ||
110 | } | ||
111 | |||
107 | static int touchscreen_read_device(int *data) | 112 | static int touchscreen_read_device(int *data) |
108 | { | 113 | { |
109 | int x, y; | 114 | int x, y; |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c index afabdd3bc3..05c4da8540 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c +++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c | |||
@@ -28,6 +28,7 @@ | |||
28 | #include "string.h" | 28 | #include "string.h" |
29 | #include "usb.h" | 29 | #include "usb.h" |
30 | #include "power-imx233.h" | 30 | #include "power-imx233.h" |
31 | #include "touchpad.h" | ||
31 | 32 | ||
32 | #ifndef BOOTLOADER | 33 | #ifndef BOOTLOADER |
33 | 34 | ||
@@ -274,7 +275,7 @@ static void do_interrupt(void) | |||
274 | imx233_pinctrl_setup_irq(0, 27, true, true, false, &rmi_attn_cb, 0); | 275 | imx233_pinctrl_setup_irq(0, 27, true, true, false, &rmi_attn_cb, 0); |
275 | } | 276 | } |
276 | 277 | ||
277 | void touchdev_enable(bool en) | 278 | void touchpad_enable_device(bool en) |
278 | { | 279 | { |
279 | t_enable = en; | 280 | t_enable = en; |
280 | queue_post(&rmi_queue, RMI_SET_SLEEP_MODE, en ? RMI_SLEEP_MODE_LOW_POWER : RMI_SLEEP_MODE_SENSOR_SLEEP); | 281 | queue_post(&rmi_queue, RMI_SET_SLEEP_MODE, en ? RMI_SLEEP_MODE_LOW_POWER : RMI_SLEEP_MODE_SENSOR_SLEEP); |
@@ -433,5 +434,5 @@ int button_read_device(void) | |||
433 | default: | 434 | default: |
434 | break; | 435 | break; |
435 | } | 436 | } |
436 | return res | touchpad_read_device(); | 437 | return res | touchpad_filter(touchpad_read_device()); |
437 | } | 438 | } |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h index 1c94b76cdc..ce5ffe464a 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h +++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | bool button_debug_screen(void); | 25 | bool button_debug_screen(void); |
26 | void touchpad_set_sensitivity(int level); | 26 | void touchpad_set_sensitivity(int level); |
27 | void touchdev_enable(bool en); | 27 | void touchpad_enable_device(bool en); |
28 | 28 | ||
29 | /* Main unit's buttons */ | 29 | /* Main unit's buttons */ |
30 | #define BUTTON_POWER 0x00000001 | 30 | #define BUTTON_POWER 0x00000001 |
@@ -47,6 +47,10 @@ void touchdev_enable(bool en); | |||
47 | BUTTON_PLAYPAUSE|BUTTON_BACK| \ | 47 | BUTTON_PLAYPAUSE|BUTTON_BACK| \ |
48 | BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT) | 48 | BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT) |
49 | 49 | ||
50 | #define BUTTON_TOUCHPAD (BUTTON_LEFT|BUTTON_UP|BUTTON_RIGHT|BUTTON_DOWN| \ | ||
51 | BUTTON_SELECT|BUTTON_PLAYPAUSE|BUTTON_BACK| \ | ||
52 | BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT) | ||
53 | |||
50 | /* Software power-off */ | 54 | /* Software power-off */ |
51 | #define POWEROFF_BUTTON BUTTON_POWER | 55 | #define POWEROFF_BUTTON BUTTON_POWER |
52 | #define POWEROFF_COUNT 10 | 56 | #define POWEROFF_COUNT 10 |