diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-12-15 20:51:41 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-12-15 20:51:41 +0000 |
commit | 47ddbaa47b1ccb4d4391fb0be40352818b22b735 (patch) | |
tree | 19dfe5753ee361d54785f85fb2de0642c391c638 | |
parent | 5ce515c31591ccf101566eb154b032c1d7f6385f (diff) | |
download | rockbox-47ddbaa47b1ccb4d4391fb0be40352818b22b735.tar.gz rockbox-47ddbaa47b1ccb4d4391fb0be40352818b22b735.zip |
Cowon D2: Rename COWOND2_PAD -> COWON_D2_PAD to match macro used in manual, and
to target naming conventions in general
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24010 a1c6a512-1295-4272-9138-f99709370657
69 files changed, 74 insertions, 74 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 3f44fddf67..313e5e0aec 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -227,7 +227,7 @@ keymaps/keymap-av300.c | |||
227 | keymaps/keymap-mr500.c | 227 | keymaps/keymap-mr500.c |
228 | #elif CONFIG_KEYPAD == MROBE100_PAD | 228 | #elif CONFIG_KEYPAD == MROBE100_PAD |
229 | keymaps/keymap-mr100.c | 229 | keymaps/keymap-mr100.c |
230 | #elif CONFIG_KEYPAD == COWOND2_PAD | 230 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
231 | keymaps/keymap-cowond2.c | 231 | keymaps/keymap-cowond2.c |
232 | #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD | 232 | #elif CONFIG_KEYPAD == MEIZU_M6SL_PAD |
233 | keymaps/keymap-meizu-m6sl.c | 233 | keymaps/keymap-meizu-m6sl.c |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 7257e2c26f..57545c2106 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -155,7 +155,7 @@ PLUGIN_HEADER | |||
155 | #define BATTERY_ON_TXT "PLAY - start" | 155 | #define BATTERY_ON_TXT "PLAY - start" |
156 | #define BATTERY_OFF_TXT "REC" | 156 | #define BATTERY_OFF_TXT "REC" |
157 | 157 | ||
158 | #elif CONFIG_KEYPAD == COWOND2_PAD | 158 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
159 | 159 | ||
160 | #define BATTERY_OFF BUTTON_POWER | 160 | #define BATTERY_OFF BUTTON_POWER |
161 | #define BATTERY_OFF_TXT "POWER" | 161 | #define BATTERY_OFF_TXT "POWER" |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index 93bd2396cb..3854799fc3 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -351,7 +351,7 @@ enum { | |||
351 | #define BJACK_RIGHT BUTTON_RC_FF | 351 | #define BJACK_RIGHT BUTTON_RC_FF |
352 | #define BJACK_LEFT BUTTON_RC_REW | 352 | #define BJACK_LEFT BUTTON_RC_REW |
353 | 353 | ||
354 | #elif CONFIG_KEYPAD == COWOND2_PAD | 354 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
355 | #define BJACK_QUIT_NAME "POWER" | 355 | #define BJACK_QUIT_NAME "POWER" |
356 | #define BJACK_DOUBLE_NAME "-" | 356 | #define BJACK_DOUBLE_NAME "-" |
357 | #define BJACK_QUIT BUTTON_POWER | 357 | #define BJACK_QUIT BUTTON_POWER |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index d0a8e8b48d..eb513bca8e 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -150,7 +150,7 @@ PLUGIN_HEADER | |||
150 | #define BOUNCE_QUIT BUTTON_RC_REC | 150 | #define BOUNCE_QUIT BUTTON_RC_REC |
151 | #define BOUNCE_MODE BUTTON_RC_MODE | 151 | #define BOUNCE_MODE BUTTON_RC_MODE |
152 | 152 | ||
153 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 153 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
154 | #define BOUNCE_QUIT BUTTON_POWER | 154 | #define BOUNCE_QUIT BUTTON_POWER |
155 | #define BOUNCE_MODE BUTTON_MENU | 155 | #define BOUNCE_MODE BUTTON_MENU |
156 | 156 | ||
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index a372eb0813..5ea9ae7c60 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -200,7 +200,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
200 | #define UP BUTTON_UP | 200 | #define UP BUTTON_UP |
201 | #define DOWN BUTTON_DOWN | 201 | #define DOWN BUTTON_DOWN |
202 | 202 | ||
203 | #elif CONFIG_KEYPAD == COWOND2_PAD | 203 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
204 | #define QUIT BUTTON_POWER | 204 | #define QUIT BUTTON_POWER |
205 | 205 | ||
206 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 206 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 93bed2adcb..f7cafc8f24 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -290,7 +290,7 @@ PLUGIN_HEADER | |||
290 | 290 | ||
291 | #define CALCULATOR_RC_QUIT BUTTON_REC | 291 | #define CALCULATOR_RC_QUIT BUTTON_REC |
292 | 292 | ||
293 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 293 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
294 | 294 | ||
295 | #define CALCULATOR_QUIT BUTTON_POWER | 295 | #define CALCULATOR_QUIT BUTTON_POWER |
296 | #define CALCULATOR_CLEAR BUTTON_MENU | 296 | #define CALCULATOR_CLEAR BUTTON_MENU |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index a7063b1f5b..1106c38d4b 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -182,7 +182,7 @@ PLUGIN_HEADER | |||
182 | #define CALENDAR_NEXT_MONTH BUTTON_RC_MODE | 182 | #define CALENDAR_NEXT_MONTH BUTTON_RC_MODE |
183 | #define CALENDAR_PREV_MONTH BUTTON_RC_MENU | 183 | #define CALENDAR_PREV_MONTH BUTTON_RC_MENU |
184 | 184 | ||
185 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 185 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
186 | #define CALENDAR_QUIT BUTTON_POWER | 186 | #define CALENDAR_QUIT BUTTON_POWER |
187 | #define CALENDAR_SELECT BUTTON_CENTER | 187 | #define CALENDAR_SELECT BUTTON_CENTER |
188 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN | 188 | #define CALENDAR_NEXT_WEEK BUTTON_DOWN |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index b7ff3f5b0c..0d3574447a 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -297,7 +297,7 @@ | |||
297 | 297 | ||
298 | #define CB_RC_QUIT BUTTON_REC | 298 | #define CB_RC_QUIT BUTTON_REC |
299 | 299 | ||
300 | #elif CONFIG_KEYPAD == COWOND2_PAD | 300 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
301 | #define CB_LEVEL BUTTON_PLUS | 301 | #define CB_LEVEL BUTTON_PLUS |
302 | #define CB_RESTART BUTTON_MINUS | 302 | #define CB_RESTART BUTTON_MINUS |
303 | #define CB_MENU (BUTTON_MENU|BUTTON_REL) | 303 | #define CB_MENU (BUTTON_MENU|BUTTON_REL) |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 39b28628f0..ff33bda470 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -195,7 +195,7 @@ PLUGIN_HEADER | |||
195 | #define CHC_SETTINGS_OK BUTTON_RC_PLAY | 195 | #define CHC_SETTINGS_OK BUTTON_RC_PLAY |
196 | #define CHC_SETTINGS_CANCEL BUTTON_RC_REC | 196 | #define CHC_SETTINGS_CANCEL BUTTON_RC_REC |
197 | 197 | ||
198 | #elif CONFIG_KEYPAD == COWOND2_PAD | 198 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
199 | #define CHC_QUIT BUTTON_POWER | 199 | #define CHC_QUIT BUTTON_POWER |
200 | #define CHC_RESET (BUTTON_CENTER|BUTTON_MENU) | 200 | #define CHC_RESET (BUTTON_CENTER|BUTTON_MENU) |
201 | #define CHC_MENU BUTTON_MENU | 201 | #define CHC_MENU BUTTON_MENU |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 80611ab085..f90030df32 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1077,7 +1077,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
1077 | #define CHIP8_KEY6 BUTTON_RC_FF | 1077 | #define CHIP8_KEY6 BUTTON_RC_FF |
1078 | #define CHIP8_KEY8 BUTTON_RC_VOL_DOWN | 1078 | #define CHIP8_KEY8 BUTTON_RC_VOL_DOWN |
1079 | 1079 | ||
1080 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 1080 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
1081 | #define CHIP8_OFF BUTTON_POWER | 1081 | #define CHIP8_OFF BUTTON_POWER |
1082 | 1082 | ||
1083 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 1083 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 3233675c23..c7c5c38c72 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -113,7 +113,7 @@ Still To do: | |||
113 | #define ACTION2 BUTTON_RC_MODE | 113 | #define ACTION2 BUTTON_RC_MODE |
114 | #define ACTIONTEXT "PLAY" | 114 | #define ACTIONTEXT "PLAY" |
115 | 115 | ||
116 | #elif CONFIG_KEYPAD == COWOND2_PAD | 116 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
117 | #define QUIT BUTTON_POWER | 117 | #define QUIT BUTTON_POWER |
118 | 118 | ||
119 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 119 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index e6b70b602a..e5f65ce36c 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -146,7 +146,7 @@ PLUGIN_HEADER | |||
146 | #define CLIX_BUTTON_UP BUTTON_UP | 146 | #define CLIX_BUTTON_UP BUTTON_UP |
147 | #define CLIX_BUTTON_DOWN BUTTON_DOWN | 147 | #define CLIX_BUTTON_DOWN BUTTON_DOWN |
148 | 148 | ||
149 | #elif CONFIG_KEYPAD == COWOND2_PAD | 149 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
150 | #define CLIX_BUTTON_QUIT BUTTON_POWER | 150 | #define CLIX_BUTTON_QUIT BUTTON_POWER |
151 | 151 | ||
152 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) | 152 | #elif (CONFIG_KEYPAD == ONDAVX747_PAD) |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index c38ec08994..dadaa5df56 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -206,7 +206,7 @@ PLUGIN_HEADER | |||
206 | #define CUBE_PAUSE BUTTON_RC_PLAY | 206 | #define CUBE_PAUSE BUTTON_RC_PLAY |
207 | #define CUBE_HIGHSPEED BUTTON_RC_MENU | 207 | #define CUBE_HIGHSPEED BUTTON_RC_MENU |
208 | 208 | ||
209 | #elif CONFIG_KEYPAD == COWOND2_PAD | 209 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
210 | #define CUBE_QUIT BUTTON_POWER | 210 | #define CUBE_QUIT BUTTON_POWER |
211 | 211 | ||
212 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) | 212 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 8268e81811..2127186e72 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -132,7 +132,7 @@ long reverse (long N) { | |||
132 | #define LP_QUIT BUTTON_BACK | 132 | #define LP_QUIT BUTTON_BACK |
133 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 133 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
134 | #define LP_QUIT BUTTON_RC_REC | 134 | #define LP_QUIT BUTTON_RC_REC |
135 | #elif CONFIG_KEYPAD == COWOND2_PAD | 135 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
136 | #define LP_QUIT BUTTON_POWER | 136 | #define LP_QUIT BUTTON_POWER |
137 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 137 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
138 | #define LP_QUIT BUTTON_POWER | 138 | #define LP_QUIT BUTTON_POWER |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 2e93c5460b..5f9d3041a2 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -275,7 +275,7 @@ void I_ShutdownGraphics(void) | |||
275 | #define DOOMBUTTON_SHOOT BUTTON_RC_MODE | 275 | #define DOOMBUTTON_SHOOT BUTTON_RC_MODE |
276 | #define DOOMBUTTON_ENTER BUTTON_RC_PLAY | 276 | #define DOOMBUTTON_ENTER BUTTON_RC_PLAY |
277 | #define DOOMBUTTON_WEAPON BUTTON_RC_MENU | 277 | #define DOOMBUTTON_WEAPON BUTTON_RC_MENU |
278 | #elif CONFIG_KEYPAD == COWOND2_PAD | 278 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
279 | #define DOOMBUTTON_ESC BUTTON_POWER | 279 | #define DOOMBUTTON_ESC BUTTON_POWER |
280 | #define DOOMBUTTON_SHOOT BUTTON_PLUS | 280 | #define DOOMBUTTON_SHOOT BUTTON_PLUS |
281 | #define DOOMBUTTON_WEAPON BUTTON_MINUS | 281 | #define DOOMBUTTON_WEAPON BUTTON_MINUS |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 782cff5ba8..8a858d8d4f 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -84,7 +84,7 @@ PLUGIN_HEADER | |||
84 | #define BTN_MENU BUTTON_RC_REC | 84 | #define BTN_MENU BUTTON_RC_REC |
85 | #define BTN_FIRE BUTTON_RC_PLAY | 85 | #define BTN_FIRE BUTTON_RC_PLAY |
86 | 86 | ||
87 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 87 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
88 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) | 88 | #define BTN_MENU (BUTTON_MENU|BUTTON_REL) |
89 | 89 | ||
90 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 90 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 2165486080..da4acd70b6 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -248,7 +248,7 @@ PLUGIN_HEADER | |||
248 | 248 | ||
249 | #define FLIPIT_RC_QUIT BUTTON_REC | 249 | #define FLIPIT_RC_QUIT BUTTON_REC |
250 | 250 | ||
251 | #elif CONFIG_KEYPAD == COWOND2_PAD | 251 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
252 | 252 | ||
253 | #define FLIPIT_QUIT BUTTON_POWER | 253 | #define FLIPIT_QUIT BUTTON_POWER |
254 | 254 | ||
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 940c60ffa3..fcd1c2d950 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -154,7 +154,7 @@ PLUGIN_HEADER | |||
154 | #define RIGHT BUTTON_RIGHT | 154 | #define RIGHT BUTTON_RIGHT |
155 | #define FIRE BUTTON_SELECT | 155 | #define FIRE BUTTON_SELECT |
156 | 156 | ||
157 | #elif CONFIG_KEYPAD == COWOND2_PAD | 157 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
158 | 158 | ||
159 | #define QUIT BUTTON_POWER | 159 | #define QUIT BUTTON_POWER |
160 | #define LEFT BUTTON_MINUS | 160 | #define LEFT BUTTON_MINUS |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 586caabfa5..6c718b4f99 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -207,7 +207,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
207 | 207 | ||
208 | #define JEWELS_RC_CANCEL BUTTON_REC | 208 | #define JEWELS_RC_CANCEL BUTTON_REC |
209 | 209 | ||
210 | #elif CONFIG_KEYPAD == COWOND2_PAD | 210 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
211 | #define JEWELS_CANCEL BUTTON_POWER | 211 | #define JEWELS_CANCEL BUTTON_POWER |
212 | #define HK_CANCEL "POWER" | 212 | #define HK_CANCEL "POWER" |
213 | 213 | ||
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index e3de47af1a..552d26ed1a 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h | |||
@@ -241,7 +241,7 @@ | |||
241 | #define JPEG_NEXT BUTTON_RC_MODE | 241 | #define JPEG_NEXT BUTTON_RC_MODE |
242 | #define JPEG_PREVIOUS BUTTON_RC_MENU | 242 | #define JPEG_PREVIOUS BUTTON_RC_MENU |
243 | 243 | ||
244 | #elif CONFIG_KEYPAD == COWOND2_PAD | 244 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
245 | 245 | ||
246 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 246 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
247 | #define JPEG_ZOOM_IN BUTTON_VOLUP | 247 | #define JPEG_ZOOM_IN BUTTON_VOLUP |
diff --git a/apps/plugins/lamp.c b/apps/plugins/lamp.c index 1c60cba78f..690676e054 100644 --- a/apps/plugins/lamp.c +++ b/apps/plugins/lamp.c | |||
@@ -72,7 +72,7 @@ PLUGIN_HEADER | |||
72 | # define LAMP_LEFT BUTTON_LEFT | 72 | # define LAMP_LEFT BUTTON_LEFT |
73 | # define LAMP_RIGHT BUTTON_RIGHT | 73 | # define LAMP_RIGHT BUTTON_RIGHT |
74 | 74 | ||
75 | #elif CONFIG_KEYPAD == COWOND2_PAD | 75 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
76 | 76 | ||
77 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 77 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
78 | # define LAMP_LEFT BUTTON_LEFT | 78 | # define LAMP_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index f93c7a4fe9..d587f80ba4 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -151,7 +151,7 @@ const struct button_mapping generic_directions[] = | |||
151 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 151 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
152 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 152 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
153 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 153 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
154 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 154 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
155 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 155 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
156 | { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, | 156 | { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, |
157 | { PLA_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, | 157 | { PLA_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, |
@@ -282,7 +282,7 @@ const struct button_mapping generic_left_right_fire[] = | |||
282 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | 282 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, |
283 | { PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, | 283 | { PLA_FIRE, BUTTON_RC_HEART, BUTTON_NONE}, |
284 | { PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, | 284 | { PLA_FIRE_REPEAT, BUTTON_RC_HEART|BUTTON_REPEAT, BUTTON_NONE}, |
285 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 285 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
286 | { PLA_LEFT, BUTTON_MINUS, BUTTON_NONE}, | 286 | { PLA_LEFT, BUTTON_MINUS, BUTTON_NONE}, |
287 | { PLA_LEFT_REPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE}, | 287 | { PLA_LEFT_REPEAT, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE}, |
288 | { PLA_RIGHT, BUTTON_PLUS, BUTTON_NONE}, | 288 | { PLA_RIGHT, BUTTON_PLUS, BUTTON_NONE}, |
@@ -445,7 +445,7 @@ const struct button_mapping generic_actions[] = | |||
445 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 445 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
446 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, | 446 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
447 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 447 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
448 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 448 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
449 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, | 449 | {PLA_QUIT, BUTTON_POWER, BUTTON_NONE}, |
450 | {PLA_START, BUTTON_MINUS, BUTTON_NONE}, | 450 | {PLA_START, BUTTON_MINUS, BUTTON_NONE}, |
451 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 451 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
@@ -564,7 +564,7 @@ const struct button_mapping generic_increase_decrease[] = | |||
564 | {PLA_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, | 564 | {PLA_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE}, |
565 | {PLA_INC_REPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, | 565 | {PLA_INC_REPEAT, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE}, |
566 | {PLA_DEC_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | 566 | {PLA_DEC_REPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE}, |
567 | #elif CONFIG_KEYPAD == COWOND2_PAD | 567 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
568 | {PLA_INC, BUTTON_PLUS, BUTTON_NONE}, | 568 | {PLA_INC, BUTTON_PLUS, BUTTON_NONE}, |
569 | {PLA_DEC, BUTTON_MINUS, BUTTON_NONE}, | 569 | {PLA_DEC, BUTTON_MINUS, BUTTON_NONE}, |
570 | {PLA_INC_REPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE}, | 570 | {PLA_INC_REPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index b80f67b271..04c8aa015b 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -143,7 +143,7 @@ const unsigned char rockbox16x7[] = { | |||
143 | #define LP_DEC_Y BUTTON_RC_VOL_DOWN | 143 | #define LP_DEC_Y BUTTON_RC_VOL_DOWN |
144 | #define LP_INC_Y BUTTON_RC_VOL_UP | 144 | #define LP_INC_Y BUTTON_RC_VOL_UP |
145 | 145 | ||
146 | #elif CONFIG_KEYPAD == COWOND2_PAD | 146 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
147 | #define LP_QUIT BUTTON_POWER | 147 | #define LP_QUIT BUTTON_POWER |
148 | 148 | ||
149 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 149 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index c7d39763c5..091de31afc 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -256,7 +256,7 @@ PLUGIN_HEADER | |||
256 | #define MANDELBROT_MAXITER_DEC (BUTTON_RC_MODE|BUTTON_REPEAT) | 256 | #define MANDELBROT_MAXITER_DEC (BUTTON_RC_MODE|BUTTON_REPEAT) |
257 | #define MANDELBROT_RESET BUTTON_RC_MENU | 257 | #define MANDELBROT_RESET BUTTON_RC_MENU |
258 | 258 | ||
259 | #elif CONFIG_KEYPAD == COWOND2_PAD | 259 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
260 | #define MANDELBROT_QUIT BUTTON_POWER | 260 | #define MANDELBROT_QUIT BUTTON_POWER |
261 | 261 | ||
262 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 262 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 9c2e424476..ee66135862 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -112,7 +112,7 @@ PLUGIN_HEADER | |||
112 | #define MATRIX_SLEEP_LESS BUTTON_RC_VOL_DOWN | 112 | #define MATRIX_SLEEP_LESS BUTTON_RC_VOL_DOWN |
113 | #define MATRIX_PAUSE BUTTON_RC_PLAY | 113 | #define MATRIX_PAUSE BUTTON_RC_PLAY |
114 | 114 | ||
115 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 115 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
116 | #define MATRIX_EXIT BUTTON_POWER | 116 | #define MATRIX_EXIT BUTTON_POWER |
117 | 117 | ||
118 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 118 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index c444511f2e..c8ae070cd0 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -139,7 +139,7 @@ PLUGIN_IRAM_DECLARE | |||
139 | #define BTN_PLAY BUTTON_RC_PLAY | 139 | #define BTN_PLAY BUTTON_RC_PLAY |
140 | 140 | ||
141 | 141 | ||
142 | #elif CONFIG_KEYPAD == COWOND2_PAD | 142 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
143 | #define BTN_QUIT BUTTON_POWER | 143 | #define BTN_QUIT BUTTON_POWER |
144 | 144 | ||
145 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 145 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 4f27af671e..cea31f19db 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -201,7 +201,7 @@ enum minesweeper_status { | |||
201 | # define MINESWP_DISCOVER BUTTON_RC_PLAY | 201 | # define MINESWP_DISCOVER BUTTON_RC_PLAY |
202 | # define MINESWP_INFO BUTTON_RC_MENU | 202 | # define MINESWP_INFO BUTTON_RC_MENU |
203 | 203 | ||
204 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 204 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
205 | # define MINESWP_QUIT BUTTON_POWER | 205 | # define MINESWP_QUIT BUTTON_POWER |
206 | 206 | ||
207 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 207 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 4cdec8f396..a8bdeeeda9 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -129,7 +129,7 @@ PLUGIN_HEADER | |||
129 | #define MOSAIQUE_SPEED BUTTON_RC_MENU | 129 | #define MOSAIQUE_SPEED BUTTON_RC_MENU |
130 | #define MOSAIQUE_RESTART BUTTON_RC_PLAY | 130 | #define MOSAIQUE_RESTART BUTTON_RC_PLAY |
131 | 131 | ||
132 | #elif CONFIG_KEYPAD == COWOND2_PAD | 132 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
133 | #define MOSAIQUE_QUIT BUTTON_POWER | 133 | #define MOSAIQUE_QUIT BUTTON_POWER |
134 | 134 | ||
135 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 135 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index f36a270dbf..3dfb487653 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2467,7 +2467,7 @@ void get_mp3_filename(const char *wav_name) | |||
2467 | #define MP3ENC_DONE BUTTON_RC_REC | 2467 | #define MP3ENC_DONE BUTTON_RC_REC |
2468 | #define MP3ENC_SELECT BUTTON_RC_FF | 2468 | #define MP3ENC_SELECT BUTTON_RC_FF |
2469 | 2469 | ||
2470 | #elif CONFIG_KEYPAD == COWOND2_PAD | 2470 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
2471 | #define MP3ENC_DONE BUTTON_POWER | 2471 | #define MP3ENC_DONE BUTTON_POWER |
2472 | 2472 | ||
2473 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 2473 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 26d8414d8a..1ad1503d3f 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -139,7 +139,7 @@ struct mpeg_settings settings; | |||
139 | #define MPEG_START_TIME_DOWN BUTTON_RC_VOL_DOWN | 139 | #define MPEG_START_TIME_DOWN BUTTON_RC_VOL_DOWN |
140 | #define MPEG_START_TIME_EXIT BUTTON_RC_REC | 140 | #define MPEG_START_TIME_EXIT BUTTON_RC_REC |
141 | 141 | ||
142 | #elif CONFIG_KEYPAD == COWOND2_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 | 145 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 31b7c68373..7a2578506d 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -246,7 +246,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
246 | #define MPEG_RW BUTTON_RC_REW | 246 | #define MPEG_RW BUTTON_RC_REW |
247 | #define MPEG_FF BUTTON_RC_FF | 247 | #define MPEG_FF BUTTON_RC_FF |
248 | 248 | ||
249 | #elif CONFIG_KEYPAD == COWOND2_PAD | 249 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
250 | #define MPEG_MENU (BUTTON_MENU|BUTTON_REL) | 250 | #define MPEG_MENU (BUTTON_MENU|BUTTON_REL) |
251 | //#define MPEG_STOP BUTTON_POWER | 251 | //#define MPEG_STOP BUTTON_POWER |
252 | #define MPEG_VOLDOWN BUTTON_MINUS | 252 | #define MPEG_VOLDOWN BUTTON_MINUS |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index b5ed705c91..1daac661b2 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -216,7 +216,7 @@ PLUGIN_HEADER | |||
216 | #define OSCILLOSCOPE_VOL_UP BUTTON_RC_VOL_UP | 216 | #define OSCILLOSCOPE_VOL_UP BUTTON_RC_VOL_UP |
217 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_RC_VOL_DOWN | 217 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_RC_VOL_DOWN |
218 | 218 | ||
219 | #elif CONFIG_KEYPAD == COWOND2_PAD | 219 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
220 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 220 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
221 | #define OSCILLOSCOPE_VOL_UP BUTTON_PLUS | 221 | #define OSCILLOSCOPE_VOL_UP BUTTON_PLUS |
222 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_MINUS | 222 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_MINUS |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 85ec648a7a..203c0f5836 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -154,7 +154,7 @@ | |||
154 | #define PACMAN_COIN (BUTTON_RC_MODE | BUTTON_RC_DOWN) | 154 | #define PACMAN_COIN (BUTTON_RC_MODE | BUTTON_RC_DOWN) |
155 | #define PACMAN_MENU BUTTON_POWER | 155 | #define PACMAN_MENU BUTTON_POWER |
156 | 156 | ||
157 | #elif CONFIG_KEYPAD == COWOND2_PAD | 157 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
158 | 158 | ||
159 | #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) | 159 | #define PACMAN_MENU (BUTTON_MENU|BUTTON_REL) |
160 | 160 | ||
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index c46a3de7bd..72b9f70c87 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -317,7 +317,7 @@ PLUGIN_HEADER | |||
317 | #define LVL_UP_TEXT "VOL+" | 317 | #define LVL_UP_TEXT "VOL+" |
318 | #define LVL_DOWN_TEXT "VOL-" | 318 | #define LVL_DOWN_TEXT "VOL-" |
319 | 319 | ||
320 | #elif CONFIG_KEYPAD == COWOND2_PAD | 320 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
321 | #define PEGBOX_QUIT BUTTON_POWER | 321 | #define PEGBOX_QUIT BUTTON_POWER |
322 | 322 | ||
323 | #define QUIT_TEXT "POWER" | 323 | #define QUIT_TEXT "POWER" |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 9cd0d3459b..eab1d0a00a 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -122,9 +122,9 @@ const struct button_mapping pf_context_buttons[] = | |||
122 | /* These all use short press of BUTTON_POWER for menu, map long POWER to quit | 122 | /* These all use short press of BUTTON_POWER for menu, map long POWER to quit |
123 | */ | 123 | */ |
124 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_M200_PAD || \ | 124 | #elif CONFIG_KEYPAD == SANSA_C200_PAD || CONFIG_KEYPAD == SANSA_M200_PAD || \ |
125 | CONFIG_KEYPAD == IRIVER_H10_PAD || CONFIG_KEYPAD == COWOND2_PAD | 125 | CONFIG_KEYPAD == IRIVER_H10_PAD || CONFIG_KEYPAD == COWON_D2_PAD |
126 | {PF_QUIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER}, | 126 | {PF_QUIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER}, |
127 | #if CONFIG_KEYPAD == COWOND2_PAD | 127 | #if CONFIG_KEYPAD == COWON_D2_PAD |
128 | {PF_BACK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, | 128 | {PF_BACK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, |
129 | {ACTION_NONE, BUTTON_POWER, BUTTON_NONE}, | 129 | {ACTION_NONE, BUTTON_POWER, BUTTON_NONE}, |
130 | #endif | 130 | #endif |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index f57f209103..0b1cab2b13 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -127,7 +127,7 @@ static bool boosted = false; | |||
127 | #define PLASMA_DECREASE_FREQUENCY BUTTON_RC_VOL_DOWN | 127 | #define PLASMA_DECREASE_FREQUENCY BUTTON_RC_VOL_DOWN |
128 | #define PLASMA_RC_QUIT BUTTON_REC | 128 | #define PLASMA_RC_QUIT BUTTON_REC |
129 | 129 | ||
130 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 130 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
131 | #define PLASMA_QUIT BUTTON_POWER | 131 | #define PLASMA_QUIT BUTTON_POWER |
132 | 132 | ||
133 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) | 133 | #elif (CONFIG_KEYPAD == IAUDIO67_PAD) |
diff --git a/apps/plugins/png/png.h b/apps/plugins/png/png.h index bdf7186a2c..50ae334ad0 100644 --- a/apps/plugins/png/png.h +++ b/apps/plugins/png/png.h | |||
@@ -262,7 +262,7 @@ You are free to name this file lodepng.cpp or lodepng.c depending on your usage. | |||
262 | #define PNG_NEXT BUTTON_RC_MODE | 262 | #define PNG_NEXT BUTTON_RC_MODE |
263 | #define PNG_PREVIOUS BUTTON_RC_MENU | 263 | #define PNG_PREVIOUS BUTTON_RC_MENU |
264 | 264 | ||
265 | #elif CONFIG_KEYPAD == COWOND2_PAD | 265 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
266 | 266 | ||
267 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 267 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
268 | #define PNG_ZOOM_IN BUTTON_VOLUP | 268 | #define PNG_ZOOM_IN BUTTON_VOLUP |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 73fb48356b..579fdd8fe5 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -158,7 +158,7 @@ PLUGIN_HEADER | |||
158 | #define PONG_RIGHT_UP BUTTON_VOL_UP | 158 | #define PONG_RIGHT_UP BUTTON_VOL_UP |
159 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | 159 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN |
160 | 160 | ||
161 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 161 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
162 | #define PONG_QUIT BUTTON_POWER | 162 | #define PONG_QUIT BUTTON_POWER |
163 | 163 | ||
164 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 164 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 1a5f5479df..a62f1fc3ba 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -151,7 +151,7 @@ | |||
151 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_RC_PLAY | 151 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_RC_PLAY |
152 | #define REVERSI_BUTTON_MENU BUTTON_RC_MENU | 152 | #define REVERSI_BUTTON_MENU BUTTON_RC_MENU |
153 | 153 | ||
154 | #elif CONFIG_KEYPAD == COWOND2_PAD | 154 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
155 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | 155 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
156 | #define REVERSI_BUTTON_MENU BUTTON_MENU | 156 | #define REVERSI_BUTTON_MENU BUTTON_MENU |
157 | 157 | ||
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index bbeb3ba0b4..95a793fb8c 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -248,7 +248,7 @@ PLUGIN_HEADER | |||
248 | #define ROCKBLOX_DROP BUTTON_RC_PLAY | 248 | #define ROCKBLOX_DROP BUTTON_RC_PLAY |
249 | #define ROCKBLOX_RESTART BUTTON_RC_MODE | 249 | #define ROCKBLOX_RESTART BUTTON_RC_MODE |
250 | 250 | ||
251 | #elif CONFIG_KEYPAD == COWOND2_PAD | 251 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
252 | #define ROCKBLOX_OFF BUTTON_POWER | 252 | #define ROCKBLOX_OFF BUTTON_POWER |
253 | #define ROCKBLOX_RESTART BUTTON_MENU | 253 | #define ROCKBLOX_RESTART BUTTON_MENU |
254 | 254 | ||
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index d9b055195e..245035bad3 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -85,7 +85,7 @@ PLUGIN_HEADER | |||
85 | #define ONEDROCKBLOX_DOWN BUTTON_RC_PLAY | 85 | #define ONEDROCKBLOX_DOWN BUTTON_RC_PLAY |
86 | #define ONEDROCKBLOX_QUIT BUTTON_RC_REC | 86 | #define ONEDROCKBLOX_QUIT BUTTON_RC_REC |
87 | 87 | ||
88 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 88 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
89 | #define ONEDROCKBLOX_DOWN BUTTON_MENU | 89 | #define ONEDROCKBLOX_DOWN BUTTON_MENU |
90 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 90 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
91 | 91 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 1d081f48d5..593ce828b4 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -196,7 +196,7 @@ static void setoptions (void) | |||
196 | #elif CONFIG_KEYPAD == MROBE500_PAD | 196 | #elif CONFIG_KEYPAD == MROBE500_PAD |
197 | options.MENU=BUTTON_POWER; | 197 | options.MENU=BUTTON_POWER; |
198 | 198 | ||
199 | #elif CONFIG_KEYPAD == COWOND2_PAD | 199 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
200 | options.A=BUTTON_PLUS; | 200 | options.A=BUTTON_PLUS; |
201 | options.B=BUTTON_MINUS; | 201 | options.B=BUTTON_MINUS; |
202 | options.MENU=BUTTON_MENU; | 202 | options.MENU=BUTTON_MENU; |
@@ -280,7 +280,7 @@ static void setoptions (void) | |||
280 | #if CONFIG_KEYPAD == MROBE500_PAD | 280 | #if CONFIG_KEYPAD == MROBE500_PAD |
281 | options.A=BUTTON_BOTTOMLEFT; | 281 | options.A=BUTTON_BOTTOMLEFT; |
282 | options.B=BUTTON_BOTTOMRIGHT; | 282 | options.B=BUTTON_BOTTOMRIGHT; |
283 | #elif CONFIG_KEYPAD != COWOND2_PAD | 283 | #elif CONFIG_KEYPAD != COWON_D2_PAD |
284 | options.A=BUTTON_BOTTOMLEFT; | 284 | options.A=BUTTON_BOTTOMLEFT; |
285 | options.B=BUTTON_BOTTOMRIGHT; | 285 | options.B=BUTTON_BOTTOMRIGHT; |
286 | options.MENU=BUTTON_TOPLEFT; | 286 | options.MENU=BUTTON_TOPLEFT; |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index d562eb488e..57a23a34bd 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -129,7 +129,7 @@ PLUGIN_HEADER | |||
129 | #define ROCKPAINT_LEFT BUTTON_LEFT | 129 | #define ROCKPAINT_LEFT BUTTON_LEFT |
130 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 130 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
131 | 131 | ||
132 | #elif ( CONFIG_KEYPAD == COWOND2_PAD ) | 132 | #elif ( CONFIG_KEYPAD == COWON_D2_PAD ) |
133 | #define ROCKPAINT_QUIT BUTTON_POWER | 133 | #define ROCKPAINT_QUIT BUTTON_POWER |
134 | #define ROCKPAINT_MENU BUTTON_MENU | 134 | #define ROCKPAINT_MENU BUTTON_MENU |
135 | 135 | ||
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 790acc8e6b..110f830aa1 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -166,7 +166,7 @@ PLUGIN_HEADER | |||
166 | #define PUZZLE_SHUFFLE BUTTON_RC_MODE | 166 | #define PUZZLE_SHUFFLE BUTTON_RC_MODE |
167 | #define PUZZLE_PICTURE BUTTON_RC_MENU | 167 | #define PUZZLE_PICTURE BUTTON_RC_MENU |
168 | 168 | ||
169 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 169 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
170 | #define PUZZLE_QUIT BUTTON_POWER | 170 | #define PUZZLE_QUIT BUTTON_POWER |
171 | #define PUZZLE_QUIT_TEXT "[POWER]" | 171 | #define PUZZLE_QUIT_TEXT "[POWER]" |
172 | 172 | ||
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 461a862682..c32873fbc2 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -196,7 +196,7 @@ PLUGIN_HEADER | |||
196 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) | 196 | #elif (CONFIG_KEYPAD == ONDAVX777_PAD) |
197 | #define SNAKE_QUIT BUTTON_POWER | 197 | #define SNAKE_QUIT BUTTON_POWER |
198 | 198 | ||
199 | #elif CONFIG_KEYPAD == COWOND2_PAD | 199 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
200 | #define SNAKE_QUIT BUTTON_POWER | 200 | #define SNAKE_QUIT BUTTON_POWER |
201 | 201 | ||
202 | #else | 202 | #else |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 7b518bdf8d..2a1e746f9d 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -264,7 +264,7 @@ PLUGIN_HEADER | |||
264 | #define SNAKE2_PLAYPAUSE BUTTON_RC_PLAY | 264 | #define SNAKE2_PLAYPAUSE BUTTON_RC_PLAY |
265 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 265 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
266 | 266 | ||
267 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 267 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
268 | #define SNAKE2_QUIT BUTTON_POWER | 268 | #define SNAKE2_QUIT BUTTON_POWER |
269 | 269 | ||
270 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 270 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 5fc1ed3804..c64dfd0a5c 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -55,7 +55,7 @@ PLUGIN_HEADER | |||
55 | (CONFIG_KEYPAD == MROBE500_PAD) || \ | 55 | (CONFIG_KEYPAD == MROBE500_PAD) || \ |
56 | (CONFIG_KEYPAD == IRIVER_H10_PAD) || \ | 56 | (CONFIG_KEYPAD == IRIVER_H10_PAD) || \ |
57 | (CONFIG_KEYPAD == MROBE100_PAD) || \ | 57 | (CONFIG_KEYPAD == MROBE100_PAD) || \ |
58 | (CONFIG_KEYPAD == COWOND2_PAD) || \ | 58 | (CONFIG_KEYPAD == COWON_D2_PAD) || \ |
59 | (CONFIG_KEYPAD == IAUDIO67_PAD) || \ | 59 | (CONFIG_KEYPAD == IAUDIO67_PAD) || \ |
60 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ | 60 | (CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \ |
61 | (CONFIG_KEYPAD == ONDAVX747_PAD) || \ | 61 | (CONFIG_KEYPAD == ONDAVX747_PAD) || \ |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index dfab89fdb7..b9e0aa1d2e 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -328,7 +328,7 @@ PLUGIN_HEADER | |||
328 | 328 | ||
329 | #define SOKOBAN_RC_MENU BUTTON_REC | 329 | #define SOKOBAN_RC_MENU BUTTON_REC |
330 | 330 | ||
331 | #elif CONFIG_KEYPAD == COWOND2_PAD | 331 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
332 | #define SOKOBAN_MENU BUTTON_MENU | 332 | #define SOKOBAN_MENU BUTTON_MENU |
333 | #define SOKOBAN_LEVEL_DOWN BUTTON_MINUS | 333 | #define SOKOBAN_LEVEL_DOWN BUTTON_MINUS |
334 | #define SOKOBAN_LEVEL_UP BUTTON_PLUS | 334 | #define SOKOBAN_LEVEL_UP BUTTON_PLUS |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 09407996c4..8d0b12eba6 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -356,7 +356,7 @@ PLUGIN_HEADER | |||
356 | # define HK_CUR2STACK "MODE" | 356 | # define HK_CUR2STACK "MODE" |
357 | # define HK_REM2STACK "MODE.." | 357 | # define HK_REM2STACK "MODE.." |
358 | 358 | ||
359 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 359 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
360 | # define SOL_QUIT BUTTON_POWER | 360 | # define SOL_QUIT BUTTON_POWER |
361 | 361 | ||
362 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 362 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 636aeddde7..4bcb75366c 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -176,7 +176,7 @@ PLUGIN_HEADER | |||
176 | #define AST_RIGHT BUTTON_RC_FF | 176 | #define AST_RIGHT BUTTON_RC_FF |
177 | #define AST_FIRE BUTTON_RC_MODE | 177 | #define AST_FIRE BUTTON_RC_MODE |
178 | 178 | ||
179 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 179 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
180 | #define AST_QUIT BUTTON_POWER | 180 | #define AST_QUIT BUTTON_POWER |
181 | 181 | ||
182 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 182 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 72a2e7a907..efd2dae6fe 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -288,7 +288,7 @@ PLUGIN_HEADER | |||
288 | #define STAR_LEVEL_DOWN_NAME "PLAY+VOL-" | 288 | #define STAR_LEVEL_DOWN_NAME "PLAY+VOL-" |
289 | #define STAR_LEVEL_REPEAT_NAME "PLAY+MENU" | 289 | #define STAR_LEVEL_REPEAT_NAME "PLAY+MENU" |
290 | 290 | ||
291 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 291 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
292 | 292 | ||
293 | #define STAR_QUIT BUTTON_POWER | 293 | #define STAR_QUIT BUTTON_POWER |
294 | #define STAR_QUIT_NAME "POWER" | 294 | #define STAR_QUIT_NAME "POWER" |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 8630b41c7c..4a680ee91b 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -112,7 +112,7 @@ PLUGIN_HEADER | |||
112 | #define STARFIELD_DECREASE_NB_STARS BUTTON_RIGHT | 112 | #define STARFIELD_DECREASE_NB_STARS BUTTON_RIGHT |
113 | #define STARFIELD_TOGGLE_COLOR BUTTON_MENU | 113 | #define STARFIELD_TOGGLE_COLOR BUTTON_MENU |
114 | 114 | ||
115 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 115 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
116 | #define STARFIELD_QUIT BUTTON_POWER | 116 | #define STARFIELD_QUIT BUTTON_POWER |
117 | 117 | ||
118 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 118 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index e8a09ada3b..d3cf9dc5a7 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -82,7 +82,7 @@ static bool abort; | |||
82 | #define STATS_STOP BUTTON_REC | 82 | #define STATS_STOP BUTTON_REC |
83 | #define STATS_STOP_REMOTE BUTTON_RC_REC | 83 | #define STATS_STOP_REMOTE BUTTON_RC_REC |
84 | 84 | ||
85 | #elif CONFIG_KEYPAD == COWOND2_PAD | 85 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
86 | #define STATS_STOP BUTTON_POWER | 86 | #define STATS_STOP BUTTON_POWER |
87 | 87 | ||
88 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 88 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index edc6441766..b7ed592fdf 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -166,7 +166,7 @@ PLUGIN_HEADER | |||
166 | #define STOPWATCH_SCROLL_DOWN BUTTON_RC_VOL_DOWN | 166 | #define STOPWATCH_SCROLL_DOWN BUTTON_RC_VOL_DOWN |
167 | #define STOPWATCH_RC_QUIT BUTTON_REC | 167 | #define STOPWATCH_RC_QUIT BUTTON_REC |
168 | 168 | ||
169 | #elif CONFIG_KEYPAD == COWOND2_PAD | 169 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
170 | #define STOPWATCH_QUIT BUTTON_POWER | 170 | #define STOPWATCH_QUIT BUTTON_POWER |
171 | 171 | ||
172 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 172 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 1f9b1958e8..57fd8c9a56 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -210,7 +210,7 @@ | |||
210 | #define SUDOKU_BUTTON_MENU BUTTON_RC_MENU | 210 | #define SUDOKU_BUTTON_MENU BUTTON_RC_MENU |
211 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_RC_PLAY | 211 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_RC_PLAY |
212 | 212 | ||
213 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 213 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
214 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 214 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
215 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 215 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
216 | 216 | ||
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 69dc607090..4113ed7de2 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -128,7 +128,7 @@ char buf[255]; | |||
128 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 128 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
129 | #define SUPERDOM_CANCEL BUTTON_BACK | 129 | #define SUPERDOM_CANCEL BUTTON_BACK |
130 | 130 | ||
131 | #elif CONFIG_KEYPAD == COWOND2_PAD | 131 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
132 | #define SUPERDOM_CANCEL BUTTON_POWER | 132 | #define SUPERDOM_CANCEL BUTTON_POWER |
133 | 133 | ||
134 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 134 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
diff --git a/apps/plugins/test_codec.c b/apps/plugins/test_codec.c index 74d2e40fd2..e57af8cc0a 100644 --- a/apps/plugins/test_codec.c +++ b/apps/plugins/test_codec.c | |||
@@ -30,7 +30,7 @@ PLUGIN_HEADER | |||
30 | #define TESTCODEC_EXITBUTTON BUTTON_RC_PLAY | 30 | #define TESTCODEC_EXITBUTTON BUTTON_RC_PLAY |
31 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 31 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD |
32 | #define TESTCODEC_EXITBUTTON BUTTON_PLAY | 32 | #define TESTCODEC_EXITBUTTON BUTTON_PLAY |
33 | #elif CONFIG_KEYPAD == COWOND2_PAD || CONFIG_KEYPAD == ONDAVX747_PAD | 33 | #elif CONFIG_KEYPAD == COWON_D2_PAD || CONFIG_KEYPAD == ONDAVX747_PAD |
34 | #define TESTCODEC_EXITBUTTON BUTTON_POWER | 34 | #define TESTCODEC_EXITBUTTON BUTTON_POWER |
35 | #elif defined(HAVE_TOUCHSCREEN) | 35 | #elif defined(HAVE_TOUCHSCREEN) |
36 | #define TESTCODEC_EXITBUTTON BUTTON_TOPLEFT | 36 | #define TESTCODEC_EXITBUTTON BUTTON_TOPLEFT |
diff --git a/apps/plugins/test_touchscreen.c b/apps/plugins/test_touchscreen.c index ae7e453fd3..902a2bd089 100644 --- a/apps/plugins/test_touchscreen.c +++ b/apps/plugins/test_touchscreen.c | |||
@@ -22,7 +22,7 @@ | |||
22 | 22 | ||
23 | PLUGIN_HEADER | 23 | PLUGIN_HEADER |
24 | 24 | ||
25 | #if (CONFIG_KEYPAD == COWOND2_PAD) | 25 | #if (CONFIG_KEYPAD == COWON_D2_PAD) |
26 | #define TOUCHSCREEN_QUIT BUTTON_POWER | 26 | #define TOUCHSCREEN_QUIT BUTTON_POWER |
27 | #define TOUCHSCREEN_TOGGLE BUTTON_MENU | 27 | #define TOUCHSCREEN_TOGGLE BUTTON_MENU |
28 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 28 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 046c76523a..a212885540 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -290,7 +290,7 @@ PLUGIN_HEADER | |||
290 | #define VIEWER_RC_QUIT BUTTON_REC | 290 | #define VIEWER_RC_QUIT BUTTON_REC |
291 | 291 | ||
292 | /* Cowon D2 keys */ | 292 | /* Cowon D2 keys */ |
293 | #elif CONFIG_KEYPAD == COWOND2_PAD | 293 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
294 | #define VIEWER_QUIT BUTTON_POWER | 294 | #define VIEWER_QUIT BUTTON_POWER |
295 | #define VIEWER_MENU BUTTON_MENU | 295 | #define VIEWER_MENU BUTTON_MENU |
296 | 296 | ||
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 09c7c0ab6a..53455740a7 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -240,7 +240,7 @@ PLUGIN_HEADER | |||
240 | #define LABEL_MENU "MENU" | 240 | #define LABEL_MENU "MENU" |
241 | #define LABEL_VOLUME "VOL UP/DN" | 241 | #define LABEL_VOLUME "VOL UP/DN" |
242 | 242 | ||
243 | #elif CONFIG_KEYPAD == COWOND2_PAD | 243 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
244 | #define VUMETER_QUIT BUTTON_POWER | 244 | #define VUMETER_QUIT BUTTON_POWER |
245 | #define VUMETER_MENU BUTTON_MENU | 245 | #define VUMETER_MENU BUTTON_MENU |
246 | #define VUMETER_MENU_EXIT BUTTON_POWER | 246 | #define VUMETER_MENU_EXIT BUTTON_POWER |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index bc7d8bf545..5a897be086 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -208,7 +208,7 @@ PLUGIN_HEADER | |||
208 | #define BTN_QUIT BUTTON_RC_REC | 208 | #define BTN_QUIT BUTTON_RC_REC |
209 | #define BTN_STOPRESET BUTTON_RC_MODE | 209 | #define BTN_STOPRESET BUTTON_RC_MODE |
210 | 210 | ||
211 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 211 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
212 | 212 | ||
213 | #define BTN_QUIT BUTTON_POWER | 213 | #define BTN_QUIT BUTTON_POWER |
214 | 214 | ||
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index a105e1a4b6..347270a4bd 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -168,7 +168,7 @@ PLUGIN_HEADER | |||
168 | #define DOWN BUTTON_RC_VOL_DOWN | 168 | #define DOWN BUTTON_RC_VOL_DOWN |
169 | #define PAUSE BUTTON_RC_PLAY | 169 | #define PAUSE BUTTON_RC_PLAY |
170 | 170 | ||
171 | #elif CONFIG_KEYPAD == COWOND2_PAD | 171 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
172 | 172 | ||
173 | #define QUIT BUTTON_POWER | 173 | #define QUIT BUTTON_POWER |
174 | 174 | ||
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index a1af98db3f..ed22c7225f 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -129,7 +129,7 @@ | |||
129 | #define ZX_SELECT BUTTON_RC_PLAY | 129 | #define ZX_SELECT BUTTON_RC_PLAY |
130 | #define ZX_MENU BUTTON_RC_REC | 130 | #define ZX_MENU BUTTON_RC_REC |
131 | 131 | ||
132 | #elif CONFIG_KEYPAD == COWOND2_PAD | 132 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
133 | #define ZX_MENU (BUTTON_MENU|BUTTON_REL) | 133 | #define ZX_MENU (BUTTON_MENU|BUTTON_REL) |
134 | 134 | ||
135 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 135 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 4e41087e25..c3085e3714 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -135,7 +135,7 @@ | |||
135 | #define KBD_UP BUTTON_RC_VOL_UP | 135 | #define KBD_UP BUTTON_RC_VOL_UP |
136 | #define KBD_DOWN BUTTON_RC_VOL_DOWN | 136 | #define KBD_DOWN BUTTON_RC_VOL_DOWN |
137 | 137 | ||
138 | #elif CONFIG_KEYPAD == COWOND2_PAD | 138 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
139 | 139 | ||
140 | #define KBD_ABORT BUTTON_POWER | 140 | #define KBD_ABORT BUTTON_POWER |
141 | 141 | ||
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index d49b94d434..d072cf6cde 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -110,7 +110,7 @@ | |||
110 | #define FM_PRESET | 110 | #define FM_PRESET |
111 | #define FM_MODE | 111 | #define FM_MODE |
112 | 112 | ||
113 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 113 | #elif (CONFIG_KEYPAD == COWON_D2_PAD) |
114 | #define FM_MENU | 114 | #define FM_MENU |
115 | #define FM_PRESET | 115 | #define FM_PRESET |
116 | #define FM_STOP | 116 | #define FM_STOP |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 303e5645df..3b50775faa 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -94,7 +94,7 @@ | |||
94 | #define GIGABEAT_S_PAD 19 | 94 | #define GIGABEAT_S_PAD 19 |
95 | #define LOGIK_DAX_PAD 20 | 95 | #define LOGIK_DAX_PAD 20 |
96 | #define IAUDIO67_PAD 21 | 96 | #define IAUDIO67_PAD 21 |
97 | #define COWOND2_PAD 22 | 97 | #define COWON_D2_PAD 22 |
98 | #define IAUDIO_M3_PAD 23 | 98 | #define IAUDIO_M3_PAD 23 |
99 | #define CREATIVEZVM_PAD 24 | 99 | #define CREATIVEZVM_PAD 24 |
100 | #define SANSA_M200_PAD 25 | 100 | #define SANSA_M200_PAD 25 |
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h index 88c7ce5b8f..465fe7a43b 100644 --- a/firmware/export/config/cowond2.h +++ b/firmware/export/config/cowond2.h | |||
@@ -82,7 +82,7 @@ | |||
82 | #define HAVE_LCD_ENABLE | 82 | #define HAVE_LCD_ENABLE |
83 | 83 | ||
84 | /* define this to indicate your device's keypad */ | 84 | /* define this to indicate your device's keypad */ |
85 | #define CONFIG_KEYPAD COWOND2_PAD | 85 | #define CONFIG_KEYPAD COWON_D2_PAD |
86 | #define HAVE_TOUCHSCREEN | 86 | #define HAVE_TOUCHSCREEN |
87 | #define HAVE_BUTTON_DATA | 87 | #define HAVE_BUTTON_DATA |
88 | 88 | ||
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index d432b39b14..9776248e2b 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -89,7 +89,7 @@ enum { | |||
89 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 89 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD |
90 | #define USBPOWER_BUTTON BUTTON_RIGHT | 90 | #define USBPOWER_BUTTON BUTTON_RIGHT |
91 | #define USBPOWER_BTN_IGNORE BUTTON_LEFT | 91 | #define USBPOWER_BTN_IGNORE BUTTON_LEFT |
92 | #elif CONFIG_KEYPAD == COWOND2_PAD | 92 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
93 | #define USBPOWER_BUTTON BUTTON_MENU | 93 | #define USBPOWER_BUTTON BUTTON_MENU |
94 | #define USBPOWER_BTN_IGNORE BUTTON_MINUS | 94 | #define USBPOWER_BTN_IGNORE BUTTON_MINUS |
95 | #endif | 95 | #endif |
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index e2bae1cf7b..2fbc41e373 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c | |||
@@ -782,7 +782,7 @@ void button_event(int key, bool pressed) | |||
782 | new_btn = BUTTON_POWER; | 782 | new_btn = BUTTON_POWER; |
783 | break; | 783 | break; |
784 | 784 | ||
785 | #elif CONFIG_KEYPAD == COWOND2_PAD | 785 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
786 | case SDLK_ESCAPE: | 786 | case SDLK_ESCAPE: |
787 | new_btn = BUTTON_POWER; | 787 | new_btn = BUTTON_POWER; |
788 | break; | 788 | break; |