From 7a1bf015417250205c342d5d6e9f7cfa73265439 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 8 Oct 2020 18:27:03 -0400 Subject: 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 --- firmware/target/arm/rk27xx/ihifi2/button-target.h | 4 ++-- firmware/target/arm/s5l8700/meizu-m3/button-target.h | 4 ---- firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h | 7 ++----- firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h | 5 +++-- 4 files changed, 7 insertions(+), 13 deletions(-) (limited to 'firmware/target') 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 diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h index 04b46f85c7..cea469c541 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h @@ -32,11 +32,8 @@ #define BUTTON_REWIND 0x00000020 #define BUTTON_FAST_FWD 0x00000040 -/* Compatibility hacks for flipping. Needs a somewhat better fix. */ -#define BUTTON_LEFT 0 -#define BUTTON_RIGHT 0 -#define BUTTON_UP 0 -#define BUTTON_DOWN 0 +#define BUTTON_LEFT BUTTON_REWIND +#define BUTTON_RIGHT BUTTON_FAST_FWD #define BUTTON_MAIN (BUTTON_SELECT | BUTTON_VOL_UP | BUTTON_VOL_DOWN | BUTTON_MENU \ BUTTON_MENU | BUTTON_BACK | BUTTON_REWIND | BUTTON_FAST_FWD) diff --git a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h index 9e2800d57b..a471c419e6 100644 --- a/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h +++ b/firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h @@ -33,12 +33,13 @@ #define BUTTON_VOL_UP 0x00000040 #define BUTTON_VOL_DOWN 0x00000080 #define BUTTON_PWRALT 0x00000100 /* BUTTON_POWER combo with other buttons */ -#define BUTTON_LEFT 0 -#define BUTTON_RIGHT 0 #define BUTTON_MAIN (BUTTON_POWER | BUTTON_HOME | BUTTON_OPTION | BUTTON_PREV | \ BUTTON_NEXT | BUTTON_PLAY | BUTTON_VOL_UP | BUTTON_VOL_DOWN) +#define BUTTON_LEFT BUTTON_PREV +#define BUTTON_RIGHT BUTTON_NEXT + /* Software power-off */ #define POWEROFF_BUTTON BUTTON_POWER #define POWEROFF_COUNT 10 -- cgit v1.2.3