diff options
Diffstat (limited to 'firmware/target')
6 files changed, 31 insertions, 5 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 |
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 | ||