diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-11 17:20:22 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-11 17:20:38 -0400 |
commit | a5add3982bff6907d30942f614d5a471f75c018b (patch) | |
tree | 75854e940ea097703e1bdc3524c1b5fddc27244a | |
parent | 2a471e288c16b91a7186a60b3fb84dd55a494c7a (diff) | |
download | rockbox-a5add3982bff6907d30942f614d5a471f75c018b.tar.gz rockbox-a5add3982bff6907d30942f614d5a471f75c018b.zip |
Fix red introduced from keymap typos
Change-Id: Ia2094eab6fe48b8fa1b313c7548e5e02d630327f
-rw-r--r-- | apps/plugins/battery_bench.c | 12 | ||||
-rw-r--r-- | apps/plugins/pegbox.c | 8 | ||||
-rw-r--r-- | apps/plugins/xobox.c | 8 |
3 files changed, 17 insertions, 11 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index bb431e3e04..a3fd7267f0 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -53,7 +53,8 @@ | |||
53 | #define BATTERY_ON_TXT "PLAY - start" | 53 | #define BATTERY_ON_TXT "PLAY - start" |
54 | #define BATTERY_OFF_TXT "MENU" | 54 | #define BATTERY_OFF_TXT "MENU" |
55 | 55 | ||
56 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 56 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD || \ |
57 | CONFIG_KEYPAD == AGPTEK_ROCKER_PAD | ||
57 | 58 | ||
58 | #define BATTERY_ON BUTTON_SELECT | 59 | #define BATTERY_ON BUTTON_SELECT |
59 | #define BATTERY_OFF BUTTON_POWER | 60 | #define BATTERY_OFF BUTTON_POWER |
@@ -85,7 +86,6 @@ | |||
85 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD || \ | 86 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD || \ |
86 | CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD || \ | 87 | CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD || \ |
87 | CONFIG_KEYPAD == SONY_NWZ_PAD || \ | 88 | CONFIG_KEYPAD == SONY_NWZ_PAD || \ |
88 | CONFIG_KEYPAD == AGPTEK_ROCKER_PAD || \ | ||
89 | CONFIG_KEYPAD == XDUOO_X3_PAD || \ | 89 | CONFIG_KEYPAD == XDUOO_X3_PAD || \ |
90 | CONFIG_KEYPAD == IHIFI_770_PAD || \ | 90 | CONFIG_KEYPAD == IHIFI_770_PAD || \ |
91 | CONFIG_KEYPAD == IHIFI_800_PAD || \ | 91 | CONFIG_KEYPAD == IHIFI_800_PAD || \ |
@@ -242,7 +242,11 @@ | |||
242 | #define BATTERY_OFF_TXT "Power" | 242 | #define BATTERY_OFF_TXT "Power" |
243 | #define BATTERY_ON_TXT "Menu - start" | 243 | #define BATTERY_ON_TXT "Menu - start" |
244 | 244 | ||
245 | #elif defined(HAVE_TOUCHSCREEN) | 245 | #else |
246 | #error "No keymap defined!" | ||
247 | #endif | ||
248 | |||
249 | #if defined(HAVE_TOUCHSCREEN) | ||
246 | 250 | ||
247 | #ifndef BATTERY_ON | 251 | #ifndef BATTERY_ON |
248 | #define BATTERY_ON BUTTON_CENTER | 252 | #define BATTERY_ON BUTTON_CENTER |
@@ -257,8 +261,6 @@ | |||
257 | #define BATTERY_OFF_TXT "TOPLEFT" | 261 | #define BATTERY_OFF_TXT "TOPLEFT" |
258 | #endif | 262 | #endif |
259 | 263 | ||
260 | #else | ||
261 | #error No keymap defined! | ||
262 | #endif | 264 | #endif |
263 | 265 | ||
264 | /****************************** Plugin Entry Point ****************************/ | 266 | /****************************** Plugin Entry Point ****************************/ |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index b700051081..a84b687763 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -711,7 +711,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
711 | #define LVL_UP_TEXT "VOL+" | 711 | #define LVL_UP_TEXT "VOL+" |
712 | #define LVL_DOWN_TEXT "VOL-" | 712 | #define LVL_DOWN_TEXT "VOL-" |
713 | 713 | ||
714 | #elif defined(HAVE_TOUCHSCREEN) | 714 | #else |
715 | #error "Unsupported keymap!" | ||
716 | #endif | ||
717 | |||
718 | #if defined(HAVE_TOUCHSCREEN) | ||
715 | #ifndef PEGBOX_QUIT | 719 | #ifndef PEGBOX_QUIT |
716 | #define PEGBOX_QUIT BUTTON_TOPLEFT | 720 | #define PEGBOX_QUIT BUTTON_TOPLEFT |
717 | #endif | 721 | #endif |
@@ -754,8 +758,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
754 | #ifndef LVL_DOWN_TEXT | 758 | #ifndef LVL_DOWN_TEXT |
755 | #define LVL_DOWN_TEXT "BOTTOMRIGHT" | 759 | #define LVL_DOWN_TEXT "BOTTOMRIGHT" |
756 | #endif | 760 | #endif |
757 | #else | ||
758 | #error Unsupported keymap! | ||
759 | #endif | 761 | #endif |
760 | 762 | ||
761 | /* get several sizes from the bitmaps */ | 763 | /* get several sizes from the bitmaps */ |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index f60938e900..55a1dc4bdb 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -351,7 +351,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
351 | #define DOWN BUTTON_NEXT | 351 | #define DOWN BUTTON_NEXT |
352 | #define PAUSE BUTTON_PLAY | 352 | #define PAUSE BUTTON_PLAY |
353 | 353 | ||
354 | #elif defined(HAVE_TOUCHSCREEN) | 354 | #else |
355 | #error "No keymap defined!" | ||
356 | #endif | ||
357 | |||
358 | #if defined(HAVE_TOUCHSCREEN) | ||
355 | #ifndef QUIT | 359 | #ifndef QUIT |
356 | #define QUIT BUTTON_TOPLEFT | 360 | #define QUIT BUTTON_TOPLEFT |
357 | #endif | 361 | #endif |
@@ -370,8 +374,6 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
370 | #ifndef PAUSE | 374 | #ifndef PAUSE |
371 | #define PAUSE BUTTON_CENTER | 375 | #define PAUSE BUTTON_CENTER |
372 | #endif | 376 | #endif |
373 | #else | ||
374 | #error No keymap defined! | ||
375 | #endif | 377 | #endif |
376 | 378 | ||
377 | #define MOVE_NO 0 /* player movement */ | 379 | #define MOVE_NO 0 /* player movement */ |