summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobert Menes <rmenes@rockbox.org>2009-12-10 01:23:51 +0000
committerRobert Menes <rmenes@rockbox.org>2009-12-10 01:23:51 +0000
commitb4a40eb6f3e1e296271fa147cfef110c89f56a45 (patch)
tree598013e27d6af1f90c4d7c5d87f6fecfaf38486c /apps
parent4862e28b679a41e8a9c95d25f94083fe4408b96c (diff)
downloadrockbox-b4a40eb6f3e1e296271fa147cfef110c89f56a45.tar.gz
rockbox-b4a40eb6f3e1e296271fa147cfef110c89f56a45.zip
These are the last plugin keymaps needed for the GoGear SA9200.
Left to add in: a 128x160 backdrop for rockblox to stop errors when compiling and then to finally enable plugins. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23915 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/cube.c2
-rw-r--r--apps/plugins/doom/i_video.c11
-rw-r--r--apps/plugins/lib/pluginlib_actions.c24
-rw-r--r--apps/plugins/logo.c7
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
#define CUBE_INC BUTTON_UP
#define CUBE_DEC BUTTON_DOWN
#define CUBE_MODE BUTTON_MENU
-#define CUBE_PAUSE BUTTON_SELECT
+#define CUBE_PAUSE BUTTON_PLAY
#define CUBE_HIGHSPEED BUTTON_RIGHT
#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)
#define DOOMBUTTON_ENTER BUTTON_VIEW
#define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN
#define DOOMBUTTON_MAP BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#define DOOMBUTTON_UP BUTTON_UP
+#define DOOMBUTTON_DOWN BUTTON_DOWN
+#define DOOMBUTTON_LEFT BUTTON_PREV
+#define DOOMBUTTON_RIGHT BUTTON_NEXT
+#define DOOMBUTTON_SHOOT BUTTON_RIGHT
+#define DOOMBUTTON_OPEN BUTTON_MENU
+#define DOOMBUTTON_ESC BUTTON_POWER
+#define DOOMBUTTON_ENTER BUTTON_LEFT
+#define DOOMBUTTON_WEAPON BUTOTN_VOL_DOWN
+#define DOOMBUTTON_MAP BUTTON_VOL_UP
#elif CONFIG_KEYPAD == ONDAVX747_PAD
#define DOOMBUTTON_ESC BUTTON_POWER
#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[] =
|| (CONFIG_KEYPAD == SANSA_C200_PAD) \
|| (CONFIG_KEYPAD == GIGABEAT_S_PAD) \
|| (CONFIG_KEYPAD == MROBE100_PAD) \
- || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \
|| (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \
|| (CONFIG_KEYPAD == SANSA_CLIP_PAD) \
|| (CONFIG_KEYPAD == CREATIVEZVM_PAD) \
@@ -171,6 +170,15 @@ const struct button_mapping generic_directions[] =
{ PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
+#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)
+ { PLA_UP, BUTTON_UP, BUTTON_NONE},
+ { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE},
+ { PLA_LEFT, BUTTON_PREV, BUTTON_NONE},
+ { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE},
+ { PLA_UP_REPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */
#elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
@@ -205,7 +213,6 @@ const struct button_mapping generic_left_right_fire[] =
|| (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \
|| (CONFIG_KEYPAD == GIGABEAT_S_PAD) \
|| (CONFIG_KEYPAD == MROBE100_PAD) \
- || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \
|| (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) \
|| (CONFIG_KEYPAD == SANSA_CLIP_PAD) \
|| (CONFIG_KEYPAD == SANSA_M200_PAD)
@@ -303,6 +310,13 @@ const struct button_mapping generic_left_right_fire[] =
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
{ PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
+#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)
+ { PLA_LEFT, BUTTON_PREV, BUTTON_NONE},
+ { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE},
+ { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_FIRE, BUTTON_PLAY, BUTTON_NONE},
+ { PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == ONDAVX747_PAD) /* Touchscreen target */
#elif (CONFIG_KEYPAD == ONDAVX777_PAD) /* Touchscreen target */
#elif (CONFIG_KEYPAD == SAMSUNG_YH_PAD)
@@ -445,10 +459,10 @@ const struct button_mapping generic_actions[] =
{PLA_FIRE_REPEAT, BUTTON_RC_MODE|BUTTON_REPEAT, BUTTON_NONE},
#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
{PLA_QUIT, BUTTON_POWER, BUTTON_NONE},
- {PLA_START, BUTTON_RIGHT, BUTTON_NONE},
+ {PLA_START, BUTTON_RIGHT, BUTTON_NONE},
{PLA_MENU, BUTTON_MENU, BUTTON_NONE},
- {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
- {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
+ {PLA_FIRE, BUTTON_PLAY, BUTTON_NONE},
+ {PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
{PLA_QUIT, BUTTON_POWER, BUTTON_NONE},
{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[] = {
#define LP_DEC_Y BUTTON_DOWN
#define LP_INC_Y BUTTON_UP
+#elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
+#define LP_QUIT BUTTON_POWER
+#define LP_DEC_X BUTTON_PREV
+#define LP_INC_X BUTTON_NEXT
+#define LP_DEC_Y BUTTON_DOWN
+#define LP_INC_Y BUTTON_UP
+
#elif CONFIG_KEYPAD == ONDAVX747_PAD
#define LP_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == ONDAVX777_PAD