summaryrefslogtreecommitdiffstats
path: root/firmware/target
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-05 18:23:55 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-05 22:55:08 +0000
commit914114fd21a126be36435e7b0bc3a9f2685149c6 (patch)
tree07a0bebced0a6f8a6ffee2f948da66df31440aa9 /firmware/target
parentc6f66cf696a4a0802dad8128dd985c7ab6489602 (diff)
downloadrockbox-914114fd21a126be36435e7b0bc3a9f2685149c6.tar.gz
rockbox-914114fd21a126be36435e7b0bc3a9f2685149c6.tar.bz2
rockbox-914114fd21a126be36435e7b0bc3a9f2685149c6.zip
FS13241: Get rid of the hacky hold switch emulation on the X3ii & X20
It doesn't work properly and interferes with the power button in the keymap. Rework WPS keymap a bit to make single-tap power emulate lock. Change-Id: I9d9b9b4adcea3764e6e427f484e051c9bab9d13b
Diffstat (limited to 'firmware/target')
-rw-r--r--firmware/target/hosted/xduoo/button-target.h2
-rw-r--r--firmware/target/hosted/xduoo/button-xduoo.c34
2 files changed, 0 insertions, 36 deletions
diff --git a/firmware/target/hosted/xduoo/button-target.h b/firmware/target/hosted/xduoo/button-target.h
index 6cca5c22a0..ac77a7da7d 100644
--- a/firmware/target/hosted/xduoo/button-target.h
+++ b/firmware/target/hosted/xduoo/button-target.h
@@ -20,8 +20,6 @@
#ifndef _BUTTON_TARGET_H_
#define _BUTTON_TARGET_H_
-#define HAS_BUTTON_HOLD
-
/* Main unit's buttons */
#define BUTTON_POWER 0x00000001
#define BUTTON_HOME 0x00000002
diff --git a/firmware/target/hosted/xduoo/button-xduoo.c b/firmware/target/hosted/xduoo/button-xduoo.c
index 605cd18736..99b0908378 100644
--- a/firmware/target/hosted/xduoo/button-xduoo.c
+++ b/firmware/target/hosted/xduoo/button-xduoo.c
@@ -38,14 +38,6 @@
#include "backlight-target.h"
#include "xduoolinux_codec.h"
-static bool soft_hold = false;
-#ifndef BOOTLOADER
-static unsigned soft_hold_counter = 0;
-#define SOFT_HOLD_BUTTON BUTTON_POWER
-#define SOFT_HOLD_CNTMAX_1 (HZ)
-#define SOFT_HOLD_CNTMAX_2 (HZ*2)
-#endif
-
#define NR_POLL_DESC 3
static struct pollfd poll_fds[NR_POLL_DESC];
@@ -141,27 +133,6 @@ int button_read_device(void)
}
}
-#ifndef BOOTLOADER
- if (button_bitmap == SOFT_HOLD_BUTTON) {
- soft_hold_counter++;
- if (soft_hold_counter == SOFT_HOLD_CNTMAX_1) {
- soft_hold = !soft_hold;
- backlight_hold_changed(soft_hold);
- }
- else
- if (soft_hold_counter == SOFT_HOLD_CNTMAX_2) {
- soft_hold = false;
- backlight_hold_changed(soft_hold);
- }
- } else {
- soft_hold_counter = 0;
- }
-
- if((soft_hold) && (button_bitmap != SOFT_HOLD_BUTTON)) {
- return BUTTON_NONE;
- }
-#endif
-
return button_bitmap;
}
@@ -187,8 +158,3 @@ void button_close_device(void)
close(poll_fds[i].fd);
}
}
-
-bool button_hold(void)
-{
- return soft_hold;
-}