diff options
Diffstat (limited to 'apps/plugins/xworld/keymaps.h')
-rw-r--r-- | apps/plugins/xworld/keymaps.h | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/apps/plugins/xworld/keymaps.h b/apps/plugins/xworld/keymaps.h index 54021a8981..78d93604a8 100644 --- a/apps/plugins/xworld/keymaps.h +++ b/apps/plugins/xworld/keymaps.h | |||
@@ -21,8 +21,8 @@ | |||
21 | 21 | ||
22 | #ifndef _XWORLD_KEYMAPS_H | 22 | #ifndef _XWORLD_KEYMAPS_H |
23 | #define _XWORLD_KEYMAPS_H | 23 | #define _XWORLD_KEYMAPS_H |
24 | #endif | ||
25 | 24 | ||
25 | /* Handle the "nice" targets that have directional buttons with normal names */ | ||
26 | #if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ | 26 | #if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ |
27 | (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \ | 27 | (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \ |
28 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \ | 28 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \ |
@@ -63,15 +63,15 @@ | |||
63 | #define BTN_PAUSE BUTTON_SELECT | 63 | #define BTN_PAUSE BUTTON_SELECT |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ | 66 | #if (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ |
67 | (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \ | 67 | (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \ |
68 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \ | 68 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) || \ |
69 | (CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \ | 69 | (CONFIG_KEYPAD == CREATIVE_ZENXFI2_PAD) || \ |
70 | (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \ | 70 | (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD) || \ |
71 | (CONFIG_KEYPAD == SANSA_CONNECT_PAD) || \ | 71 | (CONFIG_KEYPAD == SANSA_CONNECT_PAD) || \ |
72 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ | 72 | (CONFIG_KEYPAD == SANSA_C200_PAD) || \ |
73 | (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || \ | 73 | (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) || \ |
74 | (CONFIG_KEYPAD == ONDAVX747_PAD) | 74 | (CONFIG_KEYPAD == ONDAVX747_PAD) |
75 | #define BTN_FIRE BUTTON_VOL_UP | 75 | #define BTN_FIRE BUTTON_VOL_UP |
76 | #define BTN_PAUSE BUTTON_VOL_DOWN | 76 | #define BTN_PAUSE BUTTON_VOL_DOWN |
77 | 77 | ||
@@ -124,8 +124,11 @@ | |||
124 | (CONFIG_KEYPAD == GIGABEAT_S_PAD) | 124 | (CONFIG_KEYPAD == GIGABEAT_S_PAD) |
125 | #define BTN_FIRE BUTTON_VOL_UP | 125 | #define BTN_FIRE BUTTON_VOL_UP |
126 | #define BTN_PAUSE BUTTON_MENU | 126 | #define BTN_PAUSE BUTTON_MENU |
127 | /* #if CONFIG_KEYPAD == PHILIPS_HDD1630_PAD */ | ||
127 | #endif | 128 | #endif |
128 | 129 | ||
130 | /* ... and now for the bad ones that don't have | ||
131 | * standard names for the directional buttons */ | ||
129 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) | 132 | #elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) |
130 | #define BTN_UP BUTTON_OK | 133 | #define BTN_UP BUTTON_OK |
131 | #define BTN_DOWN BUTTON_CANCEL | 134 | #define BTN_DOWN BUTTON_CANCEL |
@@ -185,12 +188,19 @@ | |||
185 | #define BTN_LEFT BUTTON_LEFT | 188 | #define BTN_LEFT BUTTON_LEFT |
186 | #define BTN_RIGHT BUTTON_RIGHT | 189 | #define BTN_RIGHT BUTTON_RIGHT |
187 | 190 | ||
188 | #if (CONFIG_KEYPAD == MROBE500_PAD) || (CONFIG_KEYPAD == ONDAVX777_PAD) | 191 | #if (CONFIG_KEYPAD == MROBE500_PAD) || \ |
192 | (CONFIG_KEYPAD == ONDAVX777_PAD) | ||
189 | #define BTN_PAUSE BUTTON_BOTTOMLEFT | 193 | #define BTN_PAUSE BUTTON_BOTTOMLEFT |
190 | 194 | ||
191 | #elif CONFIG_KEYPAD == !COWON_D2_PAD || !DX50_PAD || !ONDAVX777_PAD | 195 | #elif (CONFIG_KEYPAD == !COWON_D2_PAD) || \ |
196 | (CONFIG_KEYPAD != !DX50_PAD) || \ | ||
197 | (CONFIG_KEYMAP != ONDAVX777_PAD) | ||
192 | #define BTN_FIRE BUTTON_BOTTOMLEFT | 198 | #define BTN_FIRE BUTTON_BOTTOMLEFT |
193 | #define BTN_PAUSE BUTTON_TOPLEFT | 199 | #define BTN_PAUSE BUTTON_TOPLEFT |
200 | #endif | ||
194 | 201 | ||
202 | /* HAVE_TOUCHSCREEN */ | ||
195 | #endif | 203 | #endif |
204 | |||
205 | /* _XWORLD_KEYMAPS_H */ | ||
196 | #endif | 206 | #endif |