diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 18:27:03 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 20:30:08 -0400 |
commit | 7a1bf015417250205c342d5d6e9f7cfa73265439 (patch) | |
tree | 640d702bb66d190fb60a6e6df6b54d8806ae4835 /firmware/target/mips | |
parent | dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776 (diff) | |
download | rockbox-7a1bf015417250205c342d5d6e9f7cfa73265439.tar.gz 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/mips')
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h | 7 | ||||
-rw-r--r-- | firmware/target/mips/ingenic_jz47xx/xduoo_x3/button-target.h | 5 |
2 files changed, 5 insertions, 7 deletions
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 @@ | |||
32 | #define BUTTON_REWIND 0x00000020 | 32 | #define BUTTON_REWIND 0x00000020 |
33 | #define BUTTON_FAST_FWD 0x00000040 | 33 | #define BUTTON_FAST_FWD 0x00000040 |
34 | 34 | ||
35 | /* Compatibility hacks for flipping. Needs a somewhat better fix. */ | 35 | #define BUTTON_LEFT BUTTON_REWIND |
36 | #define BUTTON_LEFT 0 | 36 | #define BUTTON_RIGHT BUTTON_FAST_FWD |
37 | #define BUTTON_RIGHT 0 | ||
38 | #define BUTTON_UP 0 | ||
39 | #define BUTTON_DOWN 0 | ||
40 | 37 | ||
41 | #define BUTTON_MAIN (BUTTON_SELECT | BUTTON_VOL_UP | BUTTON_VOL_DOWN | BUTTON_MENU \ | 38 | #define BUTTON_MAIN (BUTTON_SELECT | BUTTON_VOL_UP | BUTTON_VOL_DOWN | BUTTON_MENU \ |
42 | BUTTON_MENU | BUTTON_BACK | BUTTON_REWIND | BUTTON_FAST_FWD) | 39 | 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 @@ | |||
33 | #define BUTTON_VOL_UP 0x00000040 | 33 | #define BUTTON_VOL_UP 0x00000040 |
34 | #define BUTTON_VOL_DOWN 0x00000080 | 34 | #define BUTTON_VOL_DOWN 0x00000080 |
35 | #define BUTTON_PWRALT 0x00000100 /* BUTTON_POWER combo with other buttons */ | 35 | #define BUTTON_PWRALT 0x00000100 /* BUTTON_POWER combo with other buttons */ |
36 | #define BUTTON_LEFT 0 | ||
37 | #define BUTTON_RIGHT 0 | ||
38 | 36 | ||
39 | #define BUTTON_MAIN (BUTTON_POWER | BUTTON_HOME | BUTTON_OPTION | BUTTON_PREV | \ | 37 | #define BUTTON_MAIN (BUTTON_POWER | BUTTON_HOME | BUTTON_OPTION | BUTTON_PREV | \ |
40 | BUTTON_NEXT | BUTTON_PLAY | BUTTON_VOL_UP | BUTTON_VOL_DOWN) | 38 | BUTTON_NEXT | BUTTON_PLAY | BUTTON_VOL_UP | BUTTON_VOL_DOWN) |
41 | 39 | ||
40 | #define BUTTON_LEFT BUTTON_PREV | ||
41 | #define BUTTON_RIGHT BUTTON_NEXT | ||
42 | |||
42 | /* Software power-off */ | 43 | /* Software power-off */ |
43 | #define POWEROFF_BUTTON BUTTON_POWER | 44 | #define POWEROFF_BUTTON BUTTON_POWER |
44 | #define POWEROFF_COUNT 10 | 45 | #define POWEROFF_COUNT 10 |