diff options
author | Christian Gmeiner <christian.gmeiner@gmail.com> | 2006-03-28 17:20:49 +0000 |
---|---|---|
committer | Christian Gmeiner <christian.gmeiner@gmail.com> | 2006-03-28 17:20:49 +0000 |
commit | d1b587a6594f73cda78576f8fb6f80498c71b49a (patch) | |
tree | 792e3212d94cd70a2185d47bce0f84f640408cf5 | |
parent | 81a14b8837eba9b846ee9df47e497b07663dac3c (diff) | |
download | rockbox-d1b587a6594f73cda78576f8fb6f80498c71b49a.tar.gz rockbox-d1b587a6594f73cda78576f8fb6f80498c71b49a.zip |
added good (tm) button mappings for x5, and added ifdef for HAS_BUTTON_HOLD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9319 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/doom/i_video.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index b77205ff84..1bfbf93ce8 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -16,7 +16,10 @@ | |||
16 | * GNU General Public License for more details. | 16 | * GNU General Public License for more details. |
17 | * | 17 | * |
18 | * $Log$ | 18 | * $Log$ |
19 | * Revision 1.1 2006/03/28 15:44:01 dave | 19 | * Revision 1.2 2006/03/28 17:20:49 christian |
20 | * added good (tm) button mappings for x5, and added ifdef for HAS_BUTTON_HOLD | ||
21 | * | ||
22 | * Revision 1.1 2006-03-28 15:44:01 dave | ||
20 | * Patch #2969 - Doom! Currently only working on the H300. | 23 | * Patch #2969 - Doom! Currently only working on the H300. |
21 | * | 24 | * |
22 | * | 25 | * |
@@ -116,6 +119,16 @@ void I_GetEvent(void) | |||
116 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | 119 | #define DOOMBUTTON_SHOOT BUTTON_PLAY |
117 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 120 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
118 | #define DOOMBUTTON_OPEN BUTTON_MENU | 121 | #define DOOMBUTTON_OPEN BUTTON_MENU |
122 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | ||
123 | #define DOOMBUTTON_UP BUTTON_UP | ||
124 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
125 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
126 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
127 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | ||
128 | #define DOOMBUTTON_OPEN BUTTON_PLAY | ||
129 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
130 | #define DOOMBUTTON_ENTER BUTTON_SELECT | ||
131 | #define DOOMBUTTON_WEAPON BUTTON_REC | ||
119 | #else | 132 | #else |
120 | #define DOOMBUTTON_UP BUTTON_UP | 133 | #define DOOMBUTTON_UP BUTTON_UP |
121 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 134 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -135,7 +148,7 @@ int getkey(event_t * event) | |||
135 | 148 | ||
136 | static int released, pressed; | 149 | static int released, pressed; |
137 | 150 | ||
138 | #if CONFIG_KEYPAD == IRIVER_H300_PAD | 151 | #ifdef HAS_BUTTON_HOLD |
139 | static unsigned int holdbutton=0; | 152 | static unsigned int holdbutton=0; |
140 | static int hswitch=0; | 153 | static int hswitch=0; |
141 | if (rb->button_hold()&~holdbutton) | 154 | if (rb->button_hold()&~holdbutton) |