diff options
author | Robert Menes <rmenes@rockbox.org> | 2010-11-03 02:45:53 +0000 |
---|---|---|
committer | Robert Menes <rmenes@rockbox.org> | 2010-11-03 02:45:53 +0000 |
commit | c638e96738d97f83c3967d72c1a03609ca2f7c5f (patch) | |
tree | 6ffadb68e4b0e341a2c54978c955df126d2a5479 /apps | |
parent | 63f68b482ac794e4ee177e30ec83eb7038e5fba5 (diff) | |
download | rockbox-c638e96738d97f83c3967d72c1a03609ca2f7c5f.tar.gz rockbox-c638e96738d97f83c3967d72c1a03609ca2f7c5f.zip |
These should be the last of the plugin keymaps required
for the GoGear HDD6330.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28467 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/doom/i_video.c | 11 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 12 | ||||
-rw-r--r-- | apps/plugins/goban/goban.h | 12 | ||||
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.h | 12 | ||||
-rw-r--r-- | apps/plugins/logo.c | 7 | ||||
-rw-r--r-- | apps/plugins/matrix.c | 3 | ||||
-rw-r--r-- | apps/plugins/midi/midiplay.c | 8 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 10 | ||||
-rw-r--r-- | apps/plugins/mosaique.c | 5 | ||||
-rw-r--r-- | apps/plugins/mp3_encoder.c | 6 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 10 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 9 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 9 | ||||
-rw-r--r-- | apps/plugins/rockpaint.c | 11 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 9 | ||||
-rw-r--r-- | apps/plugins/snow.c | 2 | ||||
-rw-r--r-- | apps/plugins/spacerocks.c | 9 | ||||
-rw-r--r-- | apps/plugins/stopwatch.c | 8 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.h | 10 | ||||
-rw-r--r-- | apps/plugins/text_viewer/tv_button.h | 16 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 11 | ||||
-rw-r--r-- | apps/plugins/zxbox/keymaps.h | 9 |
22 files changed, 195 insertions, 4 deletions
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 63b4b18919..92ff065535 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -331,6 +331,17 @@ void I_ShutdownGraphics(void) | |||
331 | #define DOOMBUTTON_ENTER BUTTON_VIEW | 331 | #define DOOMBUTTON_ENTER BUTTON_VIEW |
332 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 332 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
333 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 333 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
334 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
335 | #define DOOMBUTTON_UP BUTTON_UP | ||
336 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
337 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
338 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
339 | #define DOOMBUTTON_SHOOT BUTTON_NEXT | ||
340 | #define DOOMBUTTON_OPEN BUTTON_MENU | ||
341 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
342 | #define DOOMBUTTON_ENTER BUTTON_PLAY | ||
343 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | ||
344 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | ||
334 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 345 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
335 | #define DOOMBUTTON_UP BUTTON_UP | 346 | #define DOOMBUTTON_UP BUTTON_UP |
336 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 347 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 897f8bd061..0e1e626d3c 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -276,6 +276,18 @@ | |||
276 | #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST | 276 | #define FLIPIT_STEP_BY_STEP BUTTON_PLAYLIST |
277 | #define FLIPIT_TOGGLE BUTTON_SELECT | 277 | #define FLIPIT_TOGGLE BUTTON_SELECT |
278 | 278 | ||
279 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
280 | |||
281 | #define FLIPIT_LEFT BUTTON_LEFT | ||
282 | #define FLIPIT_RIGHT BUTTON_RIGHT | ||
283 | #define FLIPIT_UP BUTTON_UP | ||
284 | #define FLIPIT_DOWN BUTTON_DOWN | ||
285 | #define FLIPIT_QUIT BUTTON_POWER | ||
286 | #define FLIPIT_SHUFFLE BUTTON_MENU | ||
287 | #define FLIPIT_SOLVE BUTTON_VIEW | ||
288 | #define FLIPIT_STEP_BY_STEP BUTTON_NEXT | ||
289 | #define FLIPIT_TOGGLE BUTTON_PLAY | ||
290 | |||
279 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 291 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
280 | 292 | ||
281 | #define FLIPIT_LEFT BUTTON_PREV | 293 | #define FLIPIT_LEFT BUTTON_PREV |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index fab4f1d766..d014eb2329 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -163,6 +163,18 @@ | |||
163 | #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT | 163 | #define GBN_BUTTON_CONTEXT BUTTON_SELECT | BUTTON_REPEAT |
164 | #define GBN_BUTTON_NEXT_VAR BUTTON_VIEW | 164 | #define GBN_BUTTON_NEXT_VAR BUTTON_VIEW |
165 | 165 | ||
166 | #elif (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) | ||
167 | #define GBN_BUTTON_UP BUTTON_UP | ||
168 | #define GBN_BUTTON_DOWN BUTTON_DOWN | ||
169 | #define GBN_BUTTON_LEFT BUTTON_LEFT | ||
170 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT | ||
171 | #define GBN_BUTTON_RETREAT BUTTON_VOL_DOWN | ||
172 | #define GBN_BUTTON_ADVANCE BUTTON_VOL_UP | ||
173 | #define GBN_BUTTON_MENU BUTTON_MENU | ||
174 | #define GBN_BUTTON_PLAY BUTTON_PLAY | BUTTON_REL | ||
175 | #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT | ||
176 | #define GBN_BUTTON_NEXT_VAR BUTTON_NEXT | ||
177 | |||
166 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | 178 | #elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) |
167 | #define GBN_BUTTON_UP BUTTON_UP | 179 | #define GBN_BUTTON_UP BUTTON_UP |
168 | #define GBN_BUTTON_DOWN BUTTON_DOWN | 180 | #define GBN_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/imageviewer/imageviewer.h b/apps/plugins/imageviewer/imageviewer.h index 3e4e16a9aa..da2bbfe45c 100644 --- a/apps/plugins/imageviewer/imageviewer.h +++ b/apps/plugins/imageviewer/imageviewer.h | |||
@@ -276,6 +276,18 @@ | |||
276 | #define IMGVIEW_MENU BUTTON_MENU | 276 | #define IMGVIEW_MENU BUTTON_MENU |
277 | #define IMGVIEW_QUIT BUTTON_POWER | 277 | #define IMGVIEW_QUIT BUTTON_POWER |
278 | 278 | ||
279 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
280 | #define IMGVIEW_ZOOM_IN BUTTON_VOL_UP | ||
281 | #define IMGVIEW_ZOOM_OUT BUTTON_VOL_DOWN | ||
282 | #define IMGVIEW_UP BUTTON_UP | ||
283 | #define IMGVIEW_DOWN BUTTON_DOWN | ||
284 | #define IMGVIEW_LEFT BUTTON_LEFT | ||
285 | #define IMGVIEW_RIGHT BUTTON_RIGHT | ||
286 | #define IMGVIEW_NEXT BUTTON_NEXT | ||
287 | #define IMGVIEW_PREVIOUS BUTTON_PREV | ||
288 | #define IMGVIEW_MENU BUTTON_MENU | ||
289 | #define IMGVIEW_QUIT BUTTON_POWER | ||
290 | |||
279 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 291 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
280 | #define IMGVIEW_ZOOM_IN BUTTON_VOL_UP | 292 | #define IMGVIEW_ZOOM_IN BUTTON_VOL_UP |
281 | #define IMGVIEW_ZOOM_OUT BUTTON_VOL_DOWN | 293 | #define IMGVIEW_ZOOM_OUT BUTTON_VOL_DOWN |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index aedf66dbf3..0f255fcccb 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_HDD6330_PAD | ||
171 | #define LP_QUIT BUTTON_POWER | ||
172 | #define LP_DEC_X BUTTON_LEFT | ||
173 | #define LP_INC_X BUTTON_RIGHT | ||
174 | #define LP_DEC_Y BUTTON_DOWN | ||
175 | #define LP_INC_Y BUTTON_UP | ||
176 | |||
170 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 177 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
171 | #define LP_QUIT BUTTON_POWER | 178 | #define LP_QUIT BUTTON_POWER |
172 | #define LP_DEC_X BUTTON_PREV | 179 | #define LP_DEC_X BUTTON_PREV |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index d3429699af..4fcf16b288 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -133,7 +133,8 @@ | |||
133 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | 133 | #define MATRIX_SLEEP_LESS BUTTON_DOWN |
134 | #define MATRIX_PAUSE BUTTON_SELECT | 134 | #define MATRIX_PAUSE BUTTON_SELECT |
135 | 135 | ||
136 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 136 | #elif (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \ |
137 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | ||
137 | #define MATRIX_EXIT BUTTON_POWER | 138 | #define MATRIX_EXIT BUTTON_POWER |
138 | #define MATRIX_SLEEP_MORE BUTTON_UP | 139 | #define MATRIX_SLEEP_MORE BUTTON_UP |
139 | #define MATRIX_SLEEP_LESS BUTTON_DOWN | 140 | #define MATRIX_SLEEP_LESS BUTTON_DOWN |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 77743e44f4..d2b8cf818a 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -164,6 +164,14 @@ | |||
164 | #define BTN_DOWN BUTTON_DOWN | 164 | #define BTN_DOWN BUTTON_DOWN |
165 | #define BTN_PLAY BUTTON_MENU | 165 | #define BTN_PLAY BUTTON_MENU |
166 | 166 | ||
167 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
168 | #define BTN_QUIT BUTTON_POWER | ||
169 | #define BTN_RIGHT BUTTON_RIGHT | ||
170 | #define BTN_LEFT BUTTON_LEFT | ||
171 | #define BTN_UP BUTTON_UP | ||
172 | #define BTN_DOWN BUTTON_DOWN | ||
173 | #define BTN_PLAY BUTTON_MENU | ||
174 | |||
167 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 175 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
168 | #define BTN_QUIT BUTTON_POWER | 176 | #define BTN_QUIT BUTTON_POWER |
169 | #define BTN_RIGHT BUTTON_NEXT | 177 | #define BTN_RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 1153972ccb..bc9d102236 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -222,6 +222,16 @@ enum minesweeper_status { | |||
222 | # define MINESWP_DISCOVER BUTTON_SELECT | 222 | # define MINESWP_DISCOVER BUTTON_SELECT |
223 | # define MINESWP_INFO BUTTON_MENU | 223 | # define MINESWP_INFO BUTTON_MENU |
224 | 224 | ||
225 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
226 | # define MINESWP_LEFT BUTTON_LEFT | ||
227 | # define MINESWP_RIGHT BUTTON_RIGHT | ||
228 | # define MINESWP_UP BUTTON_UP | ||
229 | # define MINESWP_DOWN BUTTON_DOWN | ||
230 | # define MINESWP_QUIT BUTTON_POWER | ||
231 | # define MINESWP_TOGGLE BUTTON_NEXT | ||
232 | # define MINESWP_DISCOVER BUTTON_PLAY | ||
233 | # define MINESWP_INFO BUTTON_MENU | ||
234 | |||
225 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 235 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
226 | # define MINESWP_LEFT BUTTON_PREV | 236 | # define MINESWP_LEFT BUTTON_PREV |
227 | # define MINESWP_RIGHT BUTTON_NEXT | 237 | # define MINESWP_RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index ecdd09ac1d..eb6405b56c 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -148,6 +148,11 @@ | |||
148 | #define MOSAIQUE_SPEED BUTTON_VIEW | 148 | #define MOSAIQUE_SPEED BUTTON_VIEW |
149 | #define MOSAIQUE_RESTART BUTTON_MENU | 149 | #define MOSAIQUE_RESTART BUTTON_MENU |
150 | 150 | ||
151 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
152 | #define MOSAIQUE_QUIT BUTTON_POWER | ||
153 | #define MOSAIQUE_SPEED BUTTON_RIGHT | ||
154 | #define MOSAIQUE_RESTART BUTTON_MENU | ||
155 | |||
151 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 156 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
152 | #define MOSAIQUE_QUIT BUTTON_POWER | 157 | #define MOSAIQUE_QUIT BUTTON_POWER |
153 | #define MOSAIQUE_SPEED BUTTON_RIGHT | 158 | #define MOSAIQUE_SPEED BUTTON_RIGHT |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index caf63432f8..e39cfbb39b 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2439,6 +2439,12 @@ void get_mp3_filename(const char *wav_name) | |||
2439 | #define MP3ENC_DONE BUTTON_POWER | 2439 | #define MP3ENC_DONE BUTTON_POWER |
2440 | #define MP3ENC_SELECT BUTTON_SELECT | 2440 | #define MP3ENC_SELECT BUTTON_SELECT |
2441 | 2441 | ||
2442 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
2443 | #define MP3ENC_PREV BUTTON_UP | ||
2444 | #define MP3ENC_NEXT BUTTON_DOWN | ||
2445 | #define MP3ENC_DONE BUTTON_POWER | ||
2446 | #define MP3ENC_SELECT BUTTON_PLAY | ||
2447 | |||
2442 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 2448 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
2443 | #define MP3ENC_PREV BUTTON_UP | 2449 | #define MP3ENC_PREV BUTTON_UP |
2444 | #define MP3ENC_NEXT BUTTON_DOWN | 2450 | #define MP3ENC_NEXT BUTTON_DOWN |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 53cbab32c6..2a5c4be617 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -170,6 +170,16 @@ struct mpeg_settings settings; | |||
170 | #define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN | 170 | #define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN |
171 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 171 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
172 | 172 | ||
173 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
174 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | ||
175 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | ||
176 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | ||
177 | #define MPEG_START_TIME_UP BUTTON_UP | ||
178 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | ||
179 | #define MPEG_START_TIME_LEFT2 BUTTON_VOL_UP | ||
180 | #define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN | ||
181 | #define MPEG_START_TIME_EXIT BUTTON_POWER | ||
182 | |||
173 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 183 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
174 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 184 | #define MPEG_START_TIME_SELECT BUTTON_PLAY |
175 | #define MPEG_START_TIME_LEFT BUTTON_PREV | 185 | #define MPEG_START_TIME_LEFT BUTTON_PREV |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 512cc70cee..513c2f0863 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -282,6 +282,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
282 | #define MPEG_RW BUTTON_LEFT | 282 | #define MPEG_RW BUTTON_LEFT |
283 | #define MPEG_FF BUTTON_RIGHT | 283 | #define MPEG_FF BUTTON_RIGHT |
284 | 284 | ||
285 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
286 | #define MPEG_MENU BUTTON_MENU | ||
287 | #define MPEG_STOP BUTTON_POWER | ||
288 | #define MPEG_PAUSE BUTTON_PLAY | ||
289 | #define MPEG_VOLDOWN BUTTON_VOL_DOWN | ||
290 | #define MPEG_VOLUP BUTTON_VOL_UP | ||
291 | #define MPEG_RW BUTTON_PREV | ||
292 | #define MPEG_FF BUTTON_NEXT | ||
293 | |||
285 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 294 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
286 | #define MPEG_MENU BUTTON_MENU | 295 | #define MPEG_MENU BUTTON_MENU |
287 | #define MPEG_STOP BUTTON_POWER | 296 | #define MPEG_STOP BUTTON_POWER |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index e7d56b5755..8685218cae 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -237,6 +237,15 @@ static void setoptions (void) | |||
237 | options.SELECT=BUTTON_SELECT; | 237 | options.SELECT=BUTTON_SELECT; |
238 | options.MENU=BUTTON_MENU; | 238 | options.MENU=BUTTON_MENU; |
239 | 239 | ||
240 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
241 | options.UP=BUTTON_UP; | ||
242 | options.DOWN=BUTTON_DOWN; | ||
243 | options.A=BUTTON_VOL_UP; | ||
244 | options.B=BUTTON_VOL_DOWN; | ||
245 | options.START=BUTTON_NEXT; | ||
246 | options.SELECT=BUTTON_PLAY; | ||
247 | options.MENU=BUTTON_MENU; | ||
248 | |||
240 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 249 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
241 | options.UP=BUTTON_UP; | 250 | options.UP=BUTTON_UP; |
242 | options.DOWN=BUTTON_DOWN; | 251 | options.DOWN=BUTTON_DOWN; |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 557c84d8ea..07351ffb44 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -155,6 +155,17 @@ | |||
155 | #define ROCKPAINT_LEFT BUTTON_LEFT | 155 | #define ROCKPAINT_LEFT BUTTON_LEFT |
156 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 156 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
157 | 157 | ||
158 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
159 | #define ROCKPAINT_QUIT BUTTON_POWER | ||
160 | #define ROCKPAINT_DRAW BUTTON_PLAY | ||
161 | #define ROCKPAINT_MENU BUTTON_MENU | ||
162 | #define ROCKPAINT_TOOLBAR BUTTON_PREV | ||
163 | #define ROCKPAINT_TOOLBAR2 BUTTON_NEXT | ||
164 | #define ROCKPAINT_UP BUTTON_UP | ||
165 | #define ROCKPAINT_DOWN BUTTON_DOWN | ||
166 | #define ROCKPAINT_LEFT BUTTON_LEFT | ||
167 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | ||
168 | |||
158 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 169 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
159 | #define ROCKPAINT_QUIT BUTTON_POWER | 170 | #define ROCKPAINT_QUIT BUTTON_POWER |
160 | #define ROCKPAINT_DRAW BUTTON_PLAY | 171 | #define ROCKPAINT_DRAW BUTTON_PLAY |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 0f51c4d849..f265dd2d6a 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -185,6 +185,15 @@ | |||
185 | #define PUZZLE_SHUFFLE BUTTON_VIEW | 185 | #define PUZZLE_SHUFFLE BUTTON_VIEW |
186 | #define PUZZLE_PICTURE BUTTON_MENU | 186 | #define PUZZLE_PICTURE BUTTON_MENU |
187 | 187 | ||
188 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
189 | #define PUZZLE_QUIT BUTTON_POWER | ||
190 | #define PUZZLE_LEFT BUTTON_LEFT | ||
191 | #define PUZZLE_RIGHT BUTTON_RIGHT | ||
192 | #define PUZZLE_UP BUTTON_UP | ||
193 | #define PUZZLE_DOWN BUTTON_DOWN | ||
194 | #define PUZZLE_SHUFFLE BUTTON_NEXT | ||
195 | #define PUZZLE_PICTURE BUTTON_MENU | ||
196 | |||
188 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 197 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
189 | #define PUZZLE_QUIT BUTTON_POWER | 198 | #define PUZZLE_QUIT BUTTON_POWER |
190 | #define PUZZLE_LEFT BUTTON_PREV | 199 | #define PUZZLE_LEFT BUTTON_PREV |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index c9abae4b97..ab27950750 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -56,7 +56,6 @@ | |||
56 | (CONFIG_KEYPAD == MROBE100_PAD) || \ | 56 | (CONFIG_KEYPAD == MROBE100_PAD) || \ |
57 | (CONFIG_KEYPAD == COWON_D2_PAD) || \ | 57 | (CONFIG_KEYPAD == COWON_D2_PAD) || \ |
58 | (CONFIG_KEYPAD == IAUDIO67_PAD) || \ | 58 | (CONFIG_KEYPAD == IAUDIO67_PAD) || \ |
59 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ | ||
60 | (CONFIG_KEYPAD == ONDAVX747_PAD) || \ | 59 | (CONFIG_KEYPAD == ONDAVX747_PAD) || \ |
61 | (CONFIG_KEYPAD == ONDAVX777_PAD) || \ | 60 | (CONFIG_KEYPAD == ONDAVX777_PAD) || \ |
62 | (CONFIG_KEYPAD == GIGABEAT_PAD) || \ | 61 | (CONFIG_KEYPAD == GIGABEAT_PAD) || \ |
@@ -71,6 +70,7 @@ | |||
71 | #define SNOW_QUIT BUTTON_BACK | 70 | #define SNOW_QUIT BUTTON_BACK |
72 | 71 | ||
73 | #elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ | 72 | #elif (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ |
73 | (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) || \ | ||
74 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) | 74 | (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) |
75 | #define SNOW_QUIT BUTTON_POWER | 75 | #define SNOW_QUIT BUTTON_POWER |
76 | 76 | ||
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 1fd407357e..d04205cb05 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -197,6 +197,15 @@ | |||
197 | #define AST_RIGHT BUTTON_RIGHT | 197 | #define AST_RIGHT BUTTON_RIGHT |
198 | #define AST_FIRE BUTTON_PLAYLIST | 198 | #define AST_FIRE BUTTON_PLAYLIST |
199 | 199 | ||
200 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
201 | #define AST_PAUSE BUTTON_PLAY | ||
202 | #define AST_QUIT BUTTON_POWER | ||
203 | #define AST_THRUST BUTTON_UP | ||
204 | #define AST_HYPERSPACE BUTTON_DOWN | ||
205 | #define AST_LEFT BUTTON_LEFT | ||
206 | #define AST_RIGHT BUTTON_RIGHT | ||
207 | #define AST_FIRE BUTTON_VOL_DOWN | ||
208 | |||
200 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 209 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
201 | #define AST_PAUSE BUTTON_RIGHT | 210 | #define AST_PAUSE BUTTON_RIGHT |
202 | #define AST_QUIT BUTTON_POWER | 211 | #define AST_QUIT BUTTON_POWER |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 1a2965fa89..475b4de5b9 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -194,6 +194,14 @@ | |||
194 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 194 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
195 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 195 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
196 | 196 | ||
197 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
198 | #define STOPWATCH_QUIT BUTTON_POWER | ||
199 | #define STOPWATCH_START_STOP BUTTON_PLAY | ||
200 | #define STOPWATCH_RESET_TIMER BUTTON_MENU | ||
201 | #define STOPWATCH_LAP_TIMER BUTTON_NEXT | ||
202 | #define STOPWATCH_SCROLL_UP BUTTON_UP | ||
203 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | ||
204 | |||
197 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 205 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
198 | #define STOPWATCH_QUIT BUTTON_POWER | 206 | #define STOPWATCH_QUIT BUTTON_POWER |
199 | #define STOPWATCH_START_STOP BUTTON_PLAY | 207 | #define STOPWATCH_START_STOP BUTTON_PLAY |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index c2ef1d6693..c7048d8f99 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -244,6 +244,16 @@ | |||
244 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 244 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
245 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW | 245 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_VIEW |
246 | 246 | ||
247 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
248 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
249 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
250 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
251 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
252 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
253 | #define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY | ||
254 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | ||
255 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_NEXT | ||
256 | |||
247 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 257 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
248 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 258 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
249 | #define SUDOKU_BUTTON_UP BUTTON_UP | 259 | #define SUDOKU_BUTTON_UP BUTTON_UP |
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index f0daa06d80..6157d5fe9e 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -139,7 +139,7 @@ | |||
139 | #define TV_AUTOSCROLL BUTTON_SELECT | 139 | #define TV_AUTOSCROLL BUTTON_SELECT |
140 | #define TV_BOOKMARK (BUTTON_LEFT|BUTTON_SELECT) | 140 | #define TV_BOOKMARK (BUTTON_LEFT|BUTTON_SELECT) |
141 | 141 | ||
142 | /* iAudio X5 keys */ | 142 | /* iAudio X5/M5 keys */ |
143 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 143 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
144 | #define TV_QUIT BUTTON_POWER | 144 | #define TV_QUIT BUTTON_POWER |
145 | #define TV_SCROLL_UP BUTTON_UP | 145 | #define TV_SCROLL_UP BUTTON_UP |
@@ -150,7 +150,7 @@ | |||
150 | #define TV_AUTOSCROLL BUTTON_PLAY | 150 | #define TV_AUTOSCROLL BUTTON_PLAY |
151 | #define TV_BOOKMARK BUTTON_REC | 151 | #define TV_BOOKMARK BUTTON_REC |
152 | 152 | ||
153 | /* GIGABEAT keys */ | 153 | /* Gigabeat F/X keys */ |
154 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 154 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
155 | #define TV_QUIT BUTTON_POWER | 155 | #define TV_QUIT BUTTON_POWER |
156 | #define TV_SCROLL_UP BUTTON_UP | 156 | #define TV_SCROLL_UP BUTTON_UP |
@@ -300,6 +300,7 @@ | |||
300 | #define TV_SCROLL_DOWN BUTTON_PLUS | 300 | #define TV_SCROLL_DOWN BUTTON_PLUS |
301 | #define TV_BOOKMARK (BUTTON_MENU|BUTTON_PLUS) | 301 | #define TV_BOOKMARK (BUTTON_MENU|BUTTON_PLUS) |
302 | 302 | ||
303 | /* Cowon iAudio 7 keys */ | ||
303 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 304 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
304 | #define TV_QUIT BUTTON_POWER | 305 | #define TV_QUIT BUTTON_POWER |
305 | #define TV_SCROLL_UP BUTTON_VOLUP | 306 | #define TV_SCROLL_UP BUTTON_VOLUP |
@@ -333,6 +334,17 @@ | |||
333 | #define TV_AUTOSCROLL BUTTON_VIEW | 334 | #define TV_AUTOSCROLL BUTTON_VIEW |
334 | #define TV_BOOKMARK BUTTON_SELECT | 335 | #define TV_BOOKMARK BUTTON_SELECT |
335 | 336 | ||
337 | /* Philips HDD6330 keys */ | ||
338 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
339 | #define TV_QUIT BUTTON_POWER | ||
340 | #define TV_SCROLL_UP BUTTON_UP | ||
341 | #define TV_SCROLL_DOWN BUTTON_DOWN | ||
342 | #define TV_SCREEN_LEFT BUTTON_LEFT | ||
343 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | ||
344 | #define TV_MENU BUTTON_MENU | ||
345 | #define TV_AUTOSCROLL BUTTON_NEXT | ||
346 | #define TV_BOOKMARK BUTTON_PLAY | ||
347 | |||
336 | /* Philips SA9200 keys */ | 348 | /* Philips SA9200 keys */ |
337 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 349 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
338 | #define TV_QUIT BUTTON_POWER | 350 | #define TV_QUIT BUTTON_POWER |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 4da4011181..08c88169be 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -236,6 +236,17 @@ | |||
236 | #define LABEL_MENU "MENU" | 236 | #define LABEL_MENU "MENU" |
237 | #define LABEL_VOLUME "UP/DOWN" | 237 | #define LABEL_VOLUME "UP/DOWN" |
238 | 238 | ||
239 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
240 | #define VUMETER_QUIT BUTTON_POWER | ||
241 | #define VUMETER_HELP BUTTON_NEXT | ||
242 | #define VUMETER_MENU BUTTON_MENU | ||
243 | #define VUMETER_UP BUTTON_UP | ||
244 | #define VUMETER_DOWN BUTTON_DOWN | ||
245 | #define LABEL_HELP "NEXT" | ||
246 | #define LABEL_QUIT "QUIT" | ||
247 | #define LABEL_MENU "MENU" | ||
248 | #define LABEL_VOLUME "UP/DOWN" | ||
249 | |||
239 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 250 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
240 | #define VUMETER_QUIT BUTTON_POWER | 251 | #define VUMETER_QUIT BUTTON_POWER |
241 | #define VUMETER_HELP BUTTON_RIGHT | 252 | #define VUMETER_HELP BUTTON_RIGHT |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 631350a9ae..f73ff16486 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -157,6 +157,15 @@ | |||
157 | #define ZX_SELECT BUTTON_SELECT | 157 | #define ZX_SELECT BUTTON_SELECT |
158 | #define ZX_MENU BUTTON_MENU | 158 | #define ZX_MENU BUTTON_MENU |
159 | 159 | ||
160 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | ||
161 | |||
162 | #define ZX_UP BUTTON_UP | ||
163 | #define ZX_DOWN BUTTON_DOWN | ||
164 | #define ZX_LEFT BUTTON_LEFT | ||
165 | #define ZX_RIGHT BUTTON_RIGHT | ||
166 | #define ZX_SELECT BUTTON_PLAY | ||
167 | #define ZX_MENU BUTTON_MENU | ||
168 | |||
160 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 169 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
161 | #define ZX_UP BUTTON_UP | 170 | #define ZX_UP BUTTON_UP |
162 | #define ZX_DOWN BUTTON_DOWN | 171 | #define ZX_DOWN BUTTON_DOWN |