diff options
-rw-r--r-- | apps/plugins/cube.c | 2 | ||||
-rw-r--r-- | apps/plugins/doom/i_video.c | 11 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 24 | ||||
-rw-r--r-- | apps/plugins/logo.c | 7 |
4 files changed, 38 insertions, 6 deletions
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 686152c704..c38ec08994 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -246,7 +246,7 @@ PLUGIN_HEADER | |||
246 | #define CUBE_INC BUTTON_UP | 246 | #define CUBE_INC BUTTON_UP |
247 | #define CUBE_DEC BUTTON_DOWN | 247 | #define CUBE_DEC BUTTON_DOWN |
248 | #define CUBE_MODE BUTTON_MENU | 248 | #define CUBE_MODE BUTTON_MENU |
249 | #define CUBE_PAUSE BUTTON_SELECT | 249 | #define CUBE_PAUSE BUTTON_PLAY |
250 | #define CUBE_HIGHSPEED BUTTON_RIGHT | 250 | #define CUBE_HIGHSPEED BUTTON_RIGHT |
251 | 251 | ||
252 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 252 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 84b003be51..2e93c5460b 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -321,6 +321,17 @@ void I_ShutdownGraphics(void) | |||
321 | #define DOOMBUTTON_ENTER BUTTON_VIEW | 321 | #define DOOMBUTTON_ENTER BUTTON_VIEW |
322 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 322 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
323 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 323 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
324 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
325 | #define DOOMBUTTON_UP BUTTON_UP | ||
326 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
327 | #define DOOMBUTTON_LEFT BUTTON_PREV | ||
328 | #define DOOMBUTTON_RIGHT BUTTON_NEXT | ||
329 | #define DOOMBUTTON_SHOOT BUTTON_RIGHT | ||
330 | #define DOOMBUTTON_OPEN BUTTON_MENU | ||
331 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
332 | #define DOOMBUTTON_ENTER BUTTON_LEFT | ||
333 | #define DOOMBUTTON_WEAPON BUTOTN_VOL_DOWN | ||
334 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | ||
324 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 335 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
325 | #define DOOMBUTTON_ESC BUTTON_POWER | 336 | #define DOOMBUTTON_ESC BUTTON_POWER |
326 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP | 337 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 957870c0a5..b1787e01a0 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -107,7 +107,6 @@ const struct button_mapping generic_directions[] = | |||
107 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ | 107 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ |
108 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ | 108 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ |
109 | || (CONFIG_KEYPAD == MROBE100_PAD) \ | 109 | || (CONFIG_KEYPAD == MROBE100_PAD) \ |
110 | || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ | ||
111 | || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ | 110 | || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ |
112 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ | 111 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ |
113 | || (CONFIG_KEYPAD == CREATIVEZVM_PAD) \ | 112 | || (CONFIG_KEYPAD == CREATIVEZVM_PAD) \ |
@@ -171,6 +170,15 @@ const struct button_mapping generic_directions[] = | |||
171 | { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 170 | { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
172 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 171 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
173 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 172 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
173 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | ||
174 | { PLA_UP, BUTTON_UP, BUTTON_NONE}, | ||
175 | { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, | ||
176 | { PLA_LEFT, BUTTON_PREV, BUTTON_NONE}, | ||
177 | { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE}, | ||
178 | { PLA_UP_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE}, | ||
179 | { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
180 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE}, | ||
181 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, | ||
174 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ | 182 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ |
175 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */ | 183 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */ |
176 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 184 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) |
@@ -205,7 +213,6 @@ const struct button_mapping generic_left_right_fire[] = | |||
205 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | 213 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ |
206 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ | 214 | || (CONFIG_KEYPAD == GIGABEAT_S_PAD) \ |
207 | || (CONFIG_KEYPAD == MROBE100_PAD) \ | 215 | || (CONFIG_KEYPAD == MROBE100_PAD) \ |
208 | || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ | ||
209 | || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ | 216 | || (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \ |
210 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ | 217 | || (CONFIG_KEYPAD == SANSA_CLIP_PAD) \ |
211 | || (CONFIG_KEYPAD == SANSA_M200_PAD) | 218 | || (CONFIG_KEYPAD == SANSA_M200_PAD) |
@@ -303,6 +310,13 @@ const struct button_mapping generic_left_right_fire[] = | |||
303 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 310 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
304 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 311 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
305 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 312 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
313 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | ||
314 | { PLA_LEFT, BUTTON_PREV, BUTTON_NONE}, | ||
315 | { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE}, | ||
316 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE}, | ||
317 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE}, | ||
318 | { PLA_FIRE, BUTTON_PLAY, BUTTON_NONE}, | ||
319 | { PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | ||
306 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ | 320 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */ |
307 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */ | 321 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */ |
308 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) | 322 | #elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD) |
@@ -445,10 +459,10 @@ const struct button_mapping generic_actions[] = | |||
445 | {PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, | 459 | {PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE}, |
446 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 460 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
447 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 461 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
448 | {PLA_START, BUTTON_RIGHT, BUTTON_NONE}, | 462 | {PLA_START, BUTTON_RIGHT, BUTTON_NONE}, |
449 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 463 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
450 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 464 | {PLA_FIRE, BUTTON_PLAY, BUTTON_NONE}, |
451 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 465 | {PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
452 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) | 466 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) |
453 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 467 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
454 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 468 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 2f84dc621e..b80f67b271 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -167,6 +167,13 @@ const unsigned char rockbox16x7[] = { | |||
167 | #define LP_DEC_Y BUTTON_DOWN | 167 | #define LP_DEC_Y BUTTON_DOWN |
168 | #define LP_INC_Y BUTTON_UP | 168 | #define LP_INC_Y BUTTON_UP |
169 | 169 | ||
170 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | ||
171 | #define LP_QUIT BUTTON_POWER | ||
172 | #define LP_DEC_X BUTTON_PREV | ||
173 | #define LP_INC_X BUTTON_NEXT | ||
174 | #define LP_DEC_Y BUTTON_DOWN | ||
175 | #define LP_INC_Y BUTTON_UP | ||
176 | |||
170 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 177 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
171 | #define LP_QUIT BUTTON_POWER | 178 | #define LP_QUIT BUTTON_POWER |
172 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 179 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |