diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 4 | ||||
-rw-r--r-- | firmware/drivers/button.c | 12 | ||||
-rw-r--r-- | firmware/drivers/touchpad.c | 43 | ||||
-rw-r--r-- | firmware/drivers/touchscreen.c | 16 | ||||
-rw-r--r-- | firmware/export/button.h | 8 | ||||
-rw-r--r-- | firmware/export/touchpad.h | 28 | ||||
-rw-r--r-- | firmware/export/touchscreen.h | 3 | ||||
-rw-r--r-- | firmware/target/arm/imx233/creative-zenxfi2/button-zenxfi2.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/button-fuzeplus.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/button-target.h | 6 | ||||
-rw-r--r-- | firmware/target/hosted/android/button-android.c | 5 | ||||
-rw-r--r-- | firmware/target/hosted/sdl/button-sdl.c | 6 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c | 7 |
13 files changed, 145 insertions, 5 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index 5f1ae3d31c..0210abe2f7 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -1734,3 +1734,7 @@ thread.c | |||
1734 | #endif | 1734 | #endif |
1735 | 1735 | ||
1736 | #endif /* defined(SIMULATOR) */ | 1736 | #endif /* defined(SIMULATOR) */ |
1737 | |||
1738 | #if defined(HAVE_TOUCHPAD) | ||
1739 | drivers/touchpad.c | ||
1740 | #endif | ||
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) | ||
677 | void 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 | |||
27 | static bool touch_enabled = true; | ||
28 | |||
29 | void touchpad_enable(bool en) | ||
30 | { | ||
31 | if(en != touch_enabled) | ||
32 | { | ||
33 | touch_enabled = en; | ||
34 | touchpad_enable_device(en); | ||
35 | } | ||
36 | } | ||
37 | |||
38 | int 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 | ||
34 | static bool touch_enabled = true; | ||
34 | static enum touchscreen_mode current_mode = TOUCHSCREEN_POINT; | 35 | static enum touchscreen_mode current_mode = TOUCHSCREEN_POINT; |
35 | static const int touchscreen_buttons[3][3] = | 36 | static 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 */ |
122 | int touchscreen_to_pixels(int x, int y, int *data) | 123 | int 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 | ||
175 | void touchscreen_enable(bool en) | ||
176 | { | ||
177 | if(en != touch_enabled) | ||
178 | { | ||
179 | touch_enabled = en; | ||
180 | touchscreen_enable_device(en); | ||
181 | } | ||
182 | } | ||
183 | |||
184 | bool 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 */ |
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_ */ |
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 |
diff --git a/firmware/target/hosted/android/button-android.c b/firmware/target/hosted/android/button-android.c index ee8b32d704..b4f3d1bd90 100644 --- a/firmware/target/hosted/android/button-android.c +++ b/firmware/target/hosted/android/button-android.c | |||
@@ -129,6 +129,11 @@ void button_init_device(void) | |||
129 | set_rockbox_ready(); | 129 | set_rockbox_ready(); |
130 | } | 130 | } |
131 | 131 | ||
132 | void touchscreen_enable_device(bool en) | ||
133 | { | ||
134 | (void)en; /* FIXME: do something smart */ | ||
135 | } | ||
136 | |||
132 | int button_read_device(int *data) | 137 | int button_read_device(int *data) |
133 | { | 138 | { |
134 | int btn = last_btns; | 139 | int btn = last_btns; |
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index 4bd4b8de64..f69c0a509b 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c | |||
@@ -393,10 +393,14 @@ static void button_event(int key, bool pressed) | |||
393 | #endif | 393 | #endif |
394 | default: | 394 | default: |
395 | #ifdef HAVE_TOUCHSCREEN | 395 | #ifdef HAVE_TOUCHSCREEN |
396 | new_btn = key_to_touch(key, mouse_coords); | 396 | if(touchscreen_is_enabled()) |
397 | new_btn = key_to_touch(key, mouse_coords); | ||
397 | if (!new_btn) | 398 | if (!new_btn) |
398 | #endif | 399 | #endif |
399 | new_btn = key_to_button(key); | 400 | new_btn = key_to_button(key); |
401 | #ifdef HAVE_TOUCHPAD | ||
402 | new_btn = touchpad_filter(new_btn); | ||
403 | #endif | ||
400 | break; | 404 | break; |
401 | } | 405 | } |
402 | /* Call to make up for scrollwheel target implementation. This is | 406 | /* Call to make up for scrollwheel target implementation. This is |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c index e6f0cd9cc3..d06cb28f40 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/sadc-onda_vx747.c | |||
@@ -300,3 +300,10 @@ void adc_close(void) | |||
300 | sleep(20); | 300 | sleep(20); |
301 | __cpm_stop_sadc(); | 301 | __cpm_stop_sadc(); |
302 | } | 302 | } |
303 | |||
304 | #ifndef HAS_BUTTON_HOLD | ||
305 | void touchscreen_enable_device(bool en) | ||
306 | { | ||
307 | (void)en; /* FIXME: do something smart */ | ||
308 | } | ||
309 | #endif | ||