diff options
Diffstat (limited to 'firmware/target/arm/imx233/sansa-fuzeplus')
-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 |
2 files changed, 8 insertions, 3 deletions
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 |