summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/battery_bench.c7
-rw-r--r--apps/plugins/calculator.c13
-rw-r--r--apps/plugins/chessclock.c11
-rw-r--r--apps/plugins/chopper.c6
-rw-r--r--apps/plugins/clix.c8
-rw-r--r--apps/plugins/cube.c10
-rw-r--r--apps/plugins/doom/i_video.c10
-rw-r--r--apps/plugins/imageviewer/imageviewer_button.h11
-rw-r--r--apps/plugins/invadrox.c7
-rw-r--r--apps/plugins/jewels.c10
-rw-r--r--apps/plugins/lib/pluginlib_actions.c15
-rw-r--r--apps/plugins/midi/midiplay.c8
-rw-r--r--apps/plugins/mp3_encoder.c6
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c8
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
-rw-r--r--apps/plugins/pacbox/pacbox.h12
-rw-r--r--apps/plugins/pictureflow/pictureflow.c8
-rw-r--r--apps/plugins/plugin.lds12
-rw-r--r--apps/plugins/pong.c8
-rw-r--r--apps/plugins/reversi/reversi-gui.h9
-rw-r--r--apps/plugins/rockblox.c11
-rw-r--r--apps/plugins/sokoban.c14
-rw-r--r--apps/plugins/stopwatch.c9
-rw-r--r--apps/plugins/sudoku/sudoku.h10
-rw-r--r--apps/plugins/text_viewer/tv_button.h12
-rw-r--r--apps/plugins/xobox.c9
-rw-r--r--apps/plugins/zxbox/keymaps.h8
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c9
28 files changed, 8 insertions, 262 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index f8269f5c3b..d9c5eae516 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -141,13 +141,6 @@
141#define BATTERY_OFF BUTTON_POWER 141#define BATTERY_OFF BUTTON_POWER
142#define BATTERY_OFF_TXT "POWER" 142#define BATTERY_OFF_TXT "POWER"
143 143
144#elif CONFIG_KEYPAD == IAUDIO67_PAD
145
146#define BATTERY_OFF BUTTON_POWER
147#define BATTERY_OFF_TXT "POWER"
148#define BATTERY_ON BUTTON_PLAY
149#define BATTERY_ON_TXT "PLAY - start"
150
151#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 144#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
152#define BATTERY_ON BUTTON_PLAY 145#define BATTERY_ON BUTTON_PLAY
153#define BATTERY_ON_TXT "PLAY - start" 146#define BATTERY_ON_TXT "PLAY - start"
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c
index 4d1b6fa594..ebf7098d65 100644
--- a/apps/plugins/calculator.c
+++ b/apps/plugins/calculator.c
@@ -269,19 +269,6 @@ F3: equal to "="
269#define CALCULATOR_QUIT BUTTON_POWER 269#define CALCULATOR_QUIT BUTTON_POWER
270#define CALCULATOR_CLEAR BUTTON_MENU 270#define CALCULATOR_CLEAR BUTTON_MENU
271 271
272#elif CONFIG_KEYPAD == IAUDIO67_PAD
273
274#define CALCULATOR_LEFT BUTTON_LEFT
275#define CALCULATOR_RIGHT BUTTON_RIGHT
276#define CALCULATOR_UP BUTTON_VOLUP
277#define CALCULATOR_DOWN BUTTON_VOLDOWN
278#define CALCULATOR_QUIT BUTTON_POWER
279#define CALCULATOR_INPUT BUTTON_PLAY
280#define CALCULATOR_CALC BUTTON_MENU
281#define CALCULATOR_CLEAR BUTTON_STOP
282
283#define CALCULATOR_RC_QUIT (BUTTON_MENU|BUTTON_PLAY)
284
285#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) 272#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
286 273
287#define CALCULATOR_LEFT BUTTON_LEFT 274#define CALCULATOR_LEFT BUTTON_LEFT
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 9a30dee984..79daf0987c 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -157,17 +157,6 @@
157#define CHC_SETTINGS_DEC BUTTON_MINUS 157#define CHC_SETTINGS_DEC BUTTON_MINUS
158#define CHC_SETTINGS_CANCEL BUTTON_POWER 158#define CHC_SETTINGS_CANCEL BUTTON_POWER
159 159
160#elif CONFIG_KEYPAD == IAUDIO67_PAD
161#define CHC_QUIT BUTTON_POWER
162#define CHC_STARTSTOP BUTTON_PLAY
163#define CHC_RESET BUTTON_LEFT
164#define CHC_MENU BUTTON_MENU
165#define CHC_SETTINGS_INC BUTTON_VOLUP
166#define CHC_SETTINGS_DEC BUTTON_VOLDOWN
167#define CHC_SETTINGS_OK BUTTON_PLAY
168#define CHC_SETTINGS_OK2 BUTTON_LEFT
169#define CHC_SETTINGS_CANCEL BUTTON_POWER
170
171#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 160#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
172#define CHC_QUIT BUTTON_BACK 161#define CHC_QUIT BUTTON_BACK
173#define CHC_STARTSTOP BUTTON_PLAY 162#define CHC_STARTSTOP BUTTON_PLAY
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index ab8f7b5540..70763a1b67 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -108,12 +108,6 @@ Still To do:
108#define QUIT BUTTON_POWER 108#define QUIT BUTTON_POWER
109#define ACTION2 BUTTON_PLUS 109#define ACTION2 BUTTON_PLUS
110 110
111#elif CONFIG_KEYPAD == IAUDIO67_PAD
112#define QUIT BUTTON_POWER
113#define ACTION BUTTON_PLAY
114#define ACTION2 BUTTON_STOP
115#define ACTIONTEXT "PLAY"
116
117#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 111#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
118#define QUIT BUTTON_BACK 112#define QUIT BUTTON_BACK
119#define ACTION BUTTON_UP 113#define ACTION BUTTON_UP
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index f1f21f6312..c127a300f2 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -100,14 +100,6 @@
100#define CLIX_BUTTON_UP BUTTON_SCROLL_UP 100#define CLIX_BUTTON_UP BUTTON_SCROLL_UP
101#define CLIX_BUTTON_DOWN BUTTON_SCROLL_DOWN 101#define CLIX_BUTTON_DOWN BUTTON_SCROLL_DOWN
102 102
103#elif CONFIG_KEYPAD == IAUDIO67_PAD
104#define CLIX_BUTTON_QUIT BUTTON_POWER
105#define CLIX_BUTTON_LEFT BUTTON_LEFT
106#define CLIX_BUTTON_RIGHT BUTTON_RIGHT
107#define CLIX_BUTTON_CLICK BUTTON_PLAY
108#define CLIX_BUTTON_UP BUTTON_STOP
109#define CLIX_BUTTON_DOWN BUTTON_PLAY
110
111#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD 103#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
112#define CLIX_BUTTON_QUIT BUTTON_POWER 104#define CLIX_BUTTON_QUIT BUTTON_POWER
113#define CLIX_BUTTON_LEFT BUTTON_LEFT 105#define CLIX_BUTTON_LEFT BUTTON_LEFT
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 6587fdcb65..cb9d67ec35 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -171,16 +171,6 @@
171#elif CONFIG_KEYPAD == COWON_D2_PAD 171#elif CONFIG_KEYPAD == COWON_D2_PAD
172#define CUBE_QUIT BUTTON_POWER 172#define CUBE_QUIT BUTTON_POWER
173 173
174#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
175#define CUBE_QUIT BUTTON_POWER
176#define CUBE_NEXT BUTTON_RIGHT
177#define CUBE_PREV BUTTON_LEFT
178#define CUBE_INC BUTTON_VOLUP
179#define CUBE_DEC BUTTON_VOLDOWN
180#define CUBE_MODE BUTTON_MENU
181#define CUBE_PAUSE BUTTON_PLAY
182#define CUBE_HIGHSPEED BUTTON_STOP
183
184#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 174#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
185#define CUBE_QUIT BUTTON_BACK 175#define CUBE_QUIT BUTTON_BACK
186#define CUBE_NEXT BUTTON_RIGHT 176#define CUBE_NEXT BUTTON_RIGHT
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index bb04194acc..2381a7614d 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -316,16 +316,6 @@ void I_ShutdownGraphics(void)
316#define DOOMBUTTON_ENTER BUTTON_MENU 316#define DOOMBUTTON_ENTER BUTTON_MENU
317#define DOOMBUTTON_WEAPON BUTTON_DISPLAY 317#define DOOMBUTTON_WEAPON BUTTON_DISPLAY
318 318
319#elif CONFIG_KEYPAD == IAUDIO67_PAD
320#define DOOMBUTTON_ESC BUTTON_POWER
321#define DOOMBUTTON_UP BUTTON_STOP
322#define DOOMBUTTON_DOWN BUTTON_PLAY
323#define DOOMBUTTON_LEFT BUTTON_LEFT
324#define DOOMBUTTON_RIGHT BUTTON_RIGHT
325#define DOOMBUTTON_SHOOT BUTTON_VOLUP
326#define DOOMBUTTON_OPEN BUTTON_VOLDOWN
327#define DOOMBUTTON_ENTER BUTTON_MENU
328
329#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 319#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
330#define DOOMBUTTON_UP BUTTON_UP 320#define DOOMBUTTON_UP BUTTON_UP
331#define DOOMBUTTON_DOWN BUTTON_DOWN 321#define DOOMBUTTON_DOWN BUTTON_DOWN
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index cfb9a2969b..d588de95ca 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -207,17 +207,6 @@
207 207
208#elif CONFIG_KEYPAD == COWON_D2_PAD 208#elif CONFIG_KEYPAD == COWON_D2_PAD
209 209
210#elif CONFIG_KEYPAD == IAUDIO67_PAD
211#define IMGVIEW_ZOOM_IN BUTTON_VOLUP
212#define IMGVIEW_ZOOM_OUT BUTTON_VOLDOWN
213#define IMGVIEW_UP BUTTON_STOP
214#define IMGVIEW_DOWN BUTTON_PLAY
215#define IMGVIEW_LEFT BUTTON_LEFT
216#define IMGVIEW_RIGHT BUTTON_RIGHT
217#define IMGVIEW_NEXT (BUTTON_PLAY|BUTTON_VOLUP)
218#define IMGVIEW_PREVIOUS (BUTTON_PLAY|BUTTON_VOLDOWN)
219#define IMGVIEW_MENU BUTTON_MENU
220
221#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 210#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
222 211
223#define IMGVIEW_ZOOM_IN BUTTON_PLAY 212#define IMGVIEW_ZOOM_IN BUTTON_PLAY
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 8b0519d9d0..c28ab7e830 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -163,13 +163,6 @@
163#define RIGHT BUTTON_PLUS 163#define RIGHT BUTTON_PLUS
164#define FIRE BUTTON_MENU 164#define FIRE BUTTON_MENU
165 165
166#elif CONFIG_KEYPAD == IAUDIO67_PAD
167
168#define QUIT BUTTON_POWER
169#define LEFT BUTTON_LEFT
170#define RIGHT BUTTON_RIGHT
171#define FIRE BUTTON_PLAY
172
173#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 166#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
174 167
175#define QUIT BUTTON_BACK 168#define QUIT BUTTON_BACK
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index 83a44eea02..af0189e9db 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -201,16 +201,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
201#define JEWELS_CANCEL BUTTON_POWER 201#define JEWELS_CANCEL BUTTON_POWER
202#define HK_CANCEL "POWER" 202#define HK_CANCEL "POWER"
203 203
204#elif CONFIG_KEYPAD == IAUDIO67_PAD
205#define JEWELS_UP BUTTON_STOP
206#define JEWELS_DOWN BUTTON_PLAY
207#define JEWELS_LEFT BUTTON_LEFT
208#define JEWELS_RIGHT BUTTON_RIGHT
209#define JEWELS_SELECT BUTTON_MENU
210#define JEWELS_CANCEL BUTTON_POWER
211#define HK_SELECT "MENU"
212#define HK_CANCEL "POWER"
213
214#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 204#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
215#define JEWELS_UP BUTTON_UP 205#define JEWELS_UP BUTTON_UP
216#define JEWELS_DOWN BUTTON_DOWN 206#define JEWELS_DOWN BUTTON_DOWN
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index b1bcd06ee6..907cb3ee42 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -161,15 +161,6 @@ const struct button_mapping pla_main_ctx[] =
161 { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 161 { PLA_DOWN_REPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
162 { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, 162 { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE },
163 { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 163 { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
164#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
165 { PLA_UP, BUTTON_STOP, BUTTON_NONE },
166 { PLA_DOWN, BUTTON_PLAY, BUTTON_NONE },
167 { PLA_LEFT, BUTTON_LEFT, BUTTON_NONE },
168 { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE },
169 { PLA_UP_REPEAT, BUTTON_STOP|BUTTON_REPEAT, BUTTON_NONE },
170 { PLA_DOWN_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE },
171 { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
172 { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
173#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD) 164#elif (CONFIG_KEYPAD == PBELL_VIBE500_PAD)
174 { PLA_UP, BUTTON_UP, BUTTON_NONE}, 165 { PLA_UP, BUTTON_UP, BUTTON_NONE},
175 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE}, 166 { PLA_DOWN, BUTTON_DOWN, BUTTON_NONE},
@@ -394,12 +385,6 @@ const struct button_mapping pla_main_ctx[] =
394 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, 385 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
395 {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, 386 {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
396 {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, 387 {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
397#elif (CONFIG_KEYPAD == IAUDIO67_PAD)
398 {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER},
399 {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE},
400 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
401 {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY},
402 {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT BUTTON_NONE},
403#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD) 388#elif (CONFIG_KEYPAD == CREATIVEZVM_PAD)
404 {PLA_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK}, 389 {PLA_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK},
405 {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, 390 {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE},
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index f07cdd4dcf..a28d1d3862 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -140,14 +140,6 @@
140#elif CONFIG_KEYPAD == COWON_D2_PAD 140#elif CONFIG_KEYPAD == COWON_D2_PAD
141#define MIDI_QUIT BUTTON_POWER 141#define MIDI_QUIT BUTTON_POWER
142 142
143#elif CONFIG_KEYPAD == IAUDIO67_PAD
144#define MIDI_QUIT BUTTON_POWER
145#define MIDI_FFWD BUTTON_RIGHT
146#define MIDI_REWIND BUTTON_LEFT
147#define MIDI_VOL_UP BUTTON_STOP
148#define MIDI_VOL_DOWN BUTTON_PLAY
149#define MIDI_PLAYPAUSE BUTTON_MENU
150
151#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 143#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
152#define MIDI_QUIT BUTTON_BACK 144#define MIDI_QUIT BUTTON_BACK
153#define MIDI_FFWD BUTTON_RIGHT 145#define MIDI_FFWD BUTTON_RIGHT
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 7c5084529b..db10185c91 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2443,12 +2443,6 @@ static void get_mp3_filename(const char *wav_name)
2443#elif CONFIG_KEYPAD == COWON_D2_PAD 2443#elif CONFIG_KEYPAD == COWON_D2_PAD
2444#define MP3ENC_DONE BUTTON_POWER 2444#define MP3ENC_DONE BUTTON_POWER
2445 2445
2446#elif CONFIG_KEYPAD == IAUDIO67_PAD
2447#define MP3ENC_PREV BUTTON_LEFT
2448#define MP3ENC_NEXT BUTTON_RIGHT
2449#define MP3ENC_DONE BUTTON_POWER
2450#define MP3ENC_SELECT BUTTON_PLAY
2451
2452#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 2446#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
2453#define MP3ENC_PREV BUTTON_UP 2447#define MP3ENC_PREV BUTTON_UP
2454#define MP3ENC_NEXT BUTTON_DOWN 2448#define MP3ENC_NEXT BUTTON_DOWN
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index d59797eaa7..505f3aa33d 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -142,14 +142,6 @@ struct mpeg_settings settings;
142#elif CONFIG_KEYPAD == COWON_D2_PAD 142#elif CONFIG_KEYPAD == COWON_D2_PAD
143#define MPEG_START_TIME_EXIT BUTTON_POWER 143#define MPEG_START_TIME_EXIT BUTTON_POWER
144 144
145#elif CONFIG_KEYPAD == IAUDIO67_PAD
146#define MPEG_START_TIME_SELECT BUTTON_MENU
147#define MPEG_START_TIME_LEFT BUTTON_LEFT
148#define MPEG_START_TIME_RIGHT BUTTON_RIGHT
149#define MPEG_START_TIME_UP BUTTON_STOP
150#define MPEG_START_TIME_DOWN BUTTON_PLAY
151#define MPEG_START_TIME_EXIT BUTTON_POWER
152
153#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 145#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
154#define MPEG_START_TIME_SELECT BUTTON_SELECT 146#define MPEG_START_TIME_SELECT BUTTON_SELECT
155#define MPEG_START_TIME_LEFT BUTTON_LEFT 147#define MPEG_START_TIME_LEFT BUTTON_LEFT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 6b18e4fa3a..34eafd5d9c 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -254,15 +254,6 @@ CONFIG_KEYPAD == SANSA_M200_PAD
254#define MPEG_VOLDOWN BUTTON_MINUS 254#define MPEG_VOLDOWN BUTTON_MINUS
255#define MPEG_VOLUP BUTTON_PLUS 255#define MPEG_VOLUP BUTTON_PLUS
256 256
257#elif CONFIG_KEYPAD == IAUDIO67_PAD
258#define MPEG_MENU BUTTON_MENU
259#define MPEG_STOP BUTTON_STOP
260#define MPEG_PAUSE BUTTON_PLAY
261#define MPEG_VOLDOWN BUTTON_VOLDOWN
262#define MPEG_VOLUP BUTTON_VOLUP
263#define MPEG_RW BUTTON_LEFT
264#define MPEG_FF BUTTON_RIGHT
265
266#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 257#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
267#define MPEG_MENU BUTTON_MENU 258#define MPEG_MENU BUTTON_MENU
268#define MPEG_STOP BUTTON_BACK 259#define MPEG_STOP BUTTON_BACK
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index c1a1c6b9e5..a3d42b099c 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -169,18 +169,6 @@
169 169
170#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) 170#define PACMAN_MENU (BUTTON_MENU|BUTTON_REL)
171 171
172#elif CONFIG_KEYPAD == IAUDIO67_PAD
173
174#define PACMAN_UP BUTTON_STOP
175#define PACMAN_DOWN BUTTON_PLAY
176#define PACMAN_LEFT BUTTON_LEFT
177#define PACMAN_RIGHT BUTTON_RIGHT
178#define PACMAN_1UP BUTTON_VOLDOWN
179#define PACMAN_2UP BUTTON_VOLUP
180#define PACMAN_COIN_PRE BUTTON_MENU
181#define PACMAN_COIN (BUTTON_MENU | BUTTON_PLAY)
182#define PACMAN_MENU BUTTON_POWER
183
184#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 172#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
185 173
186#define PACMAN_UP BUTTON_UP 174#define PACMAN_UP BUTTON_UP
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 42930f0ff6..8f59695127 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -103,10 +103,8 @@ const struct button_mapping pf_context_buttons[] =
103 {PF_SELECT, BUTTON_CENTER, BUTTON_NONE}, 103 {PF_SELECT, BUTTON_CENTER, BUTTON_NONE},
104 {PF_BACK, BUTTON_BOTTOMRIGHT, BUTTON_NONE}, 104 {PF_BACK, BUTTON_BOTTOMRIGHT, BUTTON_NONE},
105#endif 105#endif
106#if CONFIG_KEYPAD == SANSA_C100_PAD 106#if CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \
107 {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, 107 CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || \
108#elif CONFIG_KEYPAD == CREATIVEZV_PAD || CONFIG_KEYPAD == CREATIVEZVM_PAD || \
109 CONFIG_KEYPAD == PHILIPS_HDD1630_PAD || CONFIG_KEYPAD == IAUDIO67_PAD || \
110 CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \ 108 CONFIG_KEYPAD == GIGABEAT_PAD || CONFIG_KEYPAD == GIGABEAT_S_PAD || \
111 CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \ 109 CONFIG_KEYPAD == MROBE100_PAD || CONFIG_KEYPAD == MROBE500_PAD || \
112 CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \ 110 CONFIG_KEYPAD == PHILIPS_SA9200_PAD || CONFIG_KEYPAD == SANSA_CLIP_PAD || \
@@ -137,8 +135,6 @@ const struct button_mapping pf_context_buttons[] =
137 || (CONFIG_KEYPAD == IPOD_4G_PAD) \ 135 || (CONFIG_KEYPAD == IPOD_4G_PAD) \
138 || (CONFIG_KEYPAD == MPIO_HD300_PAD) 136 || (CONFIG_KEYPAD == MPIO_HD300_PAD)
139 {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, 137 {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU},
140#elif CONFIG_KEYPAD == LOGIK_DAX_PAD
141 {PF_QUIT, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY},
142#elif CONFIG_KEYPAD == IAUDIO_M3_PAD 138#elif CONFIG_KEYPAD == IAUDIO_M3_PAD
143 {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE}, 139 {PF_QUIT, BUTTON_RC_REC, BUTTON_NONE},
144#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD 140#elif CONFIG_KEYPAD == MEIZU_M6SL_PAD
diff --git a/apps/plugins/plugin.lds b/apps/plugins/plugin.lds
index 5931b6b0a5..7033d023f3 100644
--- a/apps/plugins/plugin.lds
+++ b/apps/plugins/plugin.lds
@@ -54,7 +54,7 @@ OUTPUT_FORMAT(elf32-littlemips)
54#elif CONFIG_CPU==S3C2440 54#elif CONFIG_CPU==S3C2440
55#include "cpu.h" 55#include "cpu.h"
56/* must be 16Kb (0x4000) aligned */ 56/* must be 16Kb (0x4000) aligned */
57#define TTB_SIZE (0x4000) 57#define TTB_SIZE (0x4000)
58#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_BUFFER_SIZE - TTB_SIZE 58#define DRAMSIZE (MEMORYSIZE * 0x100000) - STUBOFFSET - PLUGIN_BUFFER_SIZE - CODEC_SIZE - LCD_BUFFER_SIZE - TTB_SIZE
59 59
60#elif CONFIG_CPU==TCC7801 60#elif CONFIG_CPU==TCC7801
@@ -127,7 +127,7 @@ OUTPUT_FORMAT(elf32-littlemips)
127/* The bit of IRAM that is available is used in the core */ 127/* The bit of IRAM that is available is used in the core */
128#define IRAMSIZE 0 128#define IRAMSIZE 0
129 129
130#elif defined(CPU_TCC780X) || defined(CPU_TCC77X) 130#elif defined(CPU_TCC780X)
131#define DRAMORIG 0x20000000 131#define DRAMORIG 0x20000000
132#if CONFIG_CPU==TCC7801 132#if CONFIG_CPU==TCC7801
133#define IRAMORIG 0x1000c000 133#define IRAMORIG 0x1000c000
@@ -272,7 +272,7 @@ SECTIONS
272 *(.idata) 272 *(.idata)
273#endif 273#endif
274 } > PLUGIN_RAM 274 } > PLUGIN_RAM
275 275
276#if NOCACHE_BASE != 0 276#if NOCACHE_BASE != 0
277 .ncdata . + NOCACHE_BASE : 277 .ncdata . + NOCACHE_BASE :
278 { 278 {
@@ -281,7 +281,7 @@ SECTIONS
281 . = ALIGN(CACHEALIGN_SIZE); 281 . = ALIGN(CACHEALIGN_SIZE);
282/* EABI currently needs these defined here, otherwise .iram and .bss can 282/* EABI currently needs these defined here, otherwise .iram and .bss can
283 sometimes have an incorrect load address, breaking codecs and plugins. */ 283 sometimes have an incorrect load address, breaking codecs and plugins. */
284 bssaddr = . - NOCACHE_BASE; 284 bssaddr = . - NOCACHE_BASE;
285#if defined(IRAMSIZE) && IRAMSIZE != 0 285#if defined(IRAMSIZE) && IRAMSIZE != 0
286 iramcopy = . - NOCACHE_BASE; 286 iramcopy = . - NOCACHE_BASE;
287#endif 287#endif
@@ -314,7 +314,7 @@ SECTIONS
314 *(COMMON) 314 *(COMMON)
315 . = ALIGN(0x4); 315 . = ALIGN(0x4);
316 } > PLUGIN_RAM 316 } > PLUGIN_RAM
317 317
318#if NOCACHE_BASE != 0 318#if NOCACHE_BASE != 0
319 .ncbss . + NOCACHE_BASE (NOLOAD) : 319 .ncbss . + NOCACHE_BASE (NOLOAD) :
320 { 320 {
@@ -354,7 +354,7 @@ SECTIONS
354 . = ALIGN(0x4); 354 . = ALIGN(0x4);
355 iend = .; 355 iend = .;
356 } > PLUGIN_IRAM 356 } > PLUGIN_IRAM
357 357
358 loadendaddr = MAX(plugin_end_addr, LOADADDR(.iram) + SIZEOF(.iram)); 358 loadendaddr = MAX(plugin_end_addr, LOADADDR(.iram) + SIZEOF(.iram));
359#else 359#else
360 loadendaddr = plugin_end_addr; 360 loadendaddr = plugin_end_addr;
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index b06789af6b..22484d0bc9 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -139,14 +139,6 @@
139#elif (CONFIG_KEYPAD == COWON_D2_PAD) 139#elif (CONFIG_KEYPAD == COWON_D2_PAD)
140#define PONG_QUIT BUTTON_POWER 140#define PONG_QUIT BUTTON_POWER
141 141
142#elif CONFIG_KEYPAD == IAUDIO67_PAD
143#define PONG_QUIT BUTTON_POWER
144#define PONG_PAUSE BUTTON_MENU
145#define PONG_LEFT_UP BUTTON_VOLUP
146#define PONG_LEFT_DOWN BUTTON_VOLDOWN
147#define PONG_RIGHT_UP BUTTON_RIGHT
148#define PONG_RIGHT_DOWN BUTTON_LEFT
149
150#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 142#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
151#define PONG_QUIT BUTTON_BACK 143#define PONG_QUIT BUTTON_BACK
152#define PONG_LEFT_UP BUTTON_UP 144#define PONG_LEFT_UP BUTTON_UP
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index fd60b23927..7e031e6103 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -136,15 +136,6 @@
136#define REVERSI_BUTTON_QUIT BUTTON_POWER 136#define REVERSI_BUTTON_QUIT BUTTON_POWER
137#define REVERSI_BUTTON_MENU BUTTON_MENU 137#define REVERSI_BUTTON_MENU BUTTON_MENU
138 138
139#elif CONFIG_KEYPAD == IAUDIO67_PAD
140#define REVERSI_BUTTON_QUIT BUTTON_POWER
141#define REVERSI_BUTTON_UP BUTTON_STOP
142#define REVERSI_BUTTON_DOWN BUTTON_PLAY
143#define REVERSI_BUTTON_LEFT BUTTON_LEFT
144#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
145#define REVERSI_BUTTON_MAKE_MOVE BUTTON_VOLUP
146#define REVERSI_BUTTON_MENU BUTTON_MENU
147
148#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 139#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
149#define REVERSI_BUTTON_QUIT BUTTON_BACK 140#define REVERSI_BUTTON_QUIT BUTTON_BACK
150#define REVERSI_BUTTON_UP BUTTON_UP 141#define REVERSI_BUTTON_UP BUTTON_UP
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 9c36f8f62f..e85c6a5eab 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -205,17 +205,6 @@
205#define ROCKBLOX_OFF BUTTON_POWER 205#define ROCKBLOX_OFF BUTTON_POWER
206#define ROCKBLOX_RESTART BUTTON_MENU 206#define ROCKBLOX_RESTART BUTTON_MENU
207 207
208#elif CONFIG_KEYPAD == IAUDIO67_PAD
209
210#define ROCKBLOX_OFF BUTTON_POWER
211#define ROCKBLOX_ROTATE_CCW BUTTON_VOLDOWN
212#define ROCKBLOX_ROTATE_CW BUTTON_VOLUP
213#define ROCKBLOX_DOWN BUTTON_STOP
214#define ROCKBLOX_LEFT BUTTON_LEFT
215#define ROCKBLOX_RIGHT BUTTON_RIGHT
216#define ROCKBLOX_DROP BUTTON_PLAY
217#define ROCKBLOX_RESTART BUTTON_MENU
218
219#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 208#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
220#define ROCKBLOX_OFF BUTTON_BACK 209#define ROCKBLOX_OFF BUTTON_BACK
221#define ROCKBLOX_ROTATE_CCW BUTTON_UP 210#define ROCKBLOX_ROTATE_CCW BUTTON_UP
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 9d57d7428c..41c671a38c 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -312,20 +312,6 @@
312#define SOKOBAN_LEVEL_UP BUTTON_PLUS 312#define SOKOBAN_LEVEL_UP BUTTON_PLUS
313#define SOKOBAN_MENU_NAME "[MENU]" 313#define SOKOBAN_MENU_NAME "[MENU]"
314 314
315#elif CONFIG_KEYPAD == IAUDIO67_PAD
316#define SOKOBAN_LEFT BUTTON_LEFT
317#define SOKOBAN_RIGHT BUTTON_RIGHT
318#define SOKOBAN_UP BUTTON_STOP
319#define SOKOBAN_DOWN BUTTON_PLAY
320#define SOKOBAN_MENU BUTTON_MENU
321#define SOKOBAN_UNDO BUTTON_VOLDOWN
322#define SOKOBAN_REDO BUTTON_VOLUP
323#define SOKOBAN_PAUSE (BUTTON_MENU|BUTTON_LEFT)
324#define BUTTON_SAVE (BUTTON_MENU|BUTTON_PLAY)
325#define BUTTON_SAVE_NAME "MENU+PLAY"
326
327#define SOKOBAN_RC_MENU (BUTTON_MENU|BUTTON_STOP)
328
329#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 315#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
330#define SOKOBAN_LEFT BUTTON_LEFT 316#define SOKOBAN_LEFT BUTTON_LEFT
331#define SOKOBAN_RIGHT BUTTON_RIGHT 317#define SOKOBAN_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 5259d0d616..c5ecfd7a8a 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -133,15 +133,6 @@
133#elif CONFIG_KEYPAD == COWON_D2_PAD 133#elif CONFIG_KEYPAD == COWON_D2_PAD
134#define STOPWATCH_QUIT BUTTON_POWER 134#define STOPWATCH_QUIT BUTTON_POWER
135 135
136#elif CONFIG_KEYPAD == IAUDIO67_PAD
137#define STOPWATCH_QUIT BUTTON_MENU
138#define STOPWATCH_START_STOP BUTTON_PLAY
139#define STOPWATCH_RESET_TIMER BUTTON_STOP
140#define STOPWATCH_LAP_TIMER BUTTON_LEFT
141#define STOPWATCH_SCROLL_UP BUTTON_VOLUP
142#define STOPWATCH_SCROLL_DOWN BUTTON_VOLDOWN
143#define STOPWATCH_RC_QUIT BUTTON_POWER
144
145#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 136#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
146#define STOPWATCH_QUIT BUTTON_BACK 137#define STOPWATCH_QUIT BUTTON_BACK
147#define STOPWATCH_START_STOP BUTTON_PLAY 138#define STOPWATCH_START_STOP BUTTON_PLAY
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 6ee3eb33ee..1332a9a80f 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -181,16 +181,6 @@
181#define SUDOKU_BUTTON_QUIT BUTTON_POWER 181#define SUDOKU_BUTTON_QUIT BUTTON_POWER
182#define SUDOKU_BUTTON_MENU BUTTON_MENU 182#define SUDOKU_BUTTON_MENU BUTTON_MENU
183 183
184#elif CONFIG_KEYPAD == IAUDIO67_PAD
185#define SUDOKU_BUTTON_QUIT BUTTON_POWER
186#define SUDOKU_BUTTON_UP BUTTON_STOP
187#define SUDOKU_BUTTON_DOWN BUTTON_PLAY
188#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
189#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
190#define SUDOKU_BUTTON_TOGGLE BUTTON_VOLUP
191#define SUDOKU_BUTTON_MENU BUTTON_MENU
192#define SUDOKU_BUTTON_POSSIBLE BUTTON_VOLDOWN
193
194#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 184#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
195#define SUDOKU_BUTTON_QUIT BUTTON_BACK 185#define SUDOKU_BUTTON_QUIT BUTTON_BACK
196#define SUDOKU_BUTTON_UP BUTTON_UP 186#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 bea8f829ef..26bfb7a464 100644
--- a/apps/plugins/text_viewer/tv_button.h
+++ b/apps/plugins/text_viewer/tv_button.h
@@ -247,18 +247,6 @@
247#define TV_SCROLL_DOWN BUTTON_PLUS 247#define TV_SCROLL_DOWN BUTTON_PLUS
248#define TV_BOOKMARK (BUTTON_MENU|BUTTON_PLUS) 248#define TV_BOOKMARK (BUTTON_MENU|BUTTON_PLUS)
249 249
250/* Cowon iAudio 7 keys */
251#elif CONFIG_KEYPAD == IAUDIO67_PAD
252#define TV_QUIT BUTTON_POWER
253#define TV_SCROLL_UP BUTTON_VOLUP
254#define TV_SCROLL_DOWN BUTTON_VOLDOWN
255#define TV_SCREEN_LEFT BUTTON_LEFT
256#define TV_SCREEN_RIGHT BUTTON_RIGHT
257#define TV_MENU BUTTON_MENU
258#define TV_AUTOSCROLL BUTTON_PLAY
259#define TV_RC_QUIT BUTTON_STOP
260#define TV_BOOKMARK (BUTTON_LEFT|BUTTON_PLAY)
261
262/* Creative Zen Vision:M keys */ 250/* Creative Zen Vision:M keys */
263#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 251#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
264#define TV_QUIT BUTTON_BACK 252#define TV_QUIT BUTTON_BACK
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 36aae071cb..cf959ad7f5 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -146,15 +146,6 @@
146 146
147#define QUIT BUTTON_POWER 147#define QUIT BUTTON_POWER
148 148
149#elif CONFIG_KEYPAD == IAUDIO67_PAD
150
151#define QUIT BUTTON_POWER
152#define LEFT BUTTON_LEFT
153#define RIGHT BUTTON_RIGHT
154#define UP BUTTON_STOP
155#define DOWN BUTTON_PLAY
156#define PAUSE BUTTON_MENU
157
158#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 149#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
159 150
160#define QUIT BUTTON_BACK 151#define QUIT BUTTON_BACK
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index dbebc3b1d9..1dcb9c9034 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -110,14 +110,6 @@
110#elif CONFIG_KEYPAD == COWON_D2_PAD 110#elif CONFIG_KEYPAD == COWON_D2_PAD
111#define ZX_MENU (BUTTON_MENU|BUTTON_REL) 111#define ZX_MENU (BUTTON_MENU|BUTTON_REL)
112 112
113#elif CONFIG_KEYPAD == IAUDIO67_PAD
114#define ZX_UP BUTTON_STOP
115#define ZX_DOWN BUTTON_PLAY
116#define ZX_LEFT BUTTON_LEFT
117#define ZX_RIGHT BUTTON_RIGHT
118#define ZX_SELECT BUTTON_VOLUP
119#define ZX_MENU BUTTON_MENU
120
121#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 113#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
122#define ZX_UP BUTTON_UP 114#define ZX_UP BUTTON_UP
123#define ZX_DOWN BUTTON_DOWN 115#define ZX_DOWN BUTTON_DOWN
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index 63f74c7664..1028836351 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -113,15 +113,6 @@
113 113
114#define KBD_ABORT BUTTON_POWER 114#define KBD_ABORT BUTTON_POWER
115 115
116#elif CONFIG_KEYPAD == IAUDIO67_PAD
117
118#define KBD_SELECT BUTTON_MENU
119#define KBD_ABORT BUTTON_POWER
120#define KBD_LEFT BUTTON_LEFT
121#define KBD_RIGHT BUTTON_RIGHT
122#define KBD_UP BUTTON_STOP
123#define KBD_DOWN BUTTON_PLAY
124
125#elif CONFIG_KEYPAD == CREATIVEZVM_PAD 116#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
126 117
127#define KBD_SELECT BUTTON_SELECT 118#define KBD_SELECT BUTTON_SELECT