diff options
Diffstat (limited to 'apps/plugins')
33 files changed, 6 insertions, 340 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index c5d74bcf37..b0a1b6565b 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -78,14 +78,6 @@ | |||
78 | #define UP BUTTON_UP | 78 | #define UP BUTTON_UP |
79 | #define DOWN BUTTON_DOWN | 79 | #define DOWN BUTTON_DOWN |
80 | 80 | ||
81 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
82 | #define QUIT BUTTON_OFF | ||
83 | #define LEFT BUTTON_LEFT | ||
84 | #define RIGHT BUTTON_RIGHT | ||
85 | #define SELECT BUTTON_SELECT | ||
86 | #define UP BUTTON_UP | ||
87 | #define DOWN BUTTON_DOWN | ||
88 | |||
89 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 81 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
90 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 82 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
91 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 83 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
@@ -1494,8 +1486,7 @@ static int brickmania_help(void) | |||
1494 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 1486 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
1495 | (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ | 1487 | (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ |
1496 | (CONFIG_KEYPAD == ONDIO_PAD) || \ | 1488 | (CONFIG_KEYPAD == ONDIO_PAD) || \ |
1497 | (CONFIG_KEYPAD == RECORDER_PAD) || \ | 1489 | (CONFIG_KEYPAD == RECORDER_PAD) |
1498 | (CONFIG_KEYPAD == ARCHOS_AV300_PAD) | ||
1499 | "STOP:", | 1490 | "STOP:", |
1500 | #else | 1491 | #else |
1501 | "POWER:", | 1492 | "POWER:", |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index be5087967c..d3cf57536d 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -121,17 +121,6 @@ F3: equal to "=" | |||
121 | #define CALCULATOR_OPERATORS BUTTON_F2 | 121 | #define CALCULATOR_OPERATORS BUTTON_F2 |
122 | #define CALCULATOR_CLEAR BUTTON_F1 | 122 | #define CALCULATOR_CLEAR BUTTON_F1 |
123 | 123 | ||
124 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
125 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
126 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
127 | #define CALCULATOR_UP BUTTON_UP | ||
128 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
129 | #define CALCULATOR_QUIT BUTTON_OFF | ||
130 | #define CALCULATOR_INPUT BUTTON_SELECT | ||
131 | #define CALCULATOR_CALC BUTTON_F3 | ||
132 | #define CALCULATOR_OPERATORS BUTTON_F2 | ||
133 | #define CALCULATOR_CLEAR BUTTON_F1 | ||
134 | |||
135 | #elif CONFIG_KEYPAD == ONDIO_PAD | 124 | #elif CONFIG_KEYPAD == ONDIO_PAD |
136 | #define CALCULATOR_LEFT BUTTON_LEFT | 125 | #define CALCULATOR_LEFT BUTTON_LEFT |
137 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 126 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index af550685cc..4d89530ca9 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -37,16 +37,6 @@ | |||
37 | #define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN) | 37 | #define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN) |
38 | #define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP) | 38 | #define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP) |
39 | 39 | ||
40 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
41 | #define CALENDAR_QUIT BUTTON_OFF | ||
42 | #define CALENDAR_SELECT BUTTON_SELECT | ||
43 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | ||
44 | #define CALENDAR_PREV_WEEK BUTTON_UP | ||
45 | #define CALENDAR_NEXT_DAY BUTTON_RIGHT | ||
46 | #define CALENDAR_PREV_DAY BUTTON_LEFT | ||
47 | #define CALENDAR_NEXT_MONTH (BUTTON_ON|BUTTON_DOWN) | ||
48 | #define CALENDAR_PREV_MONTH (BUTTON_ON|BUTTON_UP) | ||
49 | |||
50 | #elif CONFIG_KEYPAD == ONDIO_PAD | 40 | #elif CONFIG_KEYPAD == ONDIO_PAD |
51 | #define CALENDAR_QUIT BUTTON_OFF | 41 | #define CALENDAR_QUIT BUTTON_OFF |
52 | #define CALENDAR_SELECT (BUTTON_MENU|BUTTON_REL) | 42 | #define CALENDAR_SELECT (BUTTON_MENU|BUTTON_REL) |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 9d37953c6f..9c7693305c 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -99,21 +99,6 @@ | |||
99 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | 99 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) |
100 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | 100 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) |
101 | 101 | ||
102 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
103 | #define CB_SELECT BUTTON_SELECT | ||
104 | #define CB_UP BUTTON_UP | ||
105 | #define CB_DOWN BUTTON_DOWN | ||
106 | #define CB_LEFT BUTTON_LEFT | ||
107 | #define CB_RIGHT BUTTON_RIGHT | ||
108 | #define CB_PLAY BUTTON_ON | ||
109 | #define CB_LEVEL BUTTON_F1 | ||
110 | #define CB_RESTART BUTTON_F3 | ||
111 | #define CB_MENU BUTTON_OFF | ||
112 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_REPEAT) | ||
113 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_REPEAT) | ||
114 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_REPEAT) | ||
115 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_REPEAT) | ||
116 | |||
117 | #elif CONFIG_KEYPAD == ONDIO_PAD | 102 | #elif CONFIG_KEYPAD == ONDIO_PAD |
118 | #define CB_SELECT_PRE BUTTON_MENU | 103 | #define CB_SELECT_PRE BUTTON_MENU |
119 | #define CB_SELECT (BUTTON_MENU|BUTTON_REL) | 104 | #define CB_SELECT (BUTTON_MENU|BUTTON_REL) |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index d93777860b..ba8fea4935 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -35,17 +35,6 @@ | |||
35 | #define CHC_SETTINGS_OK2 BUTTON_LEFT | 35 | #define CHC_SETTINGS_OK2 BUTTON_LEFT |
36 | #define CHC_SETTINGS_CANCEL BUTTON_OFF | 36 | #define CHC_SETTINGS_CANCEL BUTTON_OFF |
37 | 37 | ||
38 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
39 | #define CHC_QUIT BUTTON_OFF | ||
40 | #define CHC_STARTSTOP BUTTON_SELECT | ||
41 | #define CHC_RESET BUTTON_LEFT | ||
42 | #define CHC_MENU BUTTON_F1 | ||
43 | #define CHC_SETTINGS_INC BUTTON_UP | ||
44 | #define CHC_SETTINGS_DEC BUTTON_DOWN | ||
45 | #define CHC_SETTINGS_OK BUTTON_SELECT | ||
46 | #define CHC_SETTINGS_OK2 BUTTON_LEFT | ||
47 | #define CHC_SETTINGS_CANCEL BUTTON_OFF | ||
48 | |||
49 | #elif CONFIG_KEYPAD == ONDIO_PAD | 38 | #elif CONFIG_KEYPAD == ONDIO_PAD |
50 | #define CHC_QUIT BUTTON_OFF | 39 | #define CHC_QUIT BUTTON_OFF |
51 | #define CHC_STARTSTOP BUTTON_RIGHT | 40 | #define CHC_STARTSTOP BUTTON_RIGHT |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 7c2be3f7e7..8645893820 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -956,18 +956,6 @@ STATIC void chip8 (void) | |||
956 | #define CHIP8_KEY8 BUTTON_DOWN | 956 | #define CHIP8_KEY8 BUTTON_DOWN |
957 | #define CHIP8_KEY9 BUTTON_ON | 957 | #define CHIP8_KEY9 BUTTON_ON |
958 | 958 | ||
959 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD /* only 9 out of 16 chip8 buttons */ | ||
960 | #define CHIP8_OFF BUTTON_OFF | ||
961 | #define CHIP8_KEY1 BUTTON_F1 | ||
962 | #define CHIP8_KEY2 BUTTON_UP | ||
963 | #define CHIP8_KEY3 BUTTON_F3 | ||
964 | #define CHIP8_KEY4 BUTTON_LEFT | ||
965 | #define CHIP8_KEY5 BUTTON_SELECT | ||
966 | #define CHIP8_KEY6 BUTTON_RIGHT | ||
967 | #define CHIP8_KEY7 BUTTON_F2 | ||
968 | #define CHIP8_KEY8 BUTTON_DOWN | ||
969 | #define CHIP8_KEY9 BUTTON_ON | ||
970 | |||
971 | #elif CONFIG_KEYPAD == ONDIO_PAD /* even more limited */ | 959 | #elif CONFIG_KEYPAD == ONDIO_PAD /* even more limited */ |
972 | #define CHIP8_OFF BUTTON_OFF | 960 | #define CHIP8_OFF BUTTON_OFF |
973 | #define CHIP8_KEY2 BUTTON_UP | 961 | #define CHIP8_KEY2 BUTTON_UP |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 78fd333773..0f51e44e5c 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -47,16 +47,6 @@ | |||
47 | #define CUBE_PAUSE BUTTON_PLAY | 47 | #define CUBE_PAUSE BUTTON_PLAY |
48 | #define CUBE_HIGHSPEED BUTTON_ON | 48 | #define CUBE_HIGHSPEED BUTTON_ON |
49 | 49 | ||
50 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
51 | #define CUBE_QUIT BUTTON_OFF | ||
52 | #define CUBE_NEXT BUTTON_RIGHT | ||
53 | #define CUBE_PREV BUTTON_LEFT | ||
54 | #define CUBE_INC BUTTON_UP | ||
55 | #define CUBE_DEC BUTTON_DOWN | ||
56 | #define CUBE_MODE BUTTON_F1 | ||
57 | #define CUBE_PAUSE BUTTON_SELECT | ||
58 | #define CUBE_HIGHSPEED BUTTON_ON | ||
59 | |||
60 | #elif CONFIG_KEYPAD == PLAYER_PAD | 50 | #elif CONFIG_KEYPAD == PLAYER_PAD |
61 | #define CUBE_QUIT BUTTON_STOP | 51 | #define CUBE_QUIT BUTTON_STOP |
62 | #define CUBE_INC BUTTON_RIGHT | 52 | #define CUBE_INC BUTTON_RIGHT |
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c index 0f4e33759d..1349b07012 100644 --- a/apps/plugins/fft/fft.c +++ b/apps/plugins/fft/fft.c | |||
@@ -38,16 +38,7 @@ | |||
38 | GREY_INFO_STRUCT | 38 | GREY_INFO_STRUCT |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #if CONFIG_KEYPAD == ARCHOS_AV300_PAD | 41 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
42 | # define FFT_PREV_GRAPH BUTTON_LEFT | ||
43 | # define FFT_NEXT_GRAPH BUTTON_RIGHT | ||
44 | # define FFT_ORIENTATION BUTTON_F3 | ||
45 | # define FFT_WINDOW BUTTON_F1 | ||
46 | # define FFT_AMP_SCALE BUTTON_UP | ||
47 | # define FFT_QUIT BUTTON_OFF | ||
48 | /* Need FFT_FREQ_SCALE key */ | ||
49 | |||
50 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | ||
51 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 42 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
52 | # define FFT_PREV_GRAPH BUTTON_LEFT | 43 | # define FFT_PREV_GRAPH BUTTON_LEFT |
53 | # define FFT_NEXT_GRAPH BUTTON_RIGHT | 44 | # define FFT_NEXT_GRAPH BUTTON_RIGHT |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 7d1257ef94..ed288d444d 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -34,17 +34,6 @@ | |||
34 | #define FLIPIT_STEP_BY_STEP BUTTON_F3 | 34 | #define FLIPIT_STEP_BY_STEP BUTTON_F3 |
35 | #define FLIPIT_TOGGLE BUTTON_PLAY | 35 | #define FLIPIT_TOGGLE BUTTON_PLAY |
36 | 36 | ||
37 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
38 | #define FLIPIT_LEFT BUTTON_LEFT | ||
39 | #define FLIPIT_RIGHT BUTTON_RIGHT | ||
40 | #define FLIPIT_UP BUTTON_UP | ||
41 | #define FLIPIT_DOWN BUTTON_DOWN | ||
42 | #define FLIPIT_QUIT BUTTON_OFF | ||
43 | #define FLIPIT_SHUFFLE BUTTON_F1 | ||
44 | #define FLIPIT_SOLVE BUTTON_F2 | ||
45 | #define FLIPIT_STEP_BY_STEP BUTTON_F3 | ||
46 | #define FLIPIT_TOGGLE BUTTON_SELECT | ||
47 | |||
48 | #elif CONFIG_KEYPAD == PLAYER_PAD | 37 | #elif CONFIG_KEYPAD == PLAYER_PAD |
49 | #define FLIPIT_LEFT BUTTON_LEFT | 38 | #define FLIPIT_LEFT BUTTON_LEFT |
50 | #define FLIPIT_RIGHT BUTTON_RIGHT | 39 | #define FLIPIT_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 679782d37a..c7a822c2c6 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -34,18 +34,6 @@ | |||
34 | #define FRACTAL_PRECISION_DEC BUTTON_F1 | 34 | #define FRACTAL_PRECISION_DEC BUTTON_F1 |
35 | #define FRACTAL_RESET BUTTON_F3 | 35 | #define FRACTAL_RESET BUTTON_F3 |
36 | 36 | ||
37 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
38 | #define FRACTAL_QUIT BUTTON_OFF | ||
39 | #define FRACTAL_UP BUTTON_UP | ||
40 | #define FRACTAL_DOWN BUTTON_DOWN | ||
41 | #define FRACTAL_LEFT BUTTON_LEFT | ||
42 | #define FRACTAL_RIGHT BUTTON_RIGHT | ||
43 | #define FRACTAL_ZOOM_IN BUTTON_SELECT | ||
44 | #define FRACTAL_ZOOM_OUT BUTTON_ON | ||
45 | #define FRACTAL_PRECISION_INC BUTTON_F2 | ||
46 | #define FRACTAL_PRECISION_DEC BUTTON_F1 | ||
47 | #define FRACTAL_RESET BUTTON_F3 | ||
48 | |||
49 | #elif CONFIG_KEYPAD == ONDIO_PAD | 37 | #elif CONFIG_KEYPAD == ONDIO_PAD |
50 | #define FRACTAL_QUIT BUTTON_OFF | 38 | #define FRACTAL_QUIT BUTTON_OFF |
51 | #define FRACTAL_UP BUTTON_UP | 39 | #define FRACTAL_UP BUTTON_UP |
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index e37febc76a..dfdd39ffa4 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -36,17 +36,6 @@ | |||
36 | #define IMGVIEW_PREVIOUS BUTTON_F2 | 36 | #define IMGVIEW_PREVIOUS BUTTON_F2 |
37 | #define IMGVIEW_MENU BUTTON_OFF | 37 | #define IMGVIEW_MENU BUTTON_OFF |
38 | 38 | ||
39 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
40 | #define IMGVIEW_ZOOM_IN BUTTON_SELECT | ||
41 | #define IMGVIEW_ZOOM_OUT BUTTON_ON | ||
42 | #define IMGVIEW_UP BUTTON_UP | ||
43 | #define IMGVIEW_DOWN BUTTON_DOWN | ||
44 | #define IMGVIEW_LEFT BUTTON_LEFT | ||
45 | #define IMGVIEW_RIGHT BUTTON_RIGHT | ||
46 | #define IMGVIEW_NEXT BUTTON_F3 | ||
47 | #define IMGVIEW_PREVIOUS BUTTON_F2 | ||
48 | #define IMGVIEW_MENU BUTTON_OFF | ||
49 | |||
50 | #elif CONFIG_KEYPAD == ONDIO_PAD | 39 | #elif CONFIG_KEYPAD == ONDIO_PAD |
51 | #define IMGVIEW_ZOOM_PRE BUTTON_MENU | 40 | #define IMGVIEW_ZOOM_PRE BUTTON_MENU |
52 | #define IMGVIEW_ZOOM_IN (BUTTON_MENU | BUTTON_REL) | 41 | #define IMGVIEW_ZOOM_IN (BUTTON_MENU | BUTTON_REL) |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 38121a480c..87a9d2fabf 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -38,16 +38,6 @@ | |||
38 | #define HK_SELECT "PLAY" | 38 | #define HK_SELECT "PLAY" |
39 | #define HK_CANCEL "OFF" | 39 | #define HK_CANCEL "OFF" |
40 | 40 | ||
41 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
42 | #define JEWELS_UP BUTTON_UP | ||
43 | #define JEWELS_DOWN BUTTON_DOWN | ||
44 | #define JEWELS_LEFT BUTTON_LEFT | ||
45 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
46 | #define JEWELS_SELECT BUTTON_SELECT | ||
47 | #define JEWELS_CANCEL BUTTON_OFF | ||
48 | #define HK_SELECT "SELECT" | ||
49 | #define HK_CANCEL "OFF" | ||
50 | |||
51 | #elif CONFIG_KEYPAD == ONDIO_PAD | 41 | #elif CONFIG_KEYPAD == ONDIO_PAD |
52 | #define JEWELS_UP BUTTON_UP | 42 | #define JEWELS_UP BUTTON_UP |
53 | #define JEWELS_DOWN BUTTON_DOWN | 43 | #define JEWELS_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 0834e020f4..e5b48c2f6a 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -102,7 +102,6 @@ const struct button_mapping pla_main_ctx[] = | |||
102 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ | 102 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
103 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ | 103 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ |
104 | || (CONFIG_KEYPAD == RECORDER_PAD) \ | 104 | || (CONFIG_KEYPAD == RECORDER_PAD) \ |
105 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ | ||
106 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ | 105 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) \ |
107 | || (CONFIG_KEYPAD == ONDIO_PAD) \ | 106 | || (CONFIG_KEYPAD == ONDIO_PAD) \ |
108 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ | 107 | || (CONFIG_KEYPAD == SANSA_C200_PAD) \ |
@@ -346,12 +345,6 @@ const struct button_mapping pla_main_ctx[] = | |||
346 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 345 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
347 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 346 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
348 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 347 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
349 | #elif (CONFIG_KEYPAD == ARCHOS_AV300_PAD) | ||
350 | {PLA_CANCEL, BUTTON_OFF|BUTTON_REL, BUTTON_OFF}, | ||
351 | {PLA_EXIT, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE}, | ||
352 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | ||
353 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | ||
354 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | ||
355 | #elif (CONFIG_KEYPAD == ONDIO_PAD) | 348 | #elif (CONFIG_KEYPAD == ONDIO_PAD) |
356 | {PLA_CANCEL, BUTTON_OFF|BUTTON_REL, BUTTON_OFF}, | 349 | {PLA_CANCEL, BUTTON_OFF|BUTTON_REL, BUTTON_OFF}, |
357 | {PLA_EXIT, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE}, | 350 | {PLA_EXIT, BUTTON_OFF|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 917f90dcd0..4e875979ab 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -46,18 +46,6 @@ enum minesweeper_status { | |||
46 | # define MINESWP_DISCOVER2 BUTTON_F2 | 46 | # define MINESWP_DISCOVER2 BUTTON_F2 |
47 | # define MINESWP_INFO BUTTON_F3 | 47 | # define MINESWP_INFO BUTTON_F3 |
48 | 48 | ||
49 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
50 | # define MINESWP_LEFT BUTTON_LEFT | ||
51 | # define MINESWP_RIGHT BUTTON_RIGHT | ||
52 | # define MINESWP_UP BUTTON_UP | ||
53 | # define MINESWP_DOWN BUTTON_DOWN | ||
54 | # define MINESWP_QUIT BUTTON_OFF | ||
55 | # define MINESWP_TOGGLE BUTTON_ON | ||
56 | # define MINESWP_TOGGLE2 BUTTON_F1 | ||
57 | # define MINESWP_DISCOVER BUTTON_SELECT | ||
58 | # define MINESWP_DISCOVER2 BUTTON_F2 | ||
59 | # define MINESWP_INFO BUTTON_F3 | ||
60 | |||
61 | #elif CONFIG_KEYPAD == ONDIO_PAD | 49 | #elif CONFIG_KEYPAD == ONDIO_PAD |
62 | # define MINESWP_LEFT BUTTON_LEFT | 50 | # define MINESWP_LEFT BUTTON_LEFT |
63 | # define MINESWP_RIGHT BUTTON_RIGHT | 51 | # define MINESWP_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 6702add139..97a8094e1f 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -41,17 +41,6 @@ | |||
41 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | 41 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP |
42 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | 42 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN |
43 | 43 | ||
44 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
45 | #define OSCILLOSCOPE_QUIT BUTTON_OFF | ||
46 | #define OSCILLOSCOPE_DRAWMODE BUTTON_F1 | ||
47 | #define OSCILLOSCOPE_ADVMODE BUTTON_F2 | ||
48 | #define OSCILLOSCOPE_ORIENTATION BUTTON_F3 | ||
49 | #define OSCILLOSCOPE_PAUSE BUTTON_SELECT | ||
50 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | ||
51 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | ||
52 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | ||
53 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | ||
54 | |||
55 | #elif CONFIG_KEYPAD == ONDIO_PAD | 44 | #elif CONFIG_KEYPAD == ONDIO_PAD |
56 | #define OSCILLOSCOPE_QUIT BUTTON_OFF | 45 | #define OSCILLOSCOPE_QUIT BUTTON_OFF |
57 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_MENU | 46 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_MENU |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index c9d425c549..0efba4f5cb 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -109,9 +109,7 @@ const struct button_mapping pf_context_buttons[] = | |||
109 | {PF_SELECT, BUTTON_CENTER, BUTTON_NONE}, | 109 | {PF_SELECT, BUTTON_CENTER, BUTTON_NONE}, |
110 | {PF_BACK, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, | 110 | {PF_BACK, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, |
111 | #endif | 111 | #endif |
112 | #if CONFIG_KEYPAD == ARCHOS_AV300_PAD | 112 | #if CONFIG_KEYPAD == SANSA_C100_PAD |
113 | {PF_QUIT, BUTTON_OFF, BUTTON_NONE}, | ||
114 | #elif CONFIG_KEYPAD == SANSA_C100_PAD | ||
115 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, | 113 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, |
116 | #elif CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \ | 114 | #elif CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \ |
117 | CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \ | 115 | CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \ |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 3656a35fd2..1fcd018de2 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -47,14 +47,6 @@ | |||
47 | #define PONG_RIGHT_UP BUTTON_F3 | 47 | #define PONG_RIGHT_UP BUTTON_F3 |
48 | #define PONG_RIGHT_DOWN BUTTON_RIGHT | 48 | #define PONG_RIGHT_DOWN BUTTON_RIGHT |
49 | 49 | ||
50 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
51 | #define PONG_QUIT BUTTON_OFF | ||
52 | #define PONG_PAUSE BUTTON_ON | ||
53 | #define PONG_LEFT_UP BUTTON_F1 | ||
54 | #define PONG_LEFT_DOWN BUTTON_LEFT | ||
55 | #define PONG_RIGHT_UP BUTTON_F3 | ||
56 | #define PONG_RIGHT_DOWN BUTTON_RIGHT | ||
57 | |||
58 | #elif CONFIG_KEYPAD == ONDIO_PAD | 50 | #elif CONFIG_KEYPAD == ONDIO_PAD |
59 | #define PONG_QUIT BUTTON_OFF | 51 | #define PONG_QUIT BUTTON_OFF |
60 | #define PONG_PAUSE BUTTON_RIGHT | 52 | #define PONG_PAUSE BUTTON_RIGHT |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index e2fedab200..93479c5c56 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -69,17 +69,6 @@ | |||
69 | #define ROCKBLOX_DROP BUTTON_ON | 69 | #define ROCKBLOX_DROP BUTTON_ON |
70 | #define ROCKBLOX_RESTART BUTTON_F1 | 70 | #define ROCKBLOX_RESTART BUTTON_F1 |
71 | 71 | ||
72 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
73 | |||
74 | #define ROCKBLOX_OFF BUTTON_OFF | ||
75 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP | ||
76 | #define ROCKBLOX_ROTATE_CW BUTTON_SELECT | ||
77 | #define ROCKBLOX_DOWN BUTTON_DOWN | ||
78 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
79 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
80 | #define ROCKBLOX_DROP BUTTON_ON | ||
81 | #define ROCKBLOX_RESTART BUTTON_F1 | ||
82 | |||
83 | #elif CONFIG_KEYPAD == PLAYER_PAD | 72 | #elif CONFIG_KEYPAD == PLAYER_PAD |
84 | 73 | ||
85 | #define ROCKBLOX_OFF_PRE BUTTON_STOP | 74 | #define ROCKBLOX_OFF_PRE BUTTON_STOP |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 9b863906ce..ad856b8ab2 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -30,15 +30,6 @@ | |||
30 | #define PUZZLE_SHUFFLE BUTTON_F1 | 30 | #define PUZZLE_SHUFFLE BUTTON_F1 |
31 | #define PUZZLE_PICTURE BUTTON_F2 | 31 | #define PUZZLE_PICTURE BUTTON_F2 |
32 | 32 | ||
33 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
34 | #define PUZZLE_QUIT BUTTON_OFF | ||
35 | #define PUZZLE_LEFT BUTTON_LEFT | ||
36 | #define PUZZLE_RIGHT BUTTON_RIGHT | ||
37 | #define PUZZLE_UP BUTTON_UP | ||
38 | #define PUZZLE_DOWN BUTTON_DOWN | ||
39 | #define PUZZLE_SHUFFLE BUTTON_F1 | ||
40 | #define PUZZLE_PICTURE BUTTON_F2 | ||
41 | |||
42 | #elif CONFIG_KEYPAD == ONDIO_PAD | 33 | #elif CONFIG_KEYPAD == ONDIO_PAD |
43 | #define PUZZLE_QUIT BUTTON_OFF | 34 | #define PUZZLE_QUIT BUTTON_OFF |
44 | #define PUZZLE_LEFT BUTTON_LEFT | 35 | #define PUZZLE_LEFT BUTTON_LEFT |
@@ -862,7 +853,7 @@ enum plugin_status plugin_start( | |||
862 | /* print instructions */ | 853 | /* print instructions */ |
863 | rb->lcd_clear_display(); | 854 | rb->lcd_clear_display(); |
864 | rb->lcd_setfont(FONT_SYSFIXED); | 855 | rb->lcd_setfont(FONT_SYSFIXED); |
865 | #if CONFIG_KEYPAD == RECORDER_PAD || CONFIG_KEYPAD == ARCHOS_AV300_PAD | 856 | #if CONFIG_KEYPAD == RECORDER_PAD |
866 | rb->lcd_putsxy(3, 18, "[OFF] to stop"); | 857 | rb->lcd_putsxy(3, 18, "[OFF] to stop"); |
867 | rb->lcd_putsxy(3, 28, "[F1] shuffle"); | 858 | rb->lcd_putsxy(3, 28, "[F1] shuffle"); |
868 | rb->lcd_putsxy(3, 38, "[F2] change pic"); | 859 | rb->lcd_putsxy(3, 38, "[F2] change pic"); |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index ae1e4350ad..c885f4ccae 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -49,14 +49,6 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
49 | #define SNAKE_DOWN BUTTON_DOWN | 49 | #define SNAKE_DOWN BUTTON_DOWN |
50 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | 50 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
51 | 51 | ||
52 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
53 | #define SNAKE_QUIT BUTTON_OFF | ||
54 | #define SNAKE_LEFT BUTTON_LEFT | ||
55 | #define SNAKE_RIGHT BUTTON_RIGHT | ||
56 | #define SNAKE_UP BUTTON_UP | ||
57 | #define SNAKE_DOWN BUTTON_DOWN | ||
58 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | ||
59 | |||
60 | #elif CONFIG_KEYPAD == ONDIO_PAD | 52 | #elif CONFIG_KEYPAD == ONDIO_PAD |
61 | #define SNAKE_QUIT BUTTON_OFF | 53 | #define SNAKE_QUIT BUTTON_OFF |
62 | #define SNAKE_LEFT BUTTON_LEFT | 54 | #define SNAKE_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index a9f0942806..dcb5b72633 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -159,15 +159,6 @@ Head and Tail are stored | |||
159 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY | 159 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY |
160 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 160 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
161 | 161 | ||
162 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
163 | #define SNAKE2_LEFT BUTTON_LEFT | ||
164 | #define SNAKE2_RIGHT BUTTON_RIGHT | ||
165 | #define SNAKE2_UP BUTTON_UP | ||
166 | #define SNAKE2_DOWN BUTTON_DOWN | ||
167 | #define SNAKE2_QUIT BUTTON_OFF | ||
168 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT | ||
169 | #define SNAKE2_PLAYPAUSE_TEXT "Select" | ||
170 | |||
171 | #elif CONFIG_KEYPAD == ONDIO_PAD | 162 | #elif CONFIG_KEYPAD == ONDIO_PAD |
172 | #define SNAKE2_LEFT BUTTON_LEFT | 163 | #define SNAKE2_LEFT BUTTON_LEFT |
173 | #define SNAKE2_RIGHT BUTTON_RIGHT | 164 | #define SNAKE2_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 450c881d1e..e4c34930b1 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -104,8 +104,7 @@ | |||
104 | #define SOKOBAN_MOVE_MIN SOKOBAN_MOVE_DOWN | 104 | #define SOKOBAN_MOVE_MIN SOKOBAN_MOVE_DOWN |
105 | 105 | ||
106 | /* variable button definitions */ | 106 | /* variable button definitions */ |
107 | #if (CONFIG_KEYPAD == RECORDER_PAD) || \ | 107 | #if (CONFIG_KEYPAD == RECORDER_PAD) |
108 | (CONFIG_KEYPAD == ARCHOS_AV300_PAD) | ||
109 | #define SOKOBAN_LEFT BUTTON_LEFT | 108 | #define SOKOBAN_LEFT BUTTON_LEFT |
110 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 109 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
111 | #define SOKOBAN_UP BUTTON_UP | 110 | #define SOKOBAN_UP BUTTON_UP |
@@ -1643,8 +1642,7 @@ static int sokoban_menu(void) | |||
1643 | rb->screens[i]->clear_display(); | 1642 | rb->screens[i]->clear_display(); |
1644 | rb->lcd_setfont(SOKOBAN_FONT); | 1643 | rb->lcd_setfont(SOKOBAN_FONT); |
1645 | 1644 | ||
1646 | #if (CONFIG_KEYPAD == RECORDER_PAD) || \ | 1645 | #if (CONFIG_KEYPAD == RECORDER_PAD) |
1647 | (CONFIG_KEYPAD == ARCHOS_AV300_PAD) | ||
1648 | rb->lcd_putsxy(3, 6, "[OFF] Menu"); | 1646 | rb->lcd_putsxy(3, 6, "[OFF] Menu"); |
1649 | rb->lcd_putsxy(3, 16, "[ON] Undo"); | 1647 | rb->lcd_putsxy(3, 16, "[ON] Undo"); |
1650 | rb->lcd_putsxy(3, 26, "[PLAY] Redo"); | 1648 | rb->lcd_putsxy(3, 26, "[PLAY] Redo"); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index dd4c8d3447..c743634279 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -49,23 +49,6 @@ | |||
49 | # define HK_CUR2STACK "F2" | 49 | # define HK_CUR2STACK "F2" |
50 | # define HK_REM2STACK "F3" | 50 | # define HK_REM2STACK "F3" |
51 | 51 | ||
52 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
53 | # define SOL_QUIT BUTTON_OFF | ||
54 | # define SOL_UP BUTTON_UP | ||
55 | # define SOL_DOWN BUTTON_DOWN | ||
56 | # define SOL_LEFT BUTTON_LEFT | ||
57 | # define SOL_RIGHT BUTTON_RIGHT | ||
58 | # define SOL_MOVE BUTTON_ON | ||
59 | # define SOL_DRAW BUTTON_F1 | ||
60 | # define SOL_REM2CUR BUTTON_SELECT | ||
61 | # define SOL_CUR2STACK BUTTON_F2 | ||
62 | # define SOL_REM2STACK BUTTON_F3 | ||
63 | # define HK_MOVE "ON" | ||
64 | # define HK_DRAW "F1" | ||
65 | # define HK_REM2CUR "SELECT" | ||
66 | # define HK_CUR2STACK "F2" | ||
67 | # define HK_REM2STACK "F3" | ||
68 | |||
69 | #elif CONFIG_KEYPAD == ONDIO_PAD | 52 | #elif CONFIG_KEYPAD == ONDIO_PAD |
70 | # define SOL_QUIT BUTTON_OFF | 53 | # define SOL_QUIT BUTTON_OFF |
71 | # define SOL_UP_PRE BUTTON_UP | 54 | # define SOL_UP_PRE BUTTON_UP |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 98c6d1a032..91bf7757de 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -37,15 +37,6 @@ | |||
37 | #define AST_RIGHT BUTTON_RIGHT | 37 | #define AST_RIGHT BUTTON_RIGHT |
38 | #define AST_FIRE BUTTON_PLAY | 38 | #define AST_FIRE BUTTON_PLAY |
39 | 39 | ||
40 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
41 | #define AST_PAUSE BUTTON_ON | ||
42 | #define AST_QUIT BUTTON_OFF | ||
43 | #define AST_THRUST BUTTON_UP | ||
44 | #define AST_HYPERSPACE BUTTON_DOWN | ||
45 | #define AST_LEFT BUTTON_LEFT | ||
46 | #define AST_RIGHT BUTTON_RIGHT | ||
47 | #define AST_FIRE BUTTON_SELECT | ||
48 | |||
49 | #elif CONFIG_KEYPAD == ONDIO_PAD | 40 | #elif CONFIG_KEYPAD == ONDIO_PAD |
50 | #define AST_PAUSE (BUTTON_MENU | BUTTON_OFF) | 41 | #define AST_PAUSE (BUTTON_MENU | BUTTON_OFF) |
51 | #define AST_QUIT BUTTON_OFF | 42 | #define AST_QUIT BUTTON_OFF |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 43036e2808..5814cc8cab 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -74,23 +74,6 @@ | |||
74 | #define STAR_LEVEL_DOWN_NAME "F1" | 74 | #define STAR_LEVEL_DOWN_NAME "F1" |
75 | #define STAR_LEVEL_REPEAT_NAME "F2" | 75 | #define STAR_LEVEL_REPEAT_NAME "F2" |
76 | 76 | ||
77 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
78 | #define STAR_QUIT BUTTON_OFF | ||
79 | #define STAR_LEFT BUTTON_LEFT | ||
80 | #define STAR_RIGHT BUTTON_RIGHT | ||
81 | #define STAR_UP BUTTON_UP | ||
82 | #define STAR_DOWN BUTTON_DOWN | ||
83 | #define STAR_TOGGLE_CONTROL BUTTON_ON | ||
84 | #define STAR_TOGGLE_CONTROL2 BUTTON_SELECT | ||
85 | #define STAR_LEVEL_UP BUTTON_F3 | ||
86 | #define STAR_LEVEL_DOWN BUTTON_F1 | ||
87 | #define STAR_LEVEL_REPEAT BUTTON_F2 | ||
88 | #define STAR_TOGGLE_CONTROL_NAME "ON/SELECT" | ||
89 | #define STAR_QUIT_NAME "OFF" | ||
90 | #define STAR_LEVEL_UP_NAME "F3" | ||
91 | #define STAR_LEVEL_DOWN_NAME "F1" | ||
92 | #define STAR_LEVEL_REPEAT_NAME "F2" | ||
93 | |||
94 | #elif CONFIG_KEYPAD == ONDIO_PAD | 77 | #elif CONFIG_KEYPAD == ONDIO_PAD |
95 | #define STAR_QUIT BUTTON_OFF | 78 | #define STAR_QUIT BUTTON_OFF |
96 | #define STAR_LEFT BUTTON_LEFT | 79 | #define STAR_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index a806e4e830..bb778c9d24 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -43,14 +43,6 @@ | |||
43 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 43 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
44 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 44 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
45 | 45 | ||
46 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
47 | #define STOPWATCH_QUIT BUTTON_OFF | ||
48 | #define STOPWATCH_START_STOP BUTTON_SELECT | ||
49 | #define STOPWATCH_RESET_TIMER BUTTON_LEFT | ||
50 | #define STOPWATCH_LAP_TIMER BUTTON_ON | ||
51 | #define STOPWATCH_SCROLL_UP BUTTON_UP | ||
52 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | ||
53 | |||
54 | #elif CONFIG_KEYPAD == ONDIO_PAD | 46 | #elif CONFIG_KEYPAD == ONDIO_PAD |
55 | #define STOPWATCH_QUIT BUTTON_OFF | 47 | #define STOPWATCH_QUIT BUTTON_OFF |
56 | #define STOPWATCH_START_STOP BUTTON_RIGHT | 48 | #define STOPWATCH_START_STOP BUTTON_RIGHT |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 2bee868de9..47000b8e25 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -37,16 +37,6 @@ | |||
37 | #define SUDOKU_BUTTON_MENU BUTTON_F1 | 37 | #define SUDOKU_BUTTON_MENU BUTTON_F1 |
38 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_F2 | 38 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_F2 |
39 | 39 | ||
40 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
41 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF | ||
42 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
43 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
44 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
45 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
46 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT | ||
47 | #define SUDOKU_BUTTON_MENU BUTTON_F1 | ||
48 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_F2 | ||
49 | |||
50 | #elif CONFIG_KEYPAD == ONDIO_PAD | 40 | #elif CONFIG_KEYPAD == ONDIO_PAD |
51 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF | 41 | #define SUDOKU_BUTTON_QUIT BUTTON_OFF |
52 | #define SUDOKU_BUTTON_UP BUTTON_UP | 42 | #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 6ee8f9bbf1..acf7519b69 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -59,21 +59,6 @@ | |||
59 | #define TV_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT) | 59 | #define TV_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT) |
60 | #define TV_BOOKMARK BUTTON_F2 | 60 | #define TV_BOOKMARK BUTTON_F2 |
61 | 61 | ||
62 | /* Archos AV300 keys */ | ||
63 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
64 | #define TV_QUIT BUTTON_OFF | ||
65 | #define TV_SCROLL_UP BUTTON_UP | ||
66 | #define TV_SCROLL_DOWN BUTTON_DOWN | ||
67 | #define TV_SCREEN_LEFT BUTTON_LEFT | ||
68 | #define TV_SCREEN_RIGHT BUTTON_RIGHT | ||
69 | #define TV_MENU BUTTON_F1 | ||
70 | #define TV_AUTOSCROLL BUTTON_SELECT | ||
71 | #define TV_LINE_UP (BUTTON_ON | BUTTON_UP) | ||
72 | #define TV_LINE_DOWN (BUTTON_ON | BUTTON_DOWN) | ||
73 | #define TV_COLUMN_LEFT (BUTTON_ON | BUTTON_LEFT) | ||
74 | #define TV_COLUMN_RIGHT (BUTTON_ON | BUTTON_RIGHT) | ||
75 | #define TV_BOOKMARK BUTTON_F2 | ||
76 | |||
77 | /* Ondio keys */ | 62 | /* Ondio keys */ |
78 | #elif CONFIG_KEYPAD == ONDIO_PAD | 63 | #elif CONFIG_KEYPAD == ONDIO_PAD |
79 | #define TV_QUIT BUTTON_OFF | 64 | #define TV_QUIT BUTTON_OFF |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 33ad38d72c..af6bd6f397 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -35,17 +35,6 @@ | |||
35 | #define LABEL_MENU "F1" | 35 | #define LABEL_MENU "F1" |
36 | #define LABEL_VOLUME "UP/DOWN" | 36 | #define LABEL_VOLUME "UP/DOWN" |
37 | 37 | ||
38 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
39 | #define VUMETER_QUIT BUTTON_OFF | ||
40 | #define VUMETER_HELP BUTTON_ON | ||
41 | #define VUMETER_MENU BUTTON_F1 | ||
42 | #define VUMETER_UP BUTTON_UP | ||
43 | #define VUMETER_DOWN BUTTON_DOWN | ||
44 | #define LABEL_HELP "ON" | ||
45 | #define LABEL_QUIT "OFF" | ||
46 | #define LABEL_MENU "F1" | ||
47 | #define LABEL_VOLUME "UP/DOWN" | ||
48 | |||
49 | #elif CONFIG_KEYPAD == ONDIO_PAD | 38 | #elif CONFIG_KEYPAD == ONDIO_PAD |
50 | #define VUMETER_QUIT BUTTON_OFF | 39 | #define VUMETER_QUIT BUTTON_OFF |
51 | #define VUMETER_HELP_PRE BUTTON_MENU | 40 | #define VUMETER_HELP_PRE BUTTON_MENU |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index d342511419..a8447c9952 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -65,18 +65,6 @@ static long max_cycle; | |||
65 | #define MULTIPLAYER | 65 | #define MULTIPLAYER |
66 | #endif | 66 | #endif |
67 | 67 | ||
68 | #elif (CONFIG_KEYPAD == ARCHOS_AV300_PAD) | ||
69 | #define BTN_DIR_UP BUTTON_UP | ||
70 | #define BTN_DIR_DOWN BUTTON_DOWN | ||
71 | #define BTN_DIR_LEFT BUTTON_LEFT | ||
72 | #define BTN_DIR_RIGHT BUTTON_RIGHT | ||
73 | #define BTN_PLAYER2_DIR1 BUTTON_F2 | ||
74 | #define BTN_PLAYER2_DIR2 BUTTON_F3 | ||
75 | #define BTN_STARTPAUSE BUTTON_SELECT | ||
76 | #define BTN_QUIT BUTTON_OFF | ||
77 | #define BTN_STOPRESET BUTTON_ON | ||
78 | #define BTN_TOGGLE_KEYS BUTTON_F1 | ||
79 | |||
80 | #elif (CONFIG_KEYPAD == ONDIO_PAD) | 68 | #elif (CONFIG_KEYPAD == ONDIO_PAD) |
81 | #define BTN_DIR_UP BUTTON_UP | 69 | #define BTN_DIR_UP BUTTON_UP |
82 | #define BTN_DIR_DOWN BUTTON_DOWN | 70 | #define BTN_DIR_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 9643641569..f86992f240 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -38,15 +38,6 @@ | |||
38 | 38 | ||
39 | #define RC_QUIT BUTTON_RC_STOP | 39 | #define RC_QUIT BUTTON_RC_STOP |
40 | 40 | ||
41 | #elif (CONFIG_KEYPAD == ARCHOS_AV300_PAD) | ||
42 | |||
43 | #define QUIT BUTTON_OFF | ||
44 | #define LEFT BUTTON_LEFT | ||
45 | #define RIGHT BUTTON_RIGHT | ||
46 | #define PAUSE BUTTON_ON | ||
47 | #define UP BUTTON_UP | ||
48 | #define DOWN BUTTON_DOWN | ||
49 | |||
50 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 41 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
51 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 42 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
52 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 43 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 53dd9e8d88..c2d434415c 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -55,14 +55,6 @@ | |||
55 | #define ZX_UP BUTTON_UP | 55 | #define ZX_UP BUTTON_UP |
56 | #define ZX_DOWN BUTTON_DOWN | 56 | #define ZX_DOWN BUTTON_DOWN |
57 | 57 | ||
58 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
59 | #define ZX_SELECT BUTTON_SELECT | ||
60 | #define ZX_MENU BUTTON_OFF | ||
61 | #define ZX_LEFT BUTTON_LEFT | ||
62 | #define ZX_RIGHT BUTTON_RIGHT | ||
63 | #define ZX_UP BUTTON_UP | ||
64 | #define ZX_DOWN BUTTON_DOWN | ||
65 | |||
66 | #elif CONFIG_KEYPAD == ONDIO_PAD | 58 | #elif CONFIG_KEYPAD == ONDIO_PAD |
67 | #define ZX_SELECT BUTTON_MENU | 59 | #define ZX_SELECT BUTTON_MENU |
68 | #define ZX_MENU BUTTON_OFF | 60 | #define ZX_MENU BUTTON_OFF |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 4a26accc8a..046f07379d 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -35,14 +35,6 @@ | |||
35 | #define KBD_UP BUTTON_UP | 35 | #define KBD_UP BUTTON_UP |
36 | #define KBD_DOWN BUTTON_DOWN | 36 | #define KBD_DOWN BUTTON_DOWN |
37 | 37 | ||
38 | #elif CONFIG_KEYPAD == ARCHOS_AV300_PAD | ||
39 | #define KBD_SELECT BUTTON_SELECT | ||
40 | #define KBD_ABORT BUTTON_OFF | ||
41 | #define KBD_LEFT BUTTON_LEFT | ||
42 | #define KBD_RIGHT BUTTON_RIGHT | ||
43 | #define KBD_UP BUTTON_UP | ||
44 | #define KBD_DOWN BUTTON_DOWN | ||
45 | |||
46 | #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted Ondio keypad */ | 38 | #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted Ondio keypad */ |
47 | #define KBD_SELECT BUTTON_MENU | 39 | #define KBD_SELECT BUTTON_MENU |
48 | #define KBD_ABORT BUTTON_OFF | 40 | #define KBD_ABORT BUTTON_OFF |