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/drivers/button.c | 12 ++++++++++++ firmware/drivers/touchpad.c | 43 ++++++++++++++++++++++++++++++++++++++++++ firmware/drivers/touchscreen.c | 16 ++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 firmware/drivers/touchpad.c (limited to 'firmware/drivers') 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) return delta; } #endif /* HAVE_WHEEL_ACCELERATION */ + +#if (defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN)) && !defined(HAS_BUTTON_HOLD) +void button_enable_touch(bool en) +{ +#ifdef HAVE_TOUCHPAD + touchpad_enable(en); +#endif +#ifdef HAVE_TOUCHSCREEN + touchscreen_enable(en); +#endif +} +#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 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2013 by Jean-Louis Biasini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include +#include "button.h" +#include "touchpad.h" +#include "button-target.h" + +static bool touch_enabled = true; + +void touchpad_enable(bool en) +{ + if(en != touch_enabled) + { + touch_enabled = en; + touchpad_enable_device(en); + } +} + +int touchpad_filter(int button) +{ + if(!touch_enabled) + button &= ~BUTTON_TOUCHPAD; + return button; +} 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 @@ #define BUTTON_MARGIN_X (int)(LCD_WIDTH * 0.03) #define BUTTON_MARGIN_Y (int)(LCD_HEIGHT * 0.03) +static bool touch_enabled = true; static enum touchscreen_mode current_mode = TOUCHSCREEN_POINT; static const int touchscreen_buttons[3][3] = { @@ -121,6 +122,8 @@ static void map_pixels(int *x, int *y) /* TODO: add jitter (and others) filter */ int touchscreen_to_pixels(int x, int y, int *data) { + if(!touch_enabled) + return 0; x &= 0xFFFF; y &= 0xFFFF; @@ -169,6 +172,19 @@ enum touchscreen_mode touchscreen_get_mode(void) return current_mode; } +void touchscreen_enable(bool en) +{ + if(en != touch_enabled) + { + touch_enabled = en; + touchscreen_enable_device(en); + } +} + +bool touchscreen_is_enabled(void) +{ + return touch_enabled; +} #if ((CONFIG_PLATFORM & PLATFORM_ANDROID) == 0) /* android has an API for this */ -- cgit v1.2.3