summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-10-08 18:27:03 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-10-08 20:30:08 -0400
commit7a1bf015417250205c342d5d6e9f7cfa73265439 (patch)
tree640d702bb66d190fb60a6e6df6b54d8806ae4835 /firmware/target/arm
parentdc81f96fd1bf3ddfe4c9e750ff14a0238f85d776 (diff)
downloadrockbox-7a1bf015417250205c342d5d6e9f7cfa73265439.tar.gz
rockbox-7a1bf015417250205c342d5d6e9f7cfa73265439.tar.bz2
rockbox-7a1bf015417250205c342d5d6e9f7cfa73265439.zip
Undo the hacks that allowed targets without LEFT/RIGHT (UP/DN) to build.
Replaced them with warnings until they are fixed *PROPERLY* Change-Id: I4425200e60f8b5224262a54f105b974cec471d22
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/rk27xx/ihifi2/button-target.h4
-rw-r--r--firmware/target/arm/s5l8700/meizu-m3/button-target.h4
2 files changed, 2 insertions, 6 deletions
diff --git a/firmware/target/arm/rk27xx/ihifi2/button-target.h b/firmware/target/arm/rk27xx/ihifi2/button-target.h
index 211e20e1d6..d317e30972 100644
--- a/firmware/target/arm/rk27xx/ihifi2/button-target.h
+++ b/firmware/target/arm/rk27xx/ihifi2/button-target.h
@@ -32,8 +32,8 @@
#define BUTTON_VOL_UP 0x00000020
#define BUTTON_VOL_DOWN 0x00000040
-#define BUTTON_LEFT 0
-#define BUTTON_RIGHT 0
+#define BUTTON_LEFT BUTTON_PREV
+#define BUTTON_RIGHT BUTTON_NEXT
#define BUTTON_MAIN (BUTTON_POWER | BUTTON_HOME | BUTTON_PREV | BUTTON_NEXT | \
BUTTON_PLAY | BUTTON_VOL_UP | BUTTON_VOL_DOWN)
diff --git a/firmware/target/arm/s5l8700/meizu-m3/button-target.h b/firmware/target/arm/s5l8700/meizu-m3/button-target.h
index 93f102c410..c438628cc9 100644
--- a/firmware/target/arm/s5l8700/meizu-m3/button-target.h
+++ b/firmware/target/arm/s5l8700/meizu-m3/button-target.h
@@ -28,10 +28,6 @@
#define BUTTON_MENU 0x00000002
#define BUTTON_PLAY 0x00000004
-/* there are no LEFT/RIGHT buttons, but other parts of the code expect them */
-#define BUTTON_LEFT 0
-#define BUTTON_RIGHT 0
-
#define BUTTON_MAIN (BUTTON_PREVNEXT|BUTTON_MENU|BUTTON_PLAY)
#define POWEROFF_BUTTON BUTTON_PLAY