diff options
| author | Benjamin Brown <foolsh.person@gmail.com> | 2014-12-23 23:02:40 -0500 |
|---|---|---|
| committer | Marcin Bukat <marcin.bukat@gmail.com> | 2014-12-24 09:27:11 +0100 |
| commit | 7de7c22a6823ddb693c6269074bf1cf80e0c41d1 (patch) | |
| tree | 94ae3d41999e8bc19201cd96a550da7786b5190b /apps/plugins/xworld | |
| parent | 78cd5c1e24b9f001cde78143a17b40fd1bc3326a (diff) | |
| download | rockbox-7de7c22a6823ddb693c6269074bf1cf80e0c41d1.tar.gz rockbox-7de7c22a6823ddb693c6269074bf1cf80e0c41d1.zip | |
Xworld - Fixes warnings for cowond2, hifimanhm60x, ibassodx50, and
ondavx747. Also fixes errors for ondavx777.
Change-Id: I1a5daa844759316df4dec7b869425ea9a174814b
Reviewed-on: http://gerrit.rockbox.org/1081
Reviewed-by: Marcin Bukat <marcin.bukat@gmail.com>
Diffstat (limited to 'apps/plugins/xworld')
| -rw-r--r-- | apps/plugins/xworld/keymaps.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/apps/plugins/xworld/keymaps.h b/apps/plugins/xworld/keymaps.h index 7f6646d5f9..ef32e59974 100644 --- a/apps/plugins/xworld/keymaps.h +++ b/apps/plugins/xworld/keymaps.h @@ -45,15 +45,14 @@ (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) || \ (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ (CONFIG_KEYPAD == HM801_PAD) || \ - (CONFIG_KEYPAD == COWON_D2_PAD) || \ - (CONFIG_KEYPAD == HM60X_PAD) || \ - (CONFIG_KEYPAD == ONDAVX747_PAD) - + (CONFIG_KEYPAD == HM60X_PAD) #define BTN_UP BUTTON_UP #define BTN_DOWN BUTTON_DOWN #define BTN_LEFT BUTTON_LEFT #define BTN_RIGHT BUTTON_RIGHT +#elif (CONFIG_KEYPAD == ONDAVX747_PAD) + #if (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) #define BTN_UP_LEFT BUTTON_BACK #define BTN_UP_RIGHT BUTTON_PLAYPAUSE @@ -61,6 +60,11 @@ #define BTN_DOWN_RIGHT BUTTON_BOTTOMRIGHT #endif +#if (CONFIG_KEYPAD == HM60X_PAD) +#define BTN_FIRE BUTTON_POWER +#define BTN_PAUSE BUTTON_SELECT +#endif + #if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \ (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \ @@ -167,14 +171,6 @@ #define BTN_FIRE BUTTON_PLUS #define BTN_PAUSE BUTTON_MINUS -#elif (CONFIG_KEYPAD == HM60X_PAD) -#define BTN_FIRE BUTTON_POWER -#define BTN_PAUSE BUTTON_SELECT - -#elif (CONFIG_KEYPAD == DX50_PAD) -#define BTN_FIRE BUTTON_PLUS -#define BTN_PAUSE BUTTON_MENU - #else #error Unsupported keypad #endif @@ -185,11 +181,12 @@ #define BTN_LEFT BUTTON_LEFT #define BTN_RIGHT BUTTON_RIGHT -#if (CONFIG_KEYPAD == MROBE500_PAD) -#define BTN_PAUSE BUTTON_BOTTOMLEFT +#if (CONFIG_KEYPAD == MROBE500_PAD) || (CONFIG_KEYPAD == ONDAVX777_PAD) +#define BTN_PAUSE BUTTON_BOTTOMLEFT -#elif (CONFIG_KEYPAD != COWON_D2_PAD) || (CONFIG_KEYPAD != DX50_PAD) +#elif CONFIG_KEYPAD == !COWON_D2_PAD || !DX50_PAD || !ONDAVX777_PAD #define BTN_FIRE BUTTON_BOTTOMLEFT #define BTN_PAUSE BUTTON_TOPLEFT + #endif #endif |