From df6eb82f5156256e1999374ce9b1a159610ff9a0 Mon Sep 17 00:00:00 2001 From: Jean-Louis Biasini Date: Mon, 2 Sep 2013 11:03:56 +0200 Subject: 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 Reviewed-by: Amaury Pouly --- firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | 7 ++++++- firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c | 5 +++-- firmware/target/arm/imx233/sansa-fuzeplus/button-target.h | 6 +++++- 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'firmware/target/arm') 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) bottomright.px_x = LCD_WIDTH; bottomright.px_y = LCD_HEIGHT; - + imx233_touchscreen_init(); imx233_touchscreen_enable(true); @@ -104,6 +104,11 @@ static int touch_to_pixels(int *val_x, int *val_y) return (x<<16)|y; } +void touchscreen_enable_device(bool en) +{ + imx233_touchscreen_enable(en); +} + static int touchscreen_read_device(int *data) { 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 @@ #include "string.h" #include "usb.h" #include "power-imx233.h" +#include "touchpad.h" #ifndef BOOTLOADER @@ -274,7 +275,7 @@ static void do_interrupt(void) imx233_pinctrl_setup_irq(0, 27, true, true, false, &rmi_attn_cb, 0); } -void touchdev_enable(bool en) +void touchpad_enable_device(bool en) { t_enable = en; 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) default: break; } - return res | touchpad_read_device(); + return res | touchpad_filter(touchpad_read_device()); } 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 @@ #include bool button_debug_screen(void); void touchpad_set_sensitivity(int level); -void touchdev_enable(bool en); +void touchpad_enable_device(bool en); /* Main unit's buttons */ #define BUTTON_POWER 0x00000001 @@ -47,6 +47,10 @@ void touchdev_enable(bool en); BUTTON_PLAYPAUSE|BUTTON_BACK| \ BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT) +#define BUTTON_TOUCHPAD (BUTTON_LEFT|BUTTON_UP|BUTTON_RIGHT|BUTTON_DOWN| \ + BUTTON_SELECT|BUTTON_PLAYPAUSE|BUTTON_BACK| \ + BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT) + /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 -- cgit v1.2.3