summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-11-02 07:09:46 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-11-02 07:09:46 +0000
commitd2066fe68b274b975a0e53e1e682a7f172d9107d (patch)
tree237cd8cf3881017e98d381dcf773d19c11da4dc2
parent13343c02caa4990dbac3243fe18d1908bdf766fc (diff)
set the iriver h100 and h300 keys correctly (fix red)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15406 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/doom/i_video.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 1b07a8f0d4..9d9e4bb111 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -214,16 +214,26 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN
#define DOOMBUTTON_MAP BUTTON_VOL_UP
#elif CONFIG_KEYPAD == MROBE500_PAD
-#define DOOMBUTTON_ESC BUTTON_POWER
+#define DOOMBUTTON_ESC BUTTON_POWER
#define DOOMBUTTON_UP BUTTON_RC_PLAY
#define DOOMBUTTON_DOWN BUTTON_RC_DOWN
#define DOOMBUTTON_LEFT BUTTON_RC_REW
#define DOOMBUTTON_RIGHT BUTTON_RC_FF
-#define DOOMBUTTON_OPEN BUTTON_RC_VOL_DOWN
-#define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP
-#define DOOMBUTTON_ENTER BUTTON_RC_MODE
-#define DOOMBUTTON_WEAPON BUTTON_RC_HEART
-
+#define DOOMBUTTON_OPEN BUTTON_RC_VOL_DOWN
+#define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP
+#define DOOMBUTTON_ENTER BUTTON_RC_MODE
+#define DOOMBUTTON_WEAPON BUTTON_RC_HEART
+#elif CONFIG_KEYPAD == IRIVER_H100_PAD || \
+ CONFIG_KEYPAD == IRIVER_H300_PAD
+#define DOOMBUTTON_UP BUTTON_UP
+#define DOOMBUTTON_DOWN BUTTON_DOWN
+#define DOOMBUTTON_LEFT BUTTON_LEFT
+#define DOOMBUTTON_RIGHT BUTTON_RIGHT
+#define DOOMBUTTON_SHOOT BUTTON_REC
+#define DOOMBUTTON_OPEN BUTTON_MODE
+#define DOOMBUTTON_ESC BUTTON_OFF
+#define DOOMBUTTON_ENTER BUTTON_SELECT
+#define DOOMBUTTON_WEAPON BUTTON_ON
#else
#error Keymap not defined!
#endif