diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/SOURCES | 5 | ||||
-rw-r--r-- | apps/plugins/alpine_cdc.c | 3 | ||||
-rw-r--r-- | apps/plugins/bounce.c | 3 | ||||
-rw-r--r-- | apps/plugins/calculator.c | 6 | ||||
-rw-r--r-- | apps/plugins/chip8.c | 7 | ||||
-rw-r--r-- | apps/plugins/cube.c | 11 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 8 | ||||
-rw-r--r-- | apps/plugins/grayscale.c | 2 | ||||
-rw-r--r-- | apps/plugins/jpeg.c | 14 | ||||
-rw-r--r-- | apps/plugins/mandelbrot.c | 20 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 9 | ||||
-rw-r--r-- | apps/plugins/mosaique.c | 4 | ||||
-rw-r--r-- | apps/plugins/oscillograph.c | 2 | ||||
-rw-r--r-- | apps/plugins/oscilloscope.c | 6 | ||||
-rw-r--r-- | apps/plugins/pong.c | 7 | ||||
-rw-r--r-- | apps/plugins/rockbox_flash.c | 4 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 4 | ||||
-rw-r--r-- | apps/plugins/snake.c | 6 | ||||
-rw-r--r-- | apps/plugins/snake2.c | 11 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 6 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 16 | ||||
-rw-r--r-- | apps/plugins/splitedit.c | 12 | ||||
-rw-r--r-- | apps/plugins/star.c | 8 | ||||
-rw-r--r-- | apps/plugins/stopwatch.c | 7 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 10 | ||||
-rw-r--r-- | apps/plugins/vu_meter.c | 4 |
26 files changed, 184 insertions, 11 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 1948cf663e..021f45674f 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -32,10 +32,15 @@ snake.c | |||
32 | snake2.c | 32 | snake2.c |
33 | snow.c | 33 | snow.c |
34 | sokoban.c | 34 | sokoban.c |
35 | #ifndef CONFIG_KEYPAD != IRIVER_H100_PAD | ||
36 | /* just because it isn't fixed yet to deal with this keymap */ | ||
35 | solitaire.c | 37 | solitaire.c |
38 | #endif | ||
36 | splitedit.c | 39 | splitedit.c |
37 | star.c | 40 | star.c |
41 | #if CONFIG_LCD == LCD_SSD1815 | ||
38 | video.c | 42 | video.c |
43 | #endif | ||
39 | vu_meter.c | 44 | vu_meter.c |
40 | 45 | ||
41 | #ifdef HAVE_RTC /* Recorder models only */ | 46 | #ifdef HAVE_RTC /* Recorder models only */ |
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c index dacc4a7dae..742e0bc6f5 100644 --- a/apps/plugins/alpine_cdc.c +++ b/apps/plugins/alpine_cdc.c | |||
@@ -30,6 +30,8 @@ | |||
30 | * | 30 | * |
31 | ****************************************************************************/ | 31 | ****************************************************************************/ |
32 | 32 | ||
33 | #include "plugin.h" | ||
34 | |||
33 | /* Only build for (correct) target */ | 35 | /* Only build for (correct) target */ |
34 | #if !defined(SIMULATOR) && CONFIG_CPU==SH7034 && !defined(HAVE_MMC) | 36 | #if !defined(SIMULATOR) && CONFIG_CPU==SH7034 && !defined(HAVE_MMC) |
35 | 37 | ||
@@ -43,7 +45,6 @@ | |||
43 | 45 | ||
44 | /****************** imports ******************/ | 46 | /****************** imports ******************/ |
45 | 47 | ||
46 | #include "plugin.h" | ||
47 | #include "sh7034.h" | 48 | #include "sh7034.h" |
48 | #include "system.h" | 49 | #include "system.h" |
49 | 50 | ||
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index ee89cd19e5..e7fc7dedd1 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -39,6 +39,9 @@ | |||
39 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) | 39 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) |
40 | #define BOUNCE_MODE (BUTTON_MENU | BUTTON_REL) | 40 | #define BOUNCE_MODE (BUTTON_MENU | BUTTON_REL) |
41 | 41 | ||
42 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
43 | #define BOUNCE_QUIT (BUTTON_OFF | BUTTON_REL) | ||
44 | #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) | ||
42 | #endif | 45 | #endif |
43 | 46 | ||
44 | static struct plugin_api* rb; | 47 | static struct plugin_api* rb; |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 193ac8a7ce..a8349f4c06 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -118,6 +118,12 @@ F3: equal to "=" | |||
118 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) | 118 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) |
119 | #define CALCULATOR_CALC (BUTTON_MENU | BUTTON_REPEAT) | 119 | #define CALCULATOR_CALC (BUTTON_MENU | BUTTON_REPEAT) |
120 | 120 | ||
121 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
122 | #define CALCULATOR_QUIT BUTTON_OFF | ||
123 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_SELECT | ||
124 | #define CALCULATOR_INPUT (BUTTON_ON | BUTTON_REL) | ||
125 | #define CALCULATOR_CALC (BUTTON_ON | BUTTON_REPEAT) | ||
126 | |||
121 | #endif | 127 | #endif |
122 | 128 | ||
123 | static struct plugin_api* rb; | 129 | static struct plugin_api* rb; |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index aa81b263dc..0830279671 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -42,6 +42,13 @@ | |||
42 | #define CHIP8_KEY6 BUTTON_RIGHT | 42 | #define CHIP8_KEY6 BUTTON_RIGHT |
43 | #define CHIP8_KEY8 BUTTON_DOWN | 43 | #define CHIP8_KEY8 BUTTON_DOWN |
44 | 44 | ||
45 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
46 | #define CHIP8_KEY2 BUTTON_UP | ||
47 | #define CHIP8_KEY4 BUTTON_LEFT | ||
48 | #define CHIP8_KEY5 BUTTON_SELECT | ||
49 | #define CHIP8_KEY6 BUTTON_RIGHT | ||
50 | #define CHIP8_KEY8 BUTTON_DOWN | ||
51 | |||
45 | #endif | 52 | #endif |
46 | 53 | ||
47 | static struct plugin_api* rb; /* here is a global api struct pointer */ | 54 | static struct plugin_api* rb; /* here is a global api struct pointer */ |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index b0c6daa656..e17dcb752a 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -46,6 +46,17 @@ | |||
46 | #define CUBE_HIGHSPEED_PRE BUTTON_MENU | 46 | #define CUBE_HIGHSPEED_PRE BUTTON_MENU |
47 | #define CUBE_HIGHSPEED (BUTTON_MENU | BUTTON_REL) | 47 | #define CUBE_HIGHSPEED (BUTTON_MENU | BUTTON_REL) |
48 | 48 | ||
49 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
50 | #define CUBE_QUIT (BUTTON_OFF | BUTTON_REL) | ||
51 | #define CUBE_X_INC BUTTON_RIGHT | ||
52 | #define CUBE_X_DEC BUTTON_LEFT | ||
53 | #define CUBE_Y_INC BUTTON_UP | ||
54 | #define CUBE_Y_DEC BUTTON_DOWN | ||
55 | #define CUBE_Z_INC (BUTTON_ON | BUTTON_UP) | ||
56 | #define CUBE_Z_DEC (BUTTON_ON | BUTTON_DOWN) | ||
57 | #define CUBE_HIGHSPEED_PRE BUTTON_SELECT | ||
58 | #define CUBE_HIGHSPEED (BUTTON_SELECT | BUTTON_REL) | ||
59 | |||
49 | #endif | 60 | #endif |
50 | 61 | ||
51 | struct point_3D { | 62 | struct point_3D { |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 02867d9d8b..bcd705c16c 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -35,6 +35,14 @@ | |||
35 | #define FLIPIT_TOGGLE_PRE BUTTON_MENU | 35 | #define FLIPIT_TOGGLE_PRE BUTTON_MENU |
36 | #define FLIPIT_TOGGLE (BUTTON_MENU | BUTTON_REL) | 36 | #define FLIPIT_TOGGLE (BUTTON_MENU | BUTTON_REL) |
37 | 37 | ||
38 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
39 | #define FLIPIT_QUIT BUTTON_OFF | ||
40 | #define FLIPIT_SHUFFLE BUTTON_SELECT | ||
41 | #define FLIPIT_SOLVE BUTTON_ON | ||
42 | #define FLIPIT_STEP_BY_STEP BUTTON_REC | ||
43 | #define FLIPIT_TOGGLE_PRE BUTTON_MODE | ||
44 | #define FLIPIT_TOGGLE (BUTTON_MODE | BUTTON_REL) | ||
45 | |||
38 | #endif | 46 | #endif |
39 | 47 | ||
40 | static struct plugin_api* rb; | 48 | static struct plugin_api* rb; |
diff --git a/apps/plugins/grayscale.c b/apps/plugins/grayscale.c index ebfc7f59c0..196545c0e7 100644 --- a/apps/plugins/grayscale.c +++ b/apps/plugins/grayscale.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #ifndef SIMULATOR /* not for simulator by now */ | 22 | #ifndef SIMULATOR /* not for simulator by now */ |
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | 24 | ||
25 | #ifdef HAVE_LCD_BITMAP /* and also not for the Player */ | 25 | #if CONFIG_LCD == LCD_SSD1815 /* only for Recorder/Ondio displays */ |
26 | #include "gray.h" | 26 | #include "gray.h" |
27 | 27 | ||
28 | /* variable button definitions */ | 28 | /* variable button definitions */ |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index d760812b86..f705271240 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -26,7 +26,15 @@ | |||
26 | #ifndef SIMULATOR /* not for simulator by now */ | 26 | #ifndef SIMULATOR /* not for simulator by now */ |
27 | #include "plugin.h" | 27 | #include "plugin.h" |
28 | 28 | ||
29 | #ifdef HAVE_LCD_BITMAP /* and also not for the Player */ | 29 | #if CONFIG_LCD == LCD_SSD1815 /* only for Recorder/Ondio displays */ |
30 | /* | ||
31 | FIX: | ||
32 | |||
33 | This would be a lot nicer if it depended on HAVE_LCD_BITMAP only, but we | ||
34 | need to fix the grayscale lib for Gmini and iRiver. Either with true | ||
35 | grayscale or 1bit. | ||
36 | |||
37 | */ | ||
30 | #include "gray.h" | 38 | #include "gray.h" |
31 | 39 | ||
32 | /* variable button definitions */ | 40 | /* variable button definitions */ |
@@ -39,6 +47,10 @@ | |||
39 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) | 47 | #define JPEG_ZOOM_IN (BUTTON_MENU | BUTTON_REL) |
40 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) | 48 | #define JPEG_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) |
41 | 49 | ||
50 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
51 | #define JPEG_ZOOM_IN BUTTON_ON | ||
52 | #define JPEG_ZOOM_OUT BUTTON_SELECT | ||
53 | |||
42 | #endif | 54 | #endif |
43 | 55 | ||
44 | /******************************* Globals ***********************************/ | 56 | /******************************* Globals ***********************************/ |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 2e9cb97eec..bb96b9b71c 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -20,8 +20,17 @@ | |||
20 | #ifndef SIMULATOR | 20 | #ifndef SIMULATOR |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | 22 | ||
23 | #ifdef HAVE_LCD_BITMAP // this is not fun on the player | 23 | #if CONFIG_LCD == LCD_SSD1815 /* only for Recorder/Ondio displays */ |
24 | # include "gray.h" | 24 | /* |
25 | FIX: | ||
26 | |||
27 | This would be a lot nicer if it depended on HAVE_LCD_BITMAP only, but we | ||
28 | need to fix the grayscale lib for Gmini and iRiver. Either with true | ||
29 | grayscale or 1bit. | ||
30 | |||
31 | */ | ||
32 | |||
33 | #include "gray.h" | ||
25 | 34 | ||
26 | /* variable button definitions */ | 35 | /* variable button definitions */ |
27 | #if CONFIG_KEYPAD == RECORDER_PAD | 36 | #if CONFIG_KEYPAD == RECORDER_PAD |
@@ -42,6 +51,13 @@ | |||
42 | #define MANDELBROT_MAXITER_DEC (BUTTON_MENU | BUTTON_LEFT) | 51 | #define MANDELBROT_MAXITER_DEC (BUTTON_MENU | BUTTON_LEFT) |
43 | #define MANDELBROT_RESET (BUTTON_MENU | BUTTON_OFF) | 52 | #define MANDELBROT_RESET (BUTTON_MENU | BUTTON_OFF) |
44 | 53 | ||
54 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
55 | #define MANDELBROT_QUIT BUTTON_OFF | ||
56 | #define MANDELBROT_ZOOM_IN BUTTON_ON | ||
57 | #define MANDELBROT_ZOOM_OUT BUTTON_SELECT | ||
58 | #define MANDELBROT_MAXITER_INC (BUTTON_MODE | BUTTON_RIGHT) | ||
59 | #define MANDELBROT_MAXITER_DEC (BUTTON_MODE | BUTTON_LEFT) | ||
60 | #define MANDELBROT_RESET (BUTTON_MODE | BUTTON_SELECT) | ||
45 | #endif | 61 | #endif |
46 | 62 | ||
47 | static struct plugin_api* rb; | 63 | static struct plugin_api* rb; |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index b6636bbfb7..fb997ac819 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -57,6 +57,15 @@ use F3 to see how many mines are left (supposing all your flags are correct) | |||
57 | #define MINESWP_DISCOVER (BUTTON_MENU | BUTTON_REPEAT) | 57 | #define MINESWP_DISCOVER (BUTTON_MENU | BUTTON_REPEAT) |
58 | #define MINESWP_INFO (BUTTON_MENU | BUTTON_OFF) | 58 | #define MINESWP_INFO (BUTTON_MENU | BUTTON_OFF) |
59 | 59 | ||
60 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
61 | #define MINESWP_QUIT BUTTON_OFF | ||
62 | #define MINESWP_START BUTTON_ON | ||
63 | #define MINESWP_TOGGLE_PRE BUTTON_MODE | ||
64 | |||
65 | #define MINESWP_TOGGLE (BUTTON_MODE | BUTTON_REL) | ||
66 | #define MINESWP_DISCOVER (BUTTON_MODE | BUTTON_REPEAT) | ||
67 | #define MINESWP_INFO (BUTTON_MODE | BUTTON_OFF) | ||
68 | |||
60 | #endif | 69 | #endif |
61 | 70 | ||
62 | 71 | ||
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 09c56c3bc3..619464d432 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -35,6 +35,10 @@ | |||
35 | #define MOSAIQUE_SPEED2 BUTTON_RIGHT | 35 | #define MOSAIQUE_SPEED2 BUTTON_RIGHT |
36 | #define MOSAIQUE_RESTART BUTTON_MENU | 36 | #define MOSAIQUE_RESTART BUTTON_MENU |
37 | 37 | ||
38 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
39 | #define MOSAIQUE_QUIT BUTTON_OFF | ||
40 | #define MOSAIQUE_SPEED BUTTON_MODE | ||
41 | #define MOSAIQUE_RESTART BUTTON_ON | ||
38 | #endif | 42 | #endif |
39 | 43 | ||
40 | enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | 44 | enum plugin_status plugin_start(struct plugin_api* api, void* parameter) |
diff --git a/apps/plugins/oscillograph.c b/apps/plugins/oscillograph.c index 5beeb8891b..50e18e5a9f 100644 --- a/apps/plugins/oscillograph.c +++ b/apps/plugins/oscillograph.c | |||
@@ -20,6 +20,7 @@ | |||
20 | 20 | ||
21 | #ifdef HAVE_LCD_BITMAP | 21 | #ifdef HAVE_LCD_BITMAP |
22 | #ifndef SIMULATOR /* don't want this code in the simulator */ | 22 | #ifndef SIMULATOR /* don't want this code in the simulator */ |
23 | #if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */ | ||
23 | 24 | ||
24 | /* The different drawing modes */ | 25 | /* The different drawing modes */ |
25 | #define DRAW_MODE_FILLED 0 | 26 | #define DRAW_MODE_FILLED 0 |
@@ -241,5 +242,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
241 | return PLUGIN_OK; | 242 | return PLUGIN_OK; |
242 | } | 243 | } |
243 | 244 | ||
245 | #endif /* if using MAS */ | ||
244 | #endif /* #ifndef SIMULATOR */ | 246 | #endif /* #ifndef SIMULATOR */ |
245 | #endif | 247 | #endif |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index cfb8330134..caa09a0ed4 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | 24 | ||
25 | #ifdef HAVE_LCD_BITMAP /* and also not for the Player */ | 25 | #ifdef HAVE_LCD_BITMAP /* and also not for the Player */ |
26 | #if CONFIG_HWCODEC != MASNONE /* only for MAS-targets */ | ||
26 | 27 | ||
27 | /* The different drawing modes */ | 28 | /* The different drawing modes */ |
28 | #define DRAW_MODE_FILLED 0 | 29 | #define DRAW_MODE_FILLED 0 |
@@ -269,5 +270,6 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
269 | cleanup(NULL); | 270 | cleanup(NULL); |
270 | return PLUGIN_OK; | 271 | return PLUGIN_OK; |
271 | } | 272 | } |
272 | #endif | 273 | #endif /* if using MAS */ |
273 | #endif | 274 | #endif /* if HAVE_LCD_BITMAP */ |
275 | #endif /* SIMULATOR */ | ||
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index c7547d6de4..d98becf06a 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -48,6 +48,13 @@ | |||
48 | #define PONG_RIGHT_UP BUTTON_UP | 48 | #define PONG_RIGHT_UP BUTTON_UP |
49 | #define PONG_RIGHT_DOWN BUTTON_DOWN | 49 | #define PONG_RIGHT_DOWN BUTTON_DOWN |
50 | 50 | ||
51 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
52 | #define PONG_QUIT BUTTON_OFF | ||
53 | #define PONG_LEFT_UP BUTTON_UP | ||
54 | #define PONG_LEFT_DOWN BUTTON_DOWN | ||
55 | #define PONG_RIGHT_UP BUTTON_ON | ||
56 | #define PONG_RIGHT_DOWN BUTTON_MODE | ||
57 | |||
51 | #endif | 58 | #endif |
52 | 59 | ||
53 | static struct plugin_api* rb; | 60 | static struct plugin_api* rb; |
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c index 7d0f630474..b1b5bc5233 100644 --- a/apps/plugins/rockbox_flash.c +++ b/apps/plugins/rockbox_flash.c | |||
@@ -21,7 +21,7 @@ | |||
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | 23 | ||
24 | #ifndef SIMULATOR /* Only build for target */ | 24 | #if !defined(SIMULATOR) && (CONFIG_CPU == SH7034) /* Only for SH targets */ |
25 | 25 | ||
26 | /* define DUMMY if you only want to "play" with the UI, does no harm */ | 26 | /* define DUMMY if you only want to "play" with the UI, does no harm */ |
27 | /* #define DUMMY */ | 27 | /* #define DUMMY */ |
@@ -1002,4 +1002,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | 1004 | ||
1005 | #endif /* #ifndef SIMULATOR */ | 1005 | #endif /* !SIMULATOR or a SH-target */ |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index aaaf0f78cb..d6cbe48525 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -31,6 +31,10 @@ | |||
31 | #define PUZZLE_SHUFFLE (BUTTON_MENU | BUTTON_REPEAT) | 31 | #define PUZZLE_SHUFFLE (BUTTON_MENU | BUTTON_REPEAT) |
32 | #define PUZZLE_PICTURE (BUTTON_MENU | BUTTON_REL) | 32 | #define PUZZLE_PICTURE (BUTTON_MENU | BUTTON_REL) |
33 | 33 | ||
34 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
35 | #define PUZZLE_QUIT BUTTON_OFF | ||
36 | #define PUZZLE_SHUFFLE BUTTON_SELECT | ||
37 | #define PUZZLE_PICTURE BUTTON_ON | ||
34 | #endif | 38 | #endif |
35 | 39 | ||
36 | static struct plugin_api* rb; | 40 | static struct plugin_api* rb; |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 3a672f9972..21761f1e3a 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -42,6 +42,12 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
42 | #define SNAKE_QUIT BUTTON_OFF | 42 | #define SNAKE_QUIT BUTTON_OFF |
43 | #define SNAKE_PLAYPAUSE BUTTON_MENU | 43 | #define SNAKE_PLAYPAUSE BUTTON_MENU |
44 | 44 | ||
45 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
46 | #define SNAKE_QUIT BUTTON_OFF | ||
47 | #define SNAKE_PLAYPAUSE BUTTON_ON | ||
48 | |||
49 | #else | ||
50 | #error "lacks keymapping" | ||
45 | #endif | 51 | #endif |
46 | 52 | ||
47 | static int board[28][16],snakelength; | 53 | static int board[28][16],snakelength; |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index b0b9e6424a..1e3859165c 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -52,6 +52,17 @@ Head and Tail are stored | |||
52 | #define SNAKE2_SELECT_TYPE BUTTON_RIGHT | 52 | #define SNAKE2_SELECT_TYPE BUTTON_RIGHT |
53 | #define SNAKE2_PLAYPAUSE BUTTON_MENU | 53 | #define SNAKE2_PLAYPAUSE BUTTON_MENU |
54 | 54 | ||
55 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
56 | #define SNAKE2_QUIT BUTTON_OFF | ||
57 | #define SNAKE2_LEVEL_UP BUTTON_UP | ||
58 | #define SNAKE2_LEVEL_UP2 BUTTON_RIGHT | ||
59 | #define SNAKE2_LEVEL_DOWN BUTTON_DOWN | ||
60 | #define SNAKE2_LEVEL_DOWN2 BUTTON_LEFT | ||
61 | #define SNAKE2_SELECT_MAZE BUTTON_REC | ||
62 | #define SNAKE2_SELECT_TYPE BUTTON_MODE | ||
63 | #define SNAKE2_PLAYPAUSE BUTTON_ON | ||
64 | #else | ||
65 | #error "lacks keymapping" | ||
55 | #endif | 66 | #endif |
56 | 67 | ||
57 | static int max_levels = 0; | 68 | static int max_levels = 0; |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 5b0eae1bc6..1011c85c80 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -49,6 +49,12 @@ | |||
49 | #define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT) | 49 | #define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_LEFT) |
50 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) | 50 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) |
51 | 51 | ||
52 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
53 | #define SOKOBAN_QUIT BUTTON_OFF | ||
54 | #define SOKOBAN_UNDO BUTTON_ON | ||
55 | #define SOKOBAN_LEVEL_UP BUTTON_MODE | ||
56 | #define SOKOBAN_LEVEL_DOWN BUTTON_REC | ||
57 | #define SOKOBAN_LEVEL_REPEAT BUTTON_SELECT | ||
52 | #endif | 58 | #endif |
53 | 59 | ||
54 | static void init_undo(void); | 60 | static void init_undo(void); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 9e8347fb79..37d9f1ee78 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -85,6 +85,22 @@ static struct plugin_api* rb; | |||
85 | #define SOL_MENU_RUN BUTTON_RIGHT | 85 | #define SOL_MENU_RUN BUTTON_RIGHT |
86 | #define SOL_MENU_INFO BUTTON_MENU | 86 | #define SOL_MENU_INFO BUTTON_MENU |
87 | 87 | ||
88 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
89 | #define SOL_QUIT BUTTON_OFF | ||
90 | #define SOL_UP BUTTON_UP | ||
91 | #define SOL_DOWN BUTTON_DOWN | ||
92 | #define SOL_LEFT BUTTON_LEFT | ||
93 | #define SOL_RIGHT BUTTON_RIGHT | ||
94 | #define SOL_MOVE BUTTON_ON | ||
95 | #define SOL_DRAW BUTTON_SELECT | ||
96 | #define SOL_REM2CUR BUTTON_PLAY | ||
97 | #define SOL_CUR2STACK BUTTON_F1 | ||
98 | #define SOL_REM2STACK BUTTON_F3 | ||
99 | #define SOL_MENU_RUN BUTTON_RIGHT | ||
100 | #define SOL_MENU_RUN2 BUTTON_ON | ||
101 | #define SOL_MENU_INFO BUTTON_SELECT | ||
102 | #define SOL_MENU_INFO2 BUTTON_REC | ||
103 | #define SOL_MENU_INFO3 BUTTON_MODE | ||
88 | #endif | 104 | #endif |
89 | 105 | ||
90 | /* common help definitions */ | 106 | /* common help definitions */ |
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c index 65d4c080b8..d3145b438a 100644 --- a/apps/plugins/splitedit.c +++ b/apps/plugins/splitedit.c | |||
@@ -43,6 +43,18 @@ | |||
43 | #define SPLITEDIT_SCALE (BUTTON_MENU | BUTTON_RIGHT) | 43 | #define SPLITEDIT_SCALE (BUTTON_MENU | BUTTON_RIGHT) |
44 | #define SPLITEDIT_MENU_RUN BUTTON_RIGHT | 44 | #define SPLITEDIT_MENU_RUN BUTTON_RIGHT |
45 | 45 | ||
46 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
47 | #define SPLITEDIT_QUIT BUTTON_OFF | ||
48 | #define SPLITEDIT_PLAY BUTTON_ON | ||
49 | #define SPLITEDIT_SAVE BUTTON_SELECT | ||
50 | #define SPLITEDIT_LOOP_MODE BUTTON_MODE | ||
51 | #define SPLITEDIT_SCALE (BUTTON_REC | BUTTON_UP) | ||
52 | #define SPLITEDIT_SPEED50 (BUTTON_REC | BUTTON_LEFT) | ||
53 | #define SPLITEDIT_SPEED100 (BUTTON_REC | BUTTON_DOWN) | ||
54 | #define SPLITEDIT_SPEED150 (BUTTON_REC | BUTTON_RIGHT) | ||
55 | #define SPLITEDIT_MENU_RUN BUTTON_RIGHT | ||
56 | |||
57 | |||
46 | #endif | 58 | #endif |
47 | 59 | ||
48 | #define BMPHEIGHT 7 | 60 | #define BMPHEIGHT 7 |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 1b9dca8f40..79f93ccba2 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -80,6 +80,14 @@ | |||
80 | #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) | 80 | #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_UP) |
81 | #define STAR_MENU_RUN BUTTON_RIGHT | 81 | #define STAR_MENU_RUN BUTTON_RIGHT |
82 | 82 | ||
83 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
84 | #define STAR_QUIT BUTTON_OFF | ||
85 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MODE | ||
86 | #define STAR_TOGGLE_CONTROL (BUTTON_MODE | BUTTON_REL) | ||
87 | #define STAR_LEVEL_UP (BUTTON_MODE | BUTTON_RIGHT) | ||
88 | #define STAR_LEVEL_DOWN (BUTTON_MODE | BUTTON_LEFT) | ||
89 | #define STAR_LEVEL_REPEAT (BUTTON_MODE | BUTTON_UP) | ||
90 | #define STAR_MENU_RUN BUTTON_RIGHT | ||
83 | #endif | 91 | #endif |
84 | 92 | ||
85 | /* function returns because of USB? */ | 93 | /* function returns because of USB? */ |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index 3843476f78..7f0bcd699c 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -53,6 +53,13 @@ | |||
53 | #define STOPWATCH_LAP_TIMER BUTTON_ON | 53 | #define STOPWATCH_LAP_TIMER BUTTON_ON |
54 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT | 54 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT |
55 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT | 55 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT |
56 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
57 | #define STOPWATCH_QUIT BUTTON_OFF | ||
58 | #define STOPWATCH_START_STOP BUTTON_SELECT | ||
59 | #define STOPWATCH_RESET_TIMER BUTTON_DOWN | ||
60 | #define STOPWATCH_LAP_TIMER BUTTON_ON | ||
61 | #define STOPWATCH_SCROLL_UP BUTTON_RIGHT | ||
62 | #define STOPWATCH_SCROLL_DOWN BUTTON_LEFT | ||
56 | #endif | 63 | #endif |
57 | 64 | ||
58 | static struct plugin_api* rb; | 65 | static struct plugin_api* rb; |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 281868bf65..f09e7c8682 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -98,6 +98,16 @@ | |||
98 | #define VIEWER_MODE_LINE (BUTTON_ON | BUTTON_MENU | BUTTON_RIGHT) | 98 | #define VIEWER_MODE_LINE (BUTTON_ON | BUTTON_MENU | BUTTON_RIGHT) |
99 | #define VIEWER_MODE_WIDTH (BUTTON_ON | BUTTON_RIGHT) | 99 | #define VIEWER_MODE_WIDTH (BUTTON_ON | BUTTON_RIGHT) |
100 | 100 | ||
101 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | ||
102 | #define VIEWER_QUIT BUTTON_OFF | ||
103 | #define VIEWER_PAGE_UP BUTTON_UP | ||
104 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | ||
105 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT | ||
106 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT | ||
107 | #define VIEWER_MODE_WRAP (BUTTON_ON | BUTTON_LEFT) | ||
108 | #define VIEWER_MODE_LINE (BUTTON_ON | BUTTON_DOWN) | ||
109 | #define VIEWER_MODE_WIDTH (BUTTON_ON | BUTTON_RIGHT) | ||
110 | |||
101 | #endif | 111 | #endif |
102 | 112 | ||
103 | enum { | 113 | enum { |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index ba218903e7..22fc5217d2 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -17,7 +17,7 @@ | |||
17 | **************************************************************************/ | 17 | **************************************************************************/ |
18 | #include "plugin.h" | 18 | #include "plugin.h" |
19 | 19 | ||
20 | #ifdef HAVE_LCD_BITMAP | 20 | #if defined(HAVE_LCD_BITMAP) && (CONFIG_HWCODEC != MASNONE) |
21 | 21 | ||
22 | /* variable button definitions */ | 22 | /* variable button definitions */ |
23 | #if CONFIG_KEYPAD == RECORDER_PAD | 23 | #if CONFIG_KEYPAD == RECORDER_PAD |
@@ -482,4 +482,4 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) { | |||
482 | lastbutton = button; | 482 | lastbutton = button; |
483 | } | 483 | } |
484 | } | 484 | } |
485 | #endif /* #ifdef HAVE_LCD_BITMAP */ | 485 | #endif /* #ifdef HAVE_LCD_BITMAP and HWCODEC */ |