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>

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