diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-03-16 23:02:39 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-03-16 23:02:39 +0000 |
commit | 85a226d4e7dfcb4d5fe63dd1292bb667fa147cb0 (patch) | |
tree | 013a8df82e82d7d579ba83a381ac660030641129 /apps | |
parent | f3455d15e07409a50e4237bf20c780a9ce7bcc92 (diff) | |
download | rockbox-85a226d4e7dfcb4d5fe63dd1292bb667fa147cb0.tar.gz rockbox-85a226d4e7dfcb4d5fe63dd1292bb667fa147cb0.zip |
Rename some macros to account for the recently added M5 port. No code changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12809 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
62 files changed, 72 insertions, 72 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 3f0c2bd2d9..4a4d83d0e6 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -114,7 +114,7 @@ keymaps/keymap-recorder.c | |||
114 | keymaps/keymap-ondio.c | 114 | keymaps/keymap-ondio.c |
115 | #elif CONFIG_KEYPAD == PLAYER_PAD | 115 | #elif CONFIG_KEYPAD == PLAYER_PAD |
116 | keymaps/keymap-player.c | 116 | keymaps/keymap-player.c |
117 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 117 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
118 | keymaps/keymap-x5.c | 118 | keymaps/keymap-x5.c |
119 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 119 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
120 | keymaps/keymap-gigabeat.c | 120 | keymaps/keymap-gigabeat.c |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index c3532dbf8b..2b0381fef5 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -984,7 +984,7 @@ static bool dbg_spdif(void) | |||
984 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 984 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
985 | # define DEBUG_CANCEL BUTTON_PLAY | 985 | # define DEBUG_CANCEL BUTTON_PLAY |
986 | 986 | ||
987 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 987 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
988 | # define DEBUG_CANCEL BUTTON_REC | 988 | # define DEBUG_CANCEL BUTTON_REC |
989 | 989 | ||
990 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 990 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index b82fdef965..a4da7f4bb5 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -69,7 +69,7 @@ PLUGIN_HEADER | |||
69 | #define BATTERY_ON BUTTON_PLAY | 69 | #define BATTERY_ON BUTTON_PLAY |
70 | #define BATTERY_OFF BUTTON_MENU | 70 | #define BATTERY_OFF BUTTON_MENU |
71 | 71 | ||
72 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 72 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
73 | 73 | ||
74 | #define BATTERY_ON BUTTON_SELECT | 74 | #define BATTERY_ON BUTTON_SELECT |
75 | #define BATTERY_OFF BUTTON_PLAY | 75 | #define BATTERY_OFF BUTTON_PLAY |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 81ac65d142..f987eeb3b5 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -112,7 +112,7 @@ PLUGIN_HEADER | |||
112 | #define BJACK_RIGHT BUTTON_RIGHT | 112 | #define BJACK_RIGHT BUTTON_RIGHT |
113 | #define BJACK_LEFT BUTTON_LEFT | 113 | #define BJACK_LEFT BUTTON_LEFT |
114 | 114 | ||
115 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 115 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
116 | #define BJACK_START BUTTON_PLAY | 116 | #define BJACK_START BUTTON_PLAY |
117 | #define BJACK_QUIT BUTTON_POWER | 117 | #define BJACK_QUIT BUTTON_POWER |
118 | #define BJACK_MAX (BUTTON_PLAY|BUTTON_UP) | 118 | #define BJACK_MAX (BUTTON_PLAY|BUTTON_UP) |
@@ -1052,7 +1052,7 @@ static unsigned int blackjack_menu(struct game_context* bj) { | |||
1052 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); | 1052 | rb->snprintf(str, 21, "High Score: $%d", bj->highscores[0]); |
1053 | rb->lcd_puts(0, 9, str); | 1053 | rb->lcd_puts(0, 9, str); |
1054 | #endif | 1054 | #endif |
1055 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 1055 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
1056 | rb->lcd_puts(0, 2, "PLAY to start to hit"); | 1056 | rb->lcd_puts(0, 2, "PLAY to start to hit"); |
1057 | rb->lcd_puts(0, 3, "POWER to exit"); | 1057 | rb->lcd_puts(0, 3, "POWER to exit"); |
1058 | rb->lcd_puts(0, 4, "SELECT to hit"); | 1058 | rb->lcd_puts(0, 4, "SELECT to hit"); |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 40794241e6..46d9d88b21 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -63,7 +63,7 @@ PLUGIN_HEADER | |||
63 | #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) | 63 | #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REL) |
64 | #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) | 64 | #define BOUNCE_MODE (BUTTON_SELECT | BUTTON_REL) |
65 | 65 | ||
66 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 66 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
67 | #define BOUNCE_UP BUTTON_UP | 67 | #define BOUNCE_UP BUTTON_UP |
68 | #define BOUNCE_DOWN BUTTON_DOWN | 68 | #define BOUNCE_DOWN BUTTON_DOWN |
69 | #define BOUNCE_QUIT BUTTON_POWER | 69 | #define BOUNCE_QUIT BUTTON_POWER |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 2f1696f08a..38014e73a6 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -102,7 +102,7 @@ PLUGIN_HEADER | |||
102 | #define SCROLL_FWD(x) (0) | 102 | #define SCROLL_FWD(x) (0) |
103 | #define SCROLL_BACK(x) (0) | 103 | #define SCROLL_BACK(x) (0) |
104 | 104 | ||
105 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD /* grayscale at the moment */ | 105 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD /* grayscale at the moment */ |
106 | 106 | ||
107 | #define QUIT BUTTON_POWER | 107 | #define QUIT BUTTON_POWER |
108 | #define LEFT BUTTON_LEFT | 108 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/bubbles.c b/apps/plugins/bubbles.c index bc862baeda..48ca231349 100644 --- a/apps/plugins/bubbles.c +++ b/apps/plugins/bubbles.c | |||
@@ -2465,7 +2465,7 @@ static int bubbles(struct game_context* bb) { | |||
2465 | rb->lcd_puts(0, 6, " and show high scores"); | 2465 | rb->lcd_puts(0, 6, " and show high scores"); |
2466 | rb->lcd_puts(0, 7, "SCROLL to aim"); | 2466 | rb->lcd_puts(0, 7, "SCROLL to aim"); |
2467 | rb->lcd_puts(0, 8, " and to change level"); | 2467 | rb->lcd_puts(0, 8, " and to change level"); |
2468 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 2468 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
2469 | rb->lcd_puts(0, 2, "PLAY to start/pause"); | 2469 | rb->lcd_puts(0, 2, "PLAY to start/pause"); |
2470 | rb->lcd_puts(0, 3, "REC to save/resume"); | 2470 | rb->lcd_puts(0, 3, "REC to save/resume"); |
2471 | rb->lcd_puts(0, 4, "POWER to exit"); | 2471 | rb->lcd_puts(0, 4, "POWER to exit"); |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 2a8f8ffe45..05f9c73ba9 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -155,7 +155,7 @@ PLUGIN_HEADER | |||
155 | #define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) | 155 | #define CALCULATOR_INPUT (BUTTON_SELECT | BUTTON_REL) |
156 | #define CALCULATOR_CALC (BUTTON_PLAY | BUTTON_REPEAT) | 156 | #define CALCULATOR_CALC (BUTTON_PLAY | BUTTON_REPEAT) |
157 | 157 | ||
158 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 158 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
159 | 159 | ||
160 | #define CALCULATOR_UP BUTTON_UP | 160 | #define CALCULATOR_UP BUTTON_UP |
161 | #define CALCULATOR_DOWN BUTTON_DOWN | 161 | #define CALCULATOR_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index da26d0f6db..0bd72ebcd8 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -51,7 +51,7 @@ PLUGIN_HEADER | |||
51 | #define CB_RESTART (BUTTON_SELECT | BUTTON_LEFT) | 51 | #define CB_RESTART (BUTTON_SELECT | BUTTON_LEFT) |
52 | #define CB_QUIT (BUTTON_SELECT | BUTTON_MENU) | 52 | #define CB_QUIT (BUTTON_SELECT | BUTTON_MENU) |
53 | 53 | ||
54 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 54 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
55 | #define CB_SELECT BUTTON_SELECT | 55 | #define CB_SELECT BUTTON_SELECT |
56 | #define CB_UP BUTTON_UP | 56 | #define CB_UP BUTTON_UP |
57 | #define CB_DOWN BUTTON_DOWN | 57 | #define CB_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index bb4045249a..acc35c3788 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -98,7 +98,7 @@ PLUGIN_HEADER | |||
98 | #define CHC_SETTINGS_OK BUTTON_SELECT | 98 | #define CHC_SETTINGS_OK BUTTON_SELECT |
99 | #define CHC_SETTINGS_CANCEL BUTTON_PLAY | 99 | #define CHC_SETTINGS_CANCEL BUTTON_PLAY |
100 | 100 | ||
101 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 101 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
102 | #define CHC_QUIT BUTTON_REC | 102 | #define CHC_QUIT BUTTON_REC |
103 | #define CHC_STARTSTOP BUTTON_PLAY | 103 | #define CHC_STARTSTOP BUTTON_PLAY |
104 | #define CHC_RESET BUTTON_POWER | 104 | #define CHC_RESET BUTTON_POWER |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 6e54669ef0..c18da43591 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -999,7 +999,7 @@ STATIC void chip8 (void) | |||
999 | #define CHIP8_KEY6 BUTTON_RIGHT | 999 | #define CHIP8_KEY6 BUTTON_RIGHT |
1000 | #define CHIP8_KEY8 BUTTON_SCROLL_FWD | 1000 | #define CHIP8_KEY8 BUTTON_SCROLL_FWD |
1001 | 1001 | ||
1002 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 1002 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
1003 | #define CHIP8_OFF BUTTON_POWER | 1003 | #define CHIP8_OFF BUTTON_POWER |
1004 | #define CHIP8_KEY2 BUTTON_UP | 1004 | #define CHIP8_KEY2 BUTTON_UP |
1005 | #define CHIP8_KEY4 BUTTON_LEFT | 1005 | #define CHIP8_KEY4 BUTTON_LEFT |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 1efe202946..1c3d7a765c 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -46,7 +46,7 @@ PLUGIN_HEADER | |||
46 | #define ACTION BUTTON_SELECT | 46 | #define ACTION BUTTON_SELECT |
47 | #define ACTIONTEXT "SELECT" | 47 | #define ACTIONTEXT "SELECT" |
48 | 48 | ||
49 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD /* grayscale at the moment */ | 49 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD /* grayscale at the moment */ |
50 | 50 | ||
51 | #define QUIT BUTTON_POWER | 51 | #define QUIT BUTTON_POWER |
52 | #define ACTION BUTTON_UP | 52 | #define ACTION BUTTON_UP |
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c index dfc5fd7163..59b98247b8 100644 --- a/apps/plugins/clock.c +++ b/apps/plugins/clock.c | |||
@@ -285,7 +285,7 @@ extern const fb_data clock_timesup[]; | |||
285 | #define MODE_NEXT_BUTTON BUTTON_RIGHT | 285 | #define MODE_NEXT_BUTTON BUTTON_RIGHT |
286 | #define MODE_PREV_BUTTON BUTTON_LEFT | 286 | #define MODE_PREV_BUTTON BUTTON_LEFT |
287 | #define EXIT_RC_BUTTON BUTTON_RC_STOP | 287 | #define EXIT_RC_BUTTON BUTTON_RC_STOP |
288 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 288 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
289 | #define COUNTER_TOGGLE_BUTTON (BUTTON_PLAY|BUTTON_REL) | 289 | #define COUNTER_TOGGLE_BUTTON (BUTTON_PLAY|BUTTON_REL) |
290 | #define COUNTER_RESET_BUTTON (BUTTON_PLAY|BUTTON_REPEAT) | 290 | #define COUNTER_RESET_BUTTON (BUTTON_PLAY|BUTTON_REPEAT) |
291 | #define MENU_BUTTON BUTTON_SELECT | 291 | #define MENU_BUTTON BUTTON_SELECT |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 526400db61..f481ee3ff4 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -121,7 +121,7 @@ PLUGIN_HEADER | |||
121 | #define CUBE_PAUSE (BUTTON_SELECT | BUTTON_REL) | 121 | #define CUBE_PAUSE (BUTTON_SELECT | BUTTON_REL) |
122 | #define CUBE_HIGHSPEED (BUTTON_MODE | BUTTON_EQ) /* TODO: this is impossible */ | 122 | #define CUBE_HIGHSPEED (BUTTON_MODE | BUTTON_EQ) /* TODO: this is impossible */ |
123 | 123 | ||
124 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 124 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
125 | #define CUBE_QUIT BUTTON_POWER | 125 | #define CUBE_QUIT BUTTON_POWER |
126 | #define CUBE_X_INC BUTTON_LEFT | 126 | #define CUBE_X_INC BUTTON_LEFT |
127 | #define CUBE_X_DEC BUTTON_RIGHT | 127 | #define CUBE_X_DEC BUTTON_RIGHT |
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index d29f6c3b14..1a5dfae412 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c | |||
@@ -45,7 +45,7 @@ PLUGIN_HEADER | |||
45 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT | 45 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT |
46 | #define DEMYSTIFY_INCREASE_SPEED BUTTON_SCROLL_UP | 46 | #define DEMYSTIFY_INCREASE_SPEED BUTTON_SCROLL_UP |
47 | #define DEMYSTIFY_DECREASE_SPEED BUTTON_SCROLL_DOWN | 47 | #define DEMYSTIFY_DECREASE_SPEED BUTTON_SCROLL_DOWN |
48 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 48 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
49 | #define DEMYSTIFY_QUIT BUTTON_POWER | 49 | #define DEMYSTIFY_QUIT BUTTON_POWER |
50 | #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT | 50 | #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT |
51 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT | 51 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT |
diff --git a/apps/plugins/dice.c b/apps/plugins/dice.c index 8638cb8cc3..7c265dac4b 100644 --- a/apps/plugins/dice.c +++ b/apps/plugins/dice.c | |||
@@ -116,7 +116,7 @@ use stop to exit | |||
116 | #define DICE_BUTTON_ON (BUTTON_ON|BUTTON_REPEAT) | 116 | #define DICE_BUTTON_ON (BUTTON_ON|BUTTON_REPEAT) |
117 | #define DICE_BUTTON_OFF BUTTON_MENU | 117 | #define DICE_BUTTON_OFF BUTTON_MENU |
118 | 118 | ||
119 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 119 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
120 | #define DICE_BUTTON_UP BUTTON_UP | 120 | #define DICE_BUTTON_UP BUTTON_UP |
121 | #define DICE_BUTTON_DOWN BUTTON_DOWN | 121 | #define DICE_BUTTON_DOWN BUTTON_DOWN |
122 | #define DICE_BUTTON_LEFT BUTTON_LEFT | 122 | #define DICE_BUTTON_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 4e5066af79..2fde18611e 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -109,7 +109,7 @@ long reverse (long N) { | |||
109 | #define LP_QUIT BUTTON_MENU | 109 | #define LP_QUIT BUTTON_MENU |
110 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 110 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
111 | #define LP_QUIT BUTTON_PLAY | 111 | #define LP_QUIT BUTTON_PLAY |
112 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 112 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
113 | #define LP_QUIT BUTTON_POWER | 113 | #define LP_QUIT BUTTON_POWER |
114 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 114 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
115 | #define LP_QUIT BUTTON_A | 115 | #define LP_QUIT BUTTON_A |
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index 651ed5f3ba..f5e34cd54d 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c | |||
@@ -59,7 +59,7 @@ enum tidy_system | |||
59 | (CONFIG_KEYPAD == IPOD_4G_PAD) | 59 | (CONFIG_KEYPAD == IPOD_4G_PAD) |
60 | #define TIDY_STOP BUTTON_MENU | 60 | #define TIDY_STOP BUTTON_MENU |
61 | 61 | ||
62 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 62 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
63 | #define TIDY_STOP BUTTON_POWER | 63 | #define TIDY_STOP BUTTON_POWER |
64 | 64 | ||
65 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 65 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index b69b017103..2274854b4a 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -158,7 +158,7 @@ void I_ShutdownGraphics(void) | |||
158 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | 158 | #define DOOMBUTTON_SHOOT BUTTON_PLAY |
159 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 159 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
160 | #define DOOMBUTTON_OPEN BUTTON_MENU | 160 | #define DOOMBUTTON_OPEN BUTTON_MENU |
161 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 161 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
162 | #define DOOMBUTTON_UP BUTTON_UP | 162 | #define DOOMBUTTON_UP BUTTON_UP |
163 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 163 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
164 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 164 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index c293bf7af6..4917bf6a63 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -80,7 +80,7 @@ static unsigned char draw_buffer[8*LCD_WIDTH]; | |||
80 | #define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD | 80 | #define FIRE_INCREASE_MULT BUTTON_SCROLL_FWD |
81 | #define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK | 81 | #define FIRE_DECREASE_MULT BUTTON_SCROLL_BACK |
82 | 82 | ||
83 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 83 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
84 | #define FIRE_QUIT BUTTON_POWER | 84 | #define FIRE_QUIT BUTTON_POWER |
85 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT | 85 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT |
86 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT | 86 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 8b8ee3398b..f564b68b85 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -45,7 +45,7 @@ static struct plugin_api* rb; | |||
45 | #elif (CONFIG_KEYPAD == ONDIO_PAD) | 45 | #elif (CONFIG_KEYPAD == ONDIO_PAD) |
46 | #define BTN_MENU BUTTON_MENU | 46 | #define BTN_MENU BUTTON_MENU |
47 | #define BTN_FIRE BUTTON_UP | 47 | #define BTN_FIRE BUTTON_UP |
48 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 48 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
49 | #define BTN_MENU BUTTON_POWER | 49 | #define BTN_MENU BUTTON_POWER |
50 | #define BTN_FIRE BUTTON_SELECT | 50 | #define BTN_FIRE BUTTON_SELECT |
51 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) | 51 | #elif (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index d6083ee7e7..fd02bc4789 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -84,7 +84,7 @@ PLUGIN_HEADER | |||
84 | #define FLIPIT_TOGGLE_PRE BUTTON_SELECT | 84 | #define FLIPIT_TOGGLE_PRE BUTTON_SELECT |
85 | #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) | 85 | #define FLIPIT_TOGGLE (BUTTON_SELECT | BUTTON_REL) |
86 | 86 | ||
87 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 87 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
88 | 88 | ||
89 | #define FLIPIT_UP BUTTON_UP | 89 | #define FLIPIT_UP BUTTON_UP |
90 | #define FLIPIT_DOWN BUTTON_DOWN | 90 | #define FLIPIT_DOWN BUTTON_DOWN |
@@ -514,7 +514,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
514 | rb->lcd_putsxy(2, 28, "[S-LEFT] shuffle"); | 514 | rb->lcd_putsxy(2, 28, "[S-LEFT] shuffle"); |
515 | rb->lcd_putsxy(2, 38, "[S-PLAY] solution"); | 515 | rb->lcd_putsxy(2, 38, "[S-PLAY] solution"); |
516 | rb->lcd_putsxy(2, 48, "[S-RIGHT] step by step"); | 516 | rb->lcd_putsxy(2, 48, "[S-RIGHT] step by step"); |
517 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 517 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
518 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); | 518 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); |
519 | rb->lcd_putsxy(2, 18, "[SELECT] toggle"); | 519 | rb->lcd_putsxy(2, 18, "[SELECT] toggle"); |
520 | rb->lcd_putsxy(2, 28, "[REC] shuffle"); | 520 | rb->lcd_putsxy(2, 28, "[REC] shuffle"); |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 270f08dd1b..5172edbb5e 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -76,7 +76,7 @@ PLUGIN_HEADER | |||
76 | #define RIGHT BUTTON_RIGHT | 76 | #define RIGHT BUTTON_RIGHT |
77 | #define FIRE BUTTON_SELECT | 77 | #define FIRE BUTTON_SELECT |
78 | 78 | ||
79 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 79 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
80 | 80 | ||
81 | #define QUIT BUTTON_POWER | 81 | #define QUIT BUTTON_POWER |
82 | #define LEFT BUTTON_LEFT | 82 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index d4bef240e8..975f0cfa34 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -78,7 +78,7 @@ PLUGIN_HEADER | |||
78 | #define JEWELS_SELECT BUTTON_SELECT | 78 | #define JEWELS_SELECT BUTTON_SELECT |
79 | #define JEWELS_CANCEL BUTTON_PLAY | 79 | #define JEWELS_CANCEL BUTTON_PLAY |
80 | 80 | ||
81 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 81 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
82 | #define JEWELS_UP BUTTON_UP | 82 | #define JEWELS_UP BUTTON_UP |
83 | #define JEWELS_DOWN BUTTON_DOWN | 83 | #define JEWELS_DOWN BUTTON_DOWN |
84 | #define JEWELS_LEFT BUTTON_LEFT | 84 | #define JEWELS_LEFT BUTTON_LEFT |
@@ -1287,7 +1287,7 @@ static int jewels_main(struct game_context* bj) { | |||
1287 | rb->lcd_puts(0, 8, "Directions or scroll to move"); | 1287 | rb->lcd_puts(0, 8, "Directions or scroll to move"); |
1288 | rb->lcd_puts(0, 9, "SELECT to select"); | 1288 | rb->lcd_puts(0, 9, "SELECT to select"); |
1289 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); | 1289 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); |
1290 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 1290 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
1291 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); | 1291 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); |
1292 | rb->lcd_puts(0, 3, "form connected segments"); | 1292 | rb->lcd_puts(0, 3, "form connected segments"); |
1293 | rb->lcd_puts(0, 4, "of three or more of the"); | 1293 | rb->lcd_puts(0, 4, "of three or more of the"); |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index c6cb2701c0..900e6df72a 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -97,7 +97,7 @@ PLUGIN_HEADER | |||
97 | #define JPEG_NEXT (BUTTON_SELECT | BUTTON_RIGHT) | 97 | #define JPEG_NEXT (BUTTON_SELECT | BUTTON_RIGHT) |
98 | #define JPEG_PREVIOUS (BUTTON_SELECT | BUTTON_LEFT) | 98 | #define JPEG_PREVIOUS (BUTTON_SELECT | BUTTON_LEFT) |
99 | 99 | ||
100 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 100 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
101 | #define JPEG_ZOOM_PRE BUTTON_SELECT | 101 | #define JPEG_ZOOM_PRE BUTTON_SELECT |
102 | #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) | 102 | #define JPEG_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) |
103 | #define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) | 103 | #define JPEG_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) |
diff --git a/apps/plugins/lib/pluginlib_actions.h b/apps/plugins/lib/pluginlib_actions.h index 7ce43ce9e4..1a3ab522be 100644 --- a/apps/plugins/lib/pluginlib_actions.h +++ b/apps/plugins/lib/pluginlib_actions.h | |||
@@ -49,7 +49,7 @@ static const struct button_mapping generic_directions[] = | |||
49 | { | 49 | { |
50 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ | 50 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ |
51 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 51 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
52 | || (CONFIG_KEYPAD == IAUDIO_X5_PAD) \ | 52 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
53 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ | 53 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ |
54 | || (CONFIG_KEYPAD == RECORDER_PAD) \ | 54 | || (CONFIG_KEYPAD == RECORDER_PAD) \ |
55 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ | 55 | || (CONFIG_KEYPAD == ARCHOS_AV300_PAD) \ |
@@ -109,7 +109,7 @@ static const struct button_mapping generic_left_right_fire[] = | |||
109 | { | 109 | { |
110 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ | 110 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) \ |
111 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ | 111 | || (CONFIG_KEYPAD == IRIVER_H300_PAD) \ |
112 | || (CONFIG_KEYPAD == IAUDIO_X5_PAD) \ | 112 | || (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
113 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ | 113 | || (CONFIG_KEYPAD == GIGABEAT_PAD) \ |
114 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) | 114 | || (CONFIG_KEYPAD == IRIVER_IFP7XX_PAD) |
115 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, | 115 | { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE}, |
@@ -189,7 +189,7 @@ static const struct button_mapping generic_actions[] = | |||
189 | {PLA_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE}, | 189 | {PLA_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_NONE}, |
190 | {PLA_FIRE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 190 | {PLA_FIRE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
191 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 191 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
192 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 192 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
193 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 193 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
194 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 194 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
195 | {PLA_MENU, BUTTON_REC, BUTTON_NONE}, | 195 | {PLA_MENU, BUTTON_REC, BUTTON_NONE}, |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 68b8bc4b93..168e68cbb9 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -196,7 +196,7 @@ const unsigned char rockbox16x7[] = { | |||
196 | #define LP_INC_X BUTTON_RIGHT | 196 | #define LP_INC_X BUTTON_RIGHT |
197 | #define LP_DEC_Y BUTTON_DOWN | 197 | #define LP_DEC_Y BUTTON_DOWN |
198 | #define LP_INC_Y BUTTON_UP | 198 | #define LP_INC_Y BUTTON_UP |
199 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 199 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
200 | #define LP_QUIT BUTTON_POWER | 200 | #define LP_QUIT BUTTON_POWER |
201 | #define LP_DEC_X BUTTON_LEFT | 201 | #define LP_DEC_X BUTTON_LEFT |
202 | #define LP_INC_X BUTTON_RIGHT | 202 | #define LP_INC_X BUTTON_RIGHT |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 113737ba56..824fc03c87 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -93,7 +93,7 @@ PLUGIN_HEADER | |||
93 | #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) | 93 | #define MANDELBROT_MAXITER_DEC (BUTTON_SELECT | BUTTON_LEFT) |
94 | #define MANDELBROT_RESET (BUTTON_SELECT | BUTTON_PLAY) | 94 | #define MANDELBROT_RESET (BUTTON_SELECT | BUTTON_PLAY) |
95 | 95 | ||
96 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 96 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
97 | #define MANDELBROT_QUIT BUTTON_POWER | 97 | #define MANDELBROT_QUIT BUTTON_POWER |
98 | #define MANDELBROT_UP BUTTON_UP | 98 | #define MANDELBROT_UP BUTTON_UP |
99 | #define MANDELBROT_DOWN BUTTON_DOWN | 99 | #define MANDELBROT_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index 8a737d235e..bd76245662 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c | |||
@@ -62,7 +62,7 @@ static struct plugin_api* rb; | |||
62 | #define MAZEZAM_QUIT BUTTON_OFF | 62 | #define MAZEZAM_QUIT BUTTON_OFF |
63 | #define MAZEZAM_QUIT_KEYNAME "[OFF]" | 63 | #define MAZEZAM_QUIT_KEYNAME "[OFF]" |
64 | 64 | ||
65 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 65 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
66 | #define MAZEZAM_UP BUTTON_UP | 66 | #define MAZEZAM_UP BUTTON_UP |
67 | #define MAZEZAM_DOWN BUTTON_DOWN | 67 | #define MAZEZAM_DOWN BUTTON_DOWN |
68 | #define MAZEZAM_LEFT BUTTON_LEFT | 68 | #define MAZEZAM_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c index 088b431a73..61a834755f 100644 --- a/apps/plugins/midiplay.c +++ b/apps/plugins/midiplay.c | |||
@@ -61,7 +61,7 @@ PLUGIN_IRAM_DECLARE | |||
61 | #define BTN_DOWN BUTTON_DOWN | 61 | #define BTN_DOWN BUTTON_DOWN |
62 | 62 | ||
63 | 63 | ||
64 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 64 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
65 | #define BTN_QUIT BUTTON_POWER | 65 | #define BTN_QUIT BUTTON_POWER |
66 | #define BTN_RIGHT BUTTON_RIGHT | 66 | #define BTN_RIGHT BUTTON_RIGHT |
67 | #define BTN_UP BUTTON_UP | 67 | #define BTN_UP BUTTON_UP |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 26565f335f..26c2df5233 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -96,7 +96,7 @@ enum minesweeper_status { | |||
96 | # define MINESWP_RIGHT (BUTTON_SELECT | BUTTON_RIGHT) | 96 | # define MINESWP_RIGHT (BUTTON_SELECT | BUTTON_RIGHT) |
97 | # define MINESWP_LEFT (BUTTON_SELECT | BUTTON_LEFT) | 97 | # define MINESWP_LEFT (BUTTON_SELECT | BUTTON_LEFT) |
98 | 98 | ||
99 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 99 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
100 | # define MINESWP_UP BUTTON_UP | 100 | # define MINESWP_UP BUTTON_UP |
101 | # define MINESWP_DOWN BUTTON_DOWN | 101 | # define MINESWP_DOWN BUTTON_DOWN |
102 | # define MINESWP_QUIT BUTTON_POWER | 102 | # define MINESWP_QUIT BUTTON_POWER |
@@ -446,7 +446,7 @@ enum minesweeper_status menu( void ) | |||
446 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 446 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
447 | || (CONFIG_KEYPAD == GIGABEAT_PAD) | 447 | || (CONFIG_KEYPAD == GIGABEAT_PAD) |
448 | "SELECT to start" | 448 | "SELECT to start" |
449 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 449 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
450 | "REC to start" | 450 | "REC to start" |
451 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 451 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
452 | "FF to start" | 452 | "FF to start" |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 093e642703..4e5928807c 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -80,7 +80,7 @@ PLUGIN_HEADER | |||
80 | #define MOSAIQUE_SPEED BUTTON_MODE | 80 | #define MOSAIQUE_SPEED BUTTON_MODE |
81 | #define MOSAIQUE_RESTART BUTTON_SELECT | 81 | #define MOSAIQUE_RESTART BUTTON_SELECT |
82 | 82 | ||
83 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 83 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
84 | #define MOSAIQUE_QUIT BUTTON_POWER | 84 | #define MOSAIQUE_QUIT BUTTON_POWER |
85 | #define MOSAIQUE_SPEED BUTTON_SELECT | 85 | #define MOSAIQUE_SPEED BUTTON_SELECT |
86 | #define MOSAIQUE_RESTART BUTTON_PLAY | 86 | #define MOSAIQUE_RESTART BUTTON_PLAY |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index da0245eb2a..8f4b9bdda6 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2331,7 +2331,7 @@ void get_mp3_filename(char *wav_name) | |||
2331 | #define MP3ENC_NEXT BUTTON_SCROLL_FWD | 2331 | #define MP3ENC_NEXT BUTTON_SCROLL_FWD |
2332 | #define MP3ENC_DONE BUTTON_MENU | 2332 | #define MP3ENC_DONE BUTTON_MENU |
2333 | #define MP3ENC_SELECT BUTTON_SELECT | 2333 | #define MP3ENC_SELECT BUTTON_SELECT |
2334 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 2334 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
2335 | #define MP3ENC_PREV BUTTON_UP | 2335 | #define MP3ENC_PREV BUTTON_UP |
2336 | #define MP3ENC_NEXT BUTTON_DOWN | 2336 | #define MP3ENC_NEXT BUTTON_DOWN |
2337 | #define MP3ENC_DONE BUTTON_POWER | 2337 | #define MP3ENC_DONE BUTTON_POWER |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index f292e3dbb3..bd0b7a5a42 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -123,7 +123,7 @@ PLUGIN_IRAM_DECLARE | |||
123 | #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) | 123 | #define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) |
124 | #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) | 124 | #define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) |
125 | 125 | ||
126 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 126 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
127 | #define MPEG_MENU (BUTTON_REC | BUTTON_REL) | 127 | #define MPEG_MENU (BUTTON_REC | BUTTON_REL) |
128 | #define MPEG_STOP BUTTON_POWER | 128 | #define MPEG_STOP BUTTON_POWER |
129 | #define MPEG_PAUSE BUTTON_PLAY | 129 | #define MPEG_PAUSE BUTTON_PLAY |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index c9120e4fe5..ee534313d1 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -107,7 +107,7 @@ PLUGIN_HEADER | |||
107 | #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_UP | 107 | #define OSCILLOSCOPE_VOL_UP BUTTON_SCROLL_UP |
108 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_DOWN | 108 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_SCROLL_DOWN |
109 | 109 | ||
110 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 110 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
111 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 111 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
112 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT | 112 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT |
113 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) | 113 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index c326f9add8..4b8ec41ce5 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -76,7 +76,7 @@ | |||
76 | #define PACMAN_COIN BUTTON_A | 76 | #define PACMAN_COIN BUTTON_A |
77 | #define PACMAN_MENU BUTTON_MENU | 77 | #define PACMAN_MENU BUTTON_MENU |
78 | 78 | ||
79 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 79 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
80 | 80 | ||
81 | #define PACMAN_UP BUTTON_RIGHT | 81 | #define PACMAN_UP BUTTON_RIGHT |
82 | #define PACMAN_DOWN BUTTON_LEFT | 82 | #define PACMAN_DOWN BUTTON_LEFT |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index ff410528d4..d5decd1e2e 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -65,7 +65,7 @@ static int plasma_frequency; | |||
65 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 65 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
66 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 66 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
67 | 67 | ||
68 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 68 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
69 | #define PLASMA_QUIT BUTTON_POWER | 69 | #define PLASMA_QUIT BUTTON_POWER |
70 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 70 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
71 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 71 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
@@ -83,7 +83,7 @@ static int plasma_frequency; | |||
83 | #endif | 83 | #endif |
84 | 84 | ||
85 | #ifdef HAVE_LCD_COLOR | 85 | #ifdef HAVE_LCD_COLOR |
86 | #if CONFIG_KEYPAD == IAUDIO_X5_PAD | 86 | #if CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
87 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | 87 | #define PLASMA_REGEN_COLORS BUTTON_PLAY |
88 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 88 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
89 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | 89 | #define PLASMA_REGEN_COLORS BUTTON_PLAY |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index b799a0a37a..b332dd6de9 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -84,7 +84,7 @@ PLUGIN_HEADER | |||
84 | #define PONG_RIGHT_UP BUTTON_RIGHT | 84 | #define PONG_RIGHT_UP BUTTON_RIGHT |
85 | #define PONG_RIGHT_DOWN BUTTON_PLAY | 85 | #define PONG_RIGHT_DOWN BUTTON_PLAY |
86 | 86 | ||
87 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 87 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
88 | #define PONG_QUIT BUTTON_POWER | 88 | #define PONG_QUIT BUTTON_POWER |
89 | #define PONG_LEFT_UP BUTTON_UP | 89 | #define PONG_LEFT_UP BUTTON_UP |
90 | #define PONG_LEFT_DOWN BUTTON_DOWN | 90 | #define PONG_LEFT_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/random_folder_advance_config.c b/apps/plugins/random_folder_advance_config.c index cd3bf9f1c2..3b387537b4 100644 --- a/apps/plugins/random_folder_advance_config.c +++ b/apps/plugins/random_folder_advance_config.c | |||
@@ -46,7 +46,7 @@ struct file_format *list = NULL; | |||
46 | 46 | ||
47 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 47 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
48 | 48 | ||
49 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 49 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
50 | 50 | ||
51 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 51 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
52 | 52 | ||
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index c137814831..dda8987c36 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -96,7 +96,7 @@ PLUGIN_HEADER | |||
96 | #define ROCKBLOX_DROP_PRE BUTTON_MENU | 96 | #define ROCKBLOX_DROP_PRE BUTTON_MENU |
97 | #define ROCKBLOX_DROP (BUTTON_MENU|BUTTON_REL) | 97 | #define ROCKBLOX_DROP (BUTTON_MENU|BUTTON_REL) |
98 | 98 | ||
99 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 99 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
100 | 100 | ||
101 | #define ROCKBLOX_OFF BUTTON_POWER | 101 | #define ROCKBLOX_OFF BUTTON_POWER |
102 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP | 102 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 9b514a4978..1534173114 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -136,7 +136,7 @@ void setoptions (void) | |||
136 | options.START=BUTTON_SCROLL_UP; | 136 | options.START=BUTTON_SCROLL_UP; |
137 | options.SELECT=BUTTON_SCROLL_DOWN; | 137 | options.SELECT=BUTTON_SCROLL_DOWN; |
138 | options.MENU=BUTTON_POWER; | 138 | options.MENU=BUTTON_POWER; |
139 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 139 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
140 | options.A=BUTTON_PLAY; | 140 | options.A=BUTTON_PLAY; |
141 | options.B=BUTTON_REC; | 141 | options.B=BUTTON_REC; |
142 | options.START=BUTTON_SELECT; | 142 | options.START=BUTTON_SELECT; |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 2881c64309..34d9847042 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -59,7 +59,7 @@ PLUGIN_HEADER | |||
59 | #define ROCKPAINT_LEFT BUTTON_LEFT | 59 | #define ROCKPAINT_LEFT BUTTON_LEFT |
60 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 60 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
61 | 61 | ||
62 | #elif ( CONFIG_KEYPAD == IAUDIO_X5_PAD ) | 62 | #elif ( CONFIG_KEYPAD == IAUDIO_X5M5_PAD ) |
63 | #define ROCKPAINT_QUIT BUTTON_POWER | 63 | #define ROCKPAINT_QUIT BUTTON_POWER |
64 | #define ROCKPAINT_DRAW BUTTON_SELECT | 64 | #define ROCKPAINT_DRAW BUTTON_SELECT |
65 | #define ROCKPAINT_MENU BUTTON_PLAY | 65 | #define ROCKPAINT_MENU BUTTON_PLAY |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 1fccdade12..dfc0811506 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -62,7 +62,7 @@ PLUGIN_HEADER | |||
62 | #define PUZZLE_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) | 62 | #define PUZZLE_SHUFFLE (BUTTON_SELECT | BUTTON_LEFT) |
63 | #define PUZZLE_PICTURE (BUTTON_SELECT | BUTTON_RIGHT) | 63 | #define PUZZLE_PICTURE (BUTTON_SELECT | BUTTON_RIGHT) |
64 | 64 | ||
65 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 65 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
66 | #define PUZZLE_QUIT BUTTON_POWER | 66 | #define PUZZLE_QUIT BUTTON_POWER |
67 | #define PUZZLE_UP BUTTON_UP | 67 | #define PUZZLE_UP BUTTON_UP |
68 | #define PUZZLE_DOWN BUTTON_DOWN | 68 | #define PUZZLE_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 6cf197b4b0..7551e59e40 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -70,7 +70,7 @@ PLUGIN_HEADER | |||
70 | #define SNAKE_DOWN BUTTON_PLAY | 70 | #define SNAKE_DOWN BUTTON_PLAY |
71 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | 71 | #define SNAKE_PLAYPAUSE BUTTON_SELECT |
72 | 72 | ||
73 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 73 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
74 | #define SNAKE_QUIT BUTTON_POWER | 74 | #define SNAKE_QUIT BUTTON_POWER |
75 | #define SNAKE_UP BUTTON_UP | 75 | #define SNAKE_UP BUTTON_UP |
76 | #define SNAKE_DOWN BUTTON_DOWN | 76 | #define SNAKE_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 350beb6dc1..cd4037ae70 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -207,7 +207,7 @@ PLUGIN_HEADER | |||
207 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT | 207 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT |
208 | #define SNAKE2_PLAYPAUSE_TEXT "Select" | 208 | #define SNAKE2_PLAYPAUSE_TEXT "Select" |
209 | 209 | ||
210 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 210 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
211 | #define SNAKE2_UP BUTTON_UP | 211 | #define SNAKE2_UP BUTTON_UP |
212 | #define SNAKE2_DOWN BUTTON_DOWN | 212 | #define SNAKE2_DOWN BUTTON_DOWN |
213 | #define SNAKE2_QUIT BUTTON_POWER | 213 | #define SNAKE2_QUIT BUTTON_POWER |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 64d3f2430b..555389019a 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -41,7 +41,7 @@ PLUGIN_HEADER | |||
41 | #define SNOW_QUIT BUTTON_MENU | 41 | #define SNOW_QUIT BUTTON_MENU |
42 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 42 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
43 | #define SNOW_QUIT BUTTON_PLAY | 43 | #define SNOW_QUIT BUTTON_PLAY |
44 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 44 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
45 | #define SNOW_QUIT BUTTON_POWER | 45 | #define SNOW_QUIT BUTTON_POWER |
46 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 46 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
47 | #define SNOW_QUIT BUTTON_A | 47 | #define SNOW_QUIT BUTTON_A |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 6892e83f31..d9c3e64a03 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -124,7 +124,7 @@ enum { | |||
124 | 124 | ||
125 | /* fixme: if/when simultaneous button presses work for X5, | 125 | /* fixme: if/when simultaneous button presses work for X5, |
126 | add redo & level repeat */ | 126 | add redo & level repeat */ |
127 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 127 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
128 | #define SOKOBAN_UP BUTTON_UP | 128 | #define SOKOBAN_UP BUTTON_UP |
129 | #define SOKOBAN_DOWN BUTTON_DOWN | 129 | #define SOKOBAN_DOWN BUTTON_DOWN |
130 | #define SOKOBAN_QUIT BUTTON_POWER | 130 | #define SOKOBAN_QUIT BUTTON_POWER |
@@ -961,7 +961,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
961 | rb->lcd_putsxy(3, 26, "[SELECT+PLAY] Redo"); | 961 | rb->lcd_putsxy(3, 26, "[SELECT+PLAY] Redo"); |
962 | rb->lcd_putsxy(3, 36, "[SELECT+LEFT] Down a Level"); | 962 | rb->lcd_putsxy(3, 36, "[SELECT+LEFT] Down a Level"); |
963 | rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Up a Level"); | 963 | rb->lcd_putsxy(3, 46, "[SELECT+RIGHT] Up a Level"); |
964 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 964 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
965 | rb->lcd_putsxy(3, 6, "[POWER] Quit"); | 965 | rb->lcd_putsxy(3, 6, "[POWER] Quit"); |
966 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); | 966 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); |
967 | rb->lcd_putsxy(3, 26, "[REC] Down a Level"); | 967 | rb->lcd_putsxy(3, 26, "[REC] Down a Level"); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index da01f0f608..b6bf23ca68 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -154,7 +154,7 @@ static struct plugin_api* rb; | |||
154 | # define HK_CUR2STACK "MENU.." | 154 | # define HK_CUR2STACK "MENU.." |
155 | # define HK_REM2STACK "RIGHT.." | 155 | # define HK_REM2STACK "RIGHT.." |
156 | 156 | ||
157 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 157 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
158 | # define SOL_QUIT BUTTON_POWER | 158 | # define SOL_QUIT BUTTON_POWER |
159 | # define SOL_UP BUTTON_UP | 159 | # define SOL_UP BUTTON_UP |
160 | # define SOL_DOWN BUTTON_DOWN | 160 | # define SOL_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 6f478987fe..74e65d8185 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -80,7 +80,7 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
80 | 80 | ||
81 | #define AST_RC_QUIT BUTTON_RC_STOP | 81 | #define AST_RC_QUIT BUTTON_RC_STOP |
82 | 82 | ||
83 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 83 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
84 | #define AST_PAUSE BUTTON_PLAY | 84 | #define AST_PAUSE BUTTON_PLAY |
85 | #define AST_QUIT BUTTON_POWER | 85 | #define AST_QUIT BUTTON_POWER |
86 | #define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT | 86 | #define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT |
@@ -156,7 +156,7 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
156 | #define LARGE_LCD 0 | 156 | #define LARGE_LCD 0 |
157 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 157 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
158 | (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ | 158 | (CONFIG_KEYPAD == IRIVER_H300_PAD) || \ |
159 | (CONFIG_KEYPAD == IAUDIO_X5_PAD) || \ | 159 | (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || \ |
160 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 160 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
161 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 161 | (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
162 | (CONFIG_KEYPAD == GIGABEAT_PAD)|| \ | 162 | (CONFIG_KEYPAD == GIGABEAT_PAD)|| \ |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 0287794031..03c0422158 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -123,7 +123,7 @@ PLUGIN_HEADER | |||
123 | #define STAR_MENU_RUN BUTTON_RIGHT | 123 | #define STAR_MENU_RUN BUTTON_RIGHT |
124 | #define STAR_MENU_RUN2 BUTTON_SELECT | 124 | #define STAR_MENU_RUN2 BUTTON_SELECT |
125 | 125 | ||
126 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 126 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
127 | 127 | ||
128 | #define STAR_QUIT BUTTON_POWER | 128 | #define STAR_QUIT BUTTON_POWER |
129 | #define STAR_UP BUTTON_UP | 129 | #define STAR_UP BUTTON_UP |
@@ -1061,7 +1061,7 @@ static int star_menu(void) | |||
1061 | "[S <] Prev. level\n" | 1061 | "[S <] Prev. level\n" |
1062 | "[S + PLAY] Reset level\n" | 1062 | "[S + PLAY] Reset level\n" |
1063 | "[S >] Next level", true); | 1063 | "[S >] Next level", true); |
1064 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 1064 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
1065 | star_display_text("KEYS\n\n" | 1065 | star_display_text("KEYS\n\n" |
1066 | "[SELECT] Toggle Ctl\n" | 1066 | "[SELECT] Toggle Ctl\n" |
1067 | "[POWER] Exit\n" | 1067 | "[POWER] Exit\n" |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 93e4cac6ab..0c3acec8fc 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -33,7 +33,7 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
33 | #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK | 33 | #define STARFIELD_DECREASE_ZMOVE BUTTON_SCROLL_BACK |
34 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT | 34 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT |
35 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT | 35 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT |
36 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 36 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
37 | #define STARFIELD_QUIT BUTTON_POWER | 37 | #define STARFIELD_QUIT BUTTON_POWER |
38 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | 38 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP |
39 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | 39 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index b69ab2d8e0..5625f7247a 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -48,7 +48,7 @@ static int fontwidth, fontheight; | |||
48 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 48 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
49 | #define STATS_STOP BUTTON_PLAY | 49 | #define STATS_STOP BUTTON_PLAY |
50 | 50 | ||
51 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 51 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
52 | #define STATS_STOP BUTTON_POWER | 52 | #define STATS_STOP BUTTON_POWER |
53 | #define STATS_STOP_REMOTE BUTTON_RC_PLAY | 53 | #define STATS_STOP_REMOTE BUTTON_RC_PLAY |
54 | 54 | ||
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index d113af7f25..e0ae300d23 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -88,7 +88,7 @@ PLUGIN_HEADER | |||
88 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT | 88 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT |
89 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 89 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
90 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 90 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
91 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 91 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
92 | #define STOPWATCH_QUIT BUTTON_POWER | 92 | #define STOPWATCH_QUIT BUTTON_POWER |
93 | #define STOPWATCH_START_STOP BUTTON_PLAY | 93 | #define STOPWATCH_START_STOP BUTTON_PLAY |
94 | #define STOPWATCH_RESET_TIMER BUTTON_REC | 94 | #define STOPWATCH_RESET_TIMER BUTTON_REC |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 04923be18e..94fae58d9a 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -80,7 +80,7 @@ | |||
80 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_LEFT | 80 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_LEFT |
81 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | 81 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
82 | 82 | ||
83 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 83 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
84 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 84 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
85 | #define SUDOKU_BUTTON_UP BUTTON_UP | 85 | #define SUDOKU_BUTTON_UP BUTTON_UP |
86 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 86 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index c12c1d41d2..4c5e37e56e 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -151,7 +151,7 @@ PLUGIN_HEADER | |||
151 | #define VIEWER_AUTOSCROLL BUTTON_SELECT | 151 | #define VIEWER_AUTOSCROLL BUTTON_SELECT |
152 | 152 | ||
153 | /* iAudio X5 keys */ | 153 | /* iAudio X5 keys */ |
154 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 154 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
155 | #define VIEWER_QUIT BUTTON_POWER | 155 | #define VIEWER_QUIT BUTTON_POWER |
156 | #define VIEWER_PAGE_UP BUTTON_UP | 156 | #define VIEWER_PAGE_UP BUTTON_UP |
157 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | 157 | #define VIEWER_PAGE_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 0f1f72cbc5..fff64d4b7f 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -105,7 +105,7 @@ PLUGIN_HEADER | |||
105 | #define VUMETER_UP BUTTON_UP | 105 | #define VUMETER_UP BUTTON_UP |
106 | #define VUMETER_DOWN BUTTON_DOWN | 106 | #define VUMETER_DOWN BUTTON_DOWN |
107 | 107 | ||
108 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 108 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
109 | #define VUMETER_QUIT BUTTON_POWER | 109 | #define VUMETER_QUIT BUTTON_POWER |
110 | #define VUMETER_HELP BUTTON_PLAY | 110 | #define VUMETER_HELP BUTTON_PLAY |
111 | #define VUMETER_MENU BUTTON_SELECT | 111 | #define VUMETER_MENU BUTTON_SELECT |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 22f49e2298..dce4931de6 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -119,7 +119,7 @@ PLUGIN_HEADER | |||
119 | #define PLAYERS_TEXT "Up/Down" | 119 | #define PLAYERS_TEXT "Up/Down" |
120 | #define WORMS_TEXT "Left/Right" | 120 | #define WORMS_TEXT "Left/Right" |
121 | 121 | ||
122 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 122 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
123 | 123 | ||
124 | #define BTN_DIR_UP BUTTON_UP | 124 | #define BTN_DIR_UP BUTTON_UP |
125 | #define BTN_DIR_DOWN BUTTON_DOWN | 125 | #define BTN_DIR_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index bfbadd2e6c..df7a65b2eb 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -56,7 +56,7 @@ PLUGIN_HEADER | |||
56 | #define UP BUTTON_MENU | 56 | #define UP BUTTON_MENU |
57 | #define DOWN BUTTON_PLAY | 57 | #define DOWN BUTTON_PLAY |
58 | 58 | ||
59 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 59 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
60 | 60 | ||
61 | #define QUIT BUTTON_POWER | 61 | #define QUIT BUTTON_POWER |
62 | #define LEFT BUTTON_LEFT | 62 | #define LEFT BUTTON_LEFT |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index a967b3ab73..9bac74726c 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #define ZX_SELECT BUTTON_SELECT | 28 | #define ZX_SELECT BUTTON_SELECT |
29 | #define ZX_MENU BUTTON_MENU | 29 | #define ZX_MENU BUTTON_MENU |
30 | 30 | ||
31 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 31 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
32 | 32 | ||
33 | #define ZX_RIGHT BUTTON_RIGHT | 33 | #define ZX_RIGHT BUTTON_RIGHT |
34 | #define ZX_LEFT BUTTON_LEFT | 34 | #define ZX_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 693e48ba73..9bfcf5c4b0 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -68,7 +68,7 @@ | |||
68 | #define KBD_UP BUTTON_UP | 68 | #define KBD_UP BUTTON_UP |
69 | #define KBD_DOWN BUTTON_DOWN | 69 | #define KBD_DOWN BUTTON_DOWN |
70 | 70 | ||
71 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 71 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
72 | 72 | ||
73 | /* TODO: Check keyboard mappings */ | 73 | /* TODO: Check keyboard mappings */ |
74 | 74 | ||
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 0aa7188c01..9856e80d4a 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -63,7 +63,7 @@ | |||
63 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 63 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
64 | #define KBD_MODES /* iFP7xx uses 2 modes, picker and line edit */ | 64 | #define KBD_MODES /* iFP7xx uses 2 modes, picker and line edit */ |
65 | 65 | ||
66 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | 66 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
67 | #define KBD_MODES /* iAudio X5 uses 2 modes, picker and line edit */ | 67 | #define KBD_MODES /* iAudio X5 uses 2 modes, picker and line edit */ |
68 | 68 | ||
69 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 69 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 47ca978475..ed14a4e282 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -79,7 +79,7 @@ | |||
79 | #define FM_NEXT_PRESET | 79 | #define FM_NEXT_PRESET |
80 | #define FM_PREV_PRESET | 80 | #define FM_PREV_PRESET |
81 | 81 | ||
82 | #elif (CONFIG_KEYPAD == IAUDIO_X5_PAD) | 82 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) |
83 | #define FM_PRESET | 83 | #define FM_PRESET |
84 | #define FM_MODE | 84 | #define FM_MODE |
85 | /* This should be removeable if the whole tuning thing is sorted out since | 85 | /* This should be removeable if the whole tuning thing is sorted out since |