diff options
65 files changed, 79 insertions, 79 deletions
diff --git a/apps/SOURCES b/apps/SOURCES index 4ae04a4cf8..62291bb992 100644 --- a/apps/SOURCES +++ b/apps/SOURCES | |||
@@ -300,8 +300,8 @@ keymaps/keymap-xduoox3.c | |||
300 | keymaps/keymap-xduoox3ii.c | 300 | keymaps/keymap-xduoox3ii.c |
301 | #elif CONFIG_KEYPAD == XDUOO_X20_PAD | 301 | #elif CONFIG_KEYPAD == XDUOO_X20_PAD |
302 | keymaps/keymap-xduoox20.c | 302 | keymaps/keymap-xduoox20.c |
303 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 303 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
304 | keymaps/keymap-fiiom3k.c | 304 | keymaps/keymap-fiiom3klinux.c |
305 | #elif CONFIG_KEYPAD == EROSQ_PAD | 305 | #elif CONFIG_KEYPAD == EROSQ_PAD |
306 | keymaps/keymap-erosq.c | 306 | keymaps/keymap-erosq.c |
307 | #endif | 307 | #endif |
diff --git a/apps/bitmaps/native/SOURCES b/apps/bitmaps/native/SOURCES index 1d1fcd4783..c31f6605df 100644 --- a/apps/bitmaps/native/SOURCES +++ b/apps/bitmaps/native/SOURCES | |||
@@ -50,7 +50,7 @@ toolsicon.70x70x16.bmp | |||
50 | hibyicon.130x130x16.bmp | 50 | hibyicon.130x130x16.bmp |
51 | rockboxicon.130x130x16.bmp | 51 | rockboxicon.130x130x16.bmp |
52 | toolsicon.130x130x16.bmp | 52 | toolsicon.130x130x16.bmp |
53 | #elif defined(FIIO_M3K) | 53 | #elif defined(FIIO_M3K_LINUX) |
54 | fiioicon.130x130x16.bmp | 54 | fiioicon.130x130x16.bmp |
55 | rockboxicon.130x130x16.bmp | 55 | rockboxicon.130x130x16.bmp |
56 | toolsicon.130x130x16.bmp | 56 | toolsicon.130x130x16.bmp |
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 7187e8135c..8716b302c4 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -2528,7 +2528,7 @@ static const struct { | |||
2528 | { "Screendump", dbg_screendump }, | 2528 | { "Screendump", dbg_screendump }, |
2529 | #endif | 2529 | #endif |
2530 | { "Skin Engine RAM usage", dbg_skin_engine }, | 2530 | { "Skin Engine RAM usage", dbg_skin_engine }, |
2531 | #if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)) && !defined(SIMULATOR) | 2531 | #if ((CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR) |
2532 | { "View HW info", dbg_hw_info }, | 2532 | { "View HW info", dbg_hw_info }, |
2533 | #endif | 2533 | #endif |
2534 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) | 2534 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) |
diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3klinux.c index 4fa97e9435..7cec8c67eb 100644 --- a/apps/keymaps/keymap-fiiom3k.c +++ b/apps/keymaps/keymap-fiiom3klinux.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | /* Button Code Definitions for FiiO M3K target */ | 22 | /* Button Code Definitions for FiiO M3K Linux target */ |
23 | 23 | ||
24 | #include "config.h" | 24 | #include "config.h" |
25 | #include "action.h" | 25 | #include "action.h" |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index deee2815bb..dc22489b15 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -91,7 +91,7 @@ | |||
91 | CONFIG_KEYPAD == IHIFI_800_PAD || \ | 91 | CONFIG_KEYPAD == IHIFI_800_PAD || \ |
92 | CONFIG_KEYPAD == XDUOO_X3II_PAD || \ | 92 | CONFIG_KEYPAD == XDUOO_X3II_PAD || \ |
93 | CONFIG_KEYPAD == XDUOO_X20_PAD || \ | 93 | CONFIG_KEYPAD == XDUOO_X20_PAD || \ |
94 | CONFIG_KEYPAD == FIIO_M3K_PAD || \ | 94 | CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD || \ |
95 | CONFIG_KEYPAD == EROSQ_PAD) | 95 | CONFIG_KEYPAD == EROSQ_PAD) |
96 | 96 | ||
97 | #define BATTERY_ON BUTTON_PLAY | 97 | #define BATTERY_ON BUTTON_PLAY |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index b5e58c5914..f434784a5f 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -559,7 +559,7 @@ enum { | |||
559 | #define BJACK_RIGHT BUTTON_NEXT | 559 | #define BJACK_RIGHT BUTTON_NEXT |
560 | #define BJACK_LEFT BUTTON_PREV | 560 | #define BJACK_LEFT BUTTON_PREV |
561 | 561 | ||
562 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 562 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
563 | #define BJACK_SELECT_NAME "PLAY" | 563 | #define BJACK_SELECT_NAME "PLAY" |
564 | #define BJACK_STAY_NAME "NEXT" | 564 | #define BJACK_STAY_NAME "NEXT" |
565 | #define BJACK_QUIT_NAME "POWER" | 565 | #define BJACK_QUIT_NAME "POWER" |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index 4f4ffc8df6..70ad58a908 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -314,7 +314,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD | |||
314 | #define UP BUTTON_HOME | 314 | #define UP BUTTON_HOME |
315 | #define DOWN BUTTON_OPTION | 315 | #define DOWN BUTTON_OPTION |
316 | 316 | ||
317 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 317 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
318 | #define QUIT BUTTON_POWER | 318 | #define QUIT BUTTON_POWER |
319 | #define LEFT BUTTON_PREV | 319 | #define LEFT BUTTON_PREV |
320 | #define RIGHT BUTTON_NEXT | 320 | #define RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 77f79f9057..46d9da6149 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -504,7 +504,7 @@ F3: equal to "=" | |||
504 | #define CALCULATOR_CALC (BUTTON_PLAY|BUTTON_REPEAT) | 504 | #define CALCULATOR_CALC (BUTTON_PLAY|BUTTON_REPEAT) |
505 | #define CALCULATOR_CLEAR (BUTTON_POWER|BUTTON_REPEAT) | 505 | #define CALCULATOR_CLEAR (BUTTON_POWER|BUTTON_REPEAT) |
506 | 506 | ||
507 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 507 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
508 | #define CALCULATOR_LEFT BUTTON_PREV | 508 | #define CALCULATOR_LEFT BUTTON_PREV |
509 | #define CALCULATOR_RIGHT BUTTON_NEXT | 509 | #define CALCULATOR_RIGHT BUTTON_NEXT |
510 | #define CALCULATOR_UP BUTTON_HOME | 510 | #define CALCULATOR_UP BUTTON_HOME |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 59aba941ae..b52a62328f 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -391,7 +391,7 @@ | |||
391 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP | 391 | #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP |
392 | #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN | 392 | #define CALENDAR_PREV_MONTH BUTTON_VOL_DOWN |
393 | 393 | ||
394 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 394 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
395 | #define CALENDAR_QUIT BUTTON_POWER | 395 | #define CALENDAR_QUIT BUTTON_POWER |
396 | #define CALENDAR_SELECT BUTTON_PLAY | 396 | #define CALENDAR_SELECT BUTTON_PLAY |
397 | #define CALENDAR_NEXT_WEEK BUTTON_OPTION | 397 | #define CALENDAR_NEXT_WEEK BUTTON_OPTION |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index e9b66787ee..aacc2ba412 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -539,7 +539,7 @@ | |||
539 | #define CB_SCROLL_LEFT (BUTTON_PREV|BUTTON_REPEAT) | 539 | #define CB_SCROLL_LEFT (BUTTON_PREV|BUTTON_REPEAT) |
540 | #define CB_SCROLL_RIGHT (BUTTON_NEXT|BUTTON_REPEAT) | 540 | #define CB_SCROLL_RIGHT (BUTTON_NEXT|BUTTON_REPEAT) |
541 | 541 | ||
542 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 542 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
543 | #define CB_SELECT BUTTON_PLAY | 543 | #define CB_SELECT BUTTON_PLAY |
544 | #define CB_UP BUTTON_HOME | 544 | #define CB_UP BUTTON_HOME |
545 | #define CB_DOWN BUTTON_OPTION | 545 | #define CB_DOWN BUTTON_OPTION |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 27b3990b8b..9b933cdcd4 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -376,7 +376,7 @@ | |||
376 | #define CHC_SETTINGS_OK BUTTON_PLAY | 376 | #define CHC_SETTINGS_OK BUTTON_PLAY |
377 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | 377 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
378 | 378 | ||
379 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 379 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
380 | #define CHC_QUIT BUTTON_POWER | 380 | #define CHC_QUIT BUTTON_POWER |
381 | #define CHC_STARTSTOP BUTTON_PLAY | 381 | #define CHC_STARTSTOP BUTTON_PLAY |
382 | #define CHC_RESET BUTTON_OPTION | 382 | #define CHC_RESET BUTTON_OPTION |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 84e8e709c4..dde6faaccf 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1259,7 +1259,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
1259 | #define CHIP8_KEY6 BUTTON_NEXT | 1259 | #define CHIP8_KEY6 BUTTON_NEXT |
1260 | #define CHIP8_KEY8 BUTTON_OPTION | 1260 | #define CHIP8_KEY8 BUTTON_OPTION |
1261 | 1261 | ||
1262 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 1262 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
1263 | #define CHIP8_OFF BUTTON_POWER | 1263 | #define CHIP8_OFF BUTTON_POWER |
1264 | #define CHIP8_KEY2 BUTTON_HOME | 1264 | #define CHIP8_KEY2 BUTTON_HOME |
1265 | #define CHIP8_KEY4 BUTTON_PREV | 1265 | #define CHIP8_KEY4 BUTTON_PREV |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 35c80a960b..23b32150da 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -198,7 +198,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
198 | #define ACTION BUTTON_SELECT | 198 | #define ACTION BUTTON_SELECT |
199 | #define ACTIONTEXT "Select" | 199 | #define ACTIONTEXT "Select" |
200 | 200 | ||
201 | #elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD || CONFIG_KEYPAD == FIIO_M3K_PAD || CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD || CONFIG_KEYPAD == EROSQ_PAD | 201 | #elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD || CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD || CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD || CONFIG_KEYPAD == EROSQ_PAD |
202 | #define QUIT BUTTON_POWER | 202 | #define QUIT BUTTON_POWER |
203 | #define ACTION BUTTON_PLAY | 203 | #define ACTION BUTTON_PLAY |
204 | #define ACTIONTEXT "PLAY" | 204 | #define ACTIONTEXT "PLAY" |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 08264e8490..eb0e0d1a59 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -292,7 +292,7 @@ | |||
292 | #define CLIX_BUTTON_RIGHT BUTTON_NEXT | 292 | #define CLIX_BUTTON_RIGHT BUTTON_NEXT |
293 | #define CLIX_BUTTON_CLICK BUTTON_PLAY | 293 | #define CLIX_BUTTON_CLICK BUTTON_PLAY |
294 | 294 | ||
295 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 295 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
296 | #define CLIX_BUTTON_QUIT BUTTON_POWER | 296 | #define CLIX_BUTTON_QUIT BUTTON_POWER |
297 | #define CLIX_BUTTON_UP BUTTON_HOME | 297 | #define CLIX_BUTTON_UP BUTTON_HOME |
298 | #define CLIX_BUTTON_DOWN BUTTON_OPTION | 298 | #define CLIX_BUTTON_DOWN BUTTON_OPTION |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 416bf1105d..b84a2636cb 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -380,7 +380,7 @@ | |||
380 | #define CUBE_PAUSE BUTTON_HOME | 380 | #define CUBE_PAUSE BUTTON_HOME |
381 | #define CUBE_HIGHSPEED BUTTON_PLAY | 381 | #define CUBE_HIGHSPEED BUTTON_PLAY |
382 | 382 | ||
383 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 383 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
384 | #define CUBE_QUIT BUTTON_POWER | 384 | #define CUBE_QUIT BUTTON_POWER |
385 | #define CUBE_NEXT BUTTON_NEXT | 385 | #define CUBE_NEXT BUTTON_NEXT |
386 | #define CUBE_PREV BUTTON_PREV | 386 | #define CUBE_PREV BUTTON_PREV |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 99b4de827d..233c1cac8f 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -577,7 +577,7 @@ void I_ShutdownGraphics(void) | |||
577 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 577 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
578 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 578 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
579 | 579 | ||
580 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 580 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
581 | #define DOOMBUTTON_UP BUTTON_UP | 581 | #define DOOMBUTTON_UP BUTTON_UP |
582 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 582 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
583 | #define DOOMBUTTON_LEFT BUTTON_PREV | 583 | #define DOOMBUTTON_LEFT BUTTON_PREV |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index a4d59fff3d..4a6e64a5be 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -448,7 +448,7 @@ | |||
448 | #define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_PLAY) | 448 | #define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_PLAY) |
449 | #define FLIPIT_TOGGLE BUTTON_PLAY | 449 | #define FLIPIT_TOGGLE BUTTON_PLAY |
450 | 450 | ||
451 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 451 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
452 | 452 | ||
453 | #define FLIPIT_LEFT BUTTON_PREV | 453 | #define FLIPIT_LEFT BUTTON_PREV |
454 | #define FLIPIT_RIGHT BUTTON_NEXT | 454 | #define FLIPIT_RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index d4d013550e..55bd513fe0 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -470,7 +470,7 @@ | |||
470 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_PREV) | 470 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_PREV) |
471 | #define FRACTAL_RESET (BUTTON_HOME | BUTTON_POWER) | 471 | #define FRACTAL_RESET (BUTTON_HOME | BUTTON_POWER) |
472 | 472 | ||
473 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 473 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
474 | #define FRACTAL_QUIT BUTTON_POWER | 474 | #define FRACTAL_QUIT BUTTON_POWER |
475 | #define FRACTAL_UP BUTTON_HOME | 475 | #define FRACTAL_UP BUTTON_HOME |
476 | #define FRACTAL_DOWN BUTTON_OPTION | 476 | #define FRACTAL_DOWN BUTTON_OPTION |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index db70216464..375588c7d8 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -455,7 +455,7 @@ | |||
455 | #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT | 455 | #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT |
456 | #define GBN_BUTTON_NEXT_VAR BUTTON_HOME | BUTTON_POWER | 456 | #define GBN_BUTTON_NEXT_VAR BUTTON_HOME | BUTTON_POWER |
457 | 457 | ||
458 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 458 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
459 | #define GBN_BUTTON_UP BUTTON_HOME | 459 | #define GBN_BUTTON_UP BUTTON_HOME |
460 | #define GBN_BUTTON_DOWN BUTTON_OPTION | 460 | #define GBN_BUTTON_DOWN BUTTON_OPTION |
461 | #define GBN_BUTTON_LEFT BUTTON_PREV | 461 | #define GBN_BUTTON_LEFT BUTTON_PREV |
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index 4559a7b3a3..221ea3380e 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -491,7 +491,7 @@ | |||
491 | #define IMGVIEW_MENU BUTTON_POWER | 491 | #define IMGVIEW_MENU BUTTON_POWER |
492 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) | 492 | #define IMGVIEW_SLIDE_SHOW (BUTTON_HOME|BUTTON_POWER) |
493 | 493 | ||
494 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 494 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
495 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY | 495 | #define IMGVIEW_ZOOM_PRE BUTTON_PLAY |
496 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) | 496 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) |
497 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) | 497 | #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT) |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 1c39a01c87..21bba6d9d4 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -275,7 +275,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
275 | #define RIGHT BUTTON_VOL_DOWN | 275 | #define RIGHT BUTTON_VOL_DOWN |
276 | #define FIRE BUTTON_VOL_UP | 276 | #define FIRE BUTTON_VOL_UP |
277 | 277 | ||
278 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 278 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
279 | 279 | ||
280 | #define QUIT BUTTON_POWER | 280 | #define QUIT BUTTON_POWER |
281 | #define LEFT BUTTON_HOME | 281 | #define LEFT BUTTON_HOME |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index b58c47dd12..928cd78c95 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -357,7 +357,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
357 | #define HK_SELECT "PLAY" | 357 | #define HK_SELECT "PLAY" |
358 | #define HK_CANCEL "POWER" | 358 | #define HK_CANCEL "POWER" |
359 | 359 | ||
360 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 360 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
361 | #define JEWELS_UP BUTTON_HOME | 361 | #define JEWELS_UP BUTTON_HOME |
362 | #define JEWELS_DOWN BUTTON_OPTION | 362 | #define JEWELS_DOWN BUTTON_OPTION |
363 | #define JEWELS_LEFT BUTTON_PREV | 363 | #define JEWELS_LEFT BUTTON_PREV |
diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h index 7c1b998400..b0667b13cc 100644 --- a/apps/plugins/lib/keymaps.h +++ b/apps/plugins/lib/keymaps.h | |||
@@ -223,7 +223,7 @@ | |||
223 | #define BTN_FIRE BUTTON_PLAY | 223 | #define BTN_FIRE BUTTON_PLAY |
224 | #define BTN_PAUSE BUTTON_POWER | 224 | #define BTN_PAUSE BUTTON_POWER |
225 | 225 | ||
226 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 226 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
227 | #define BTN_UP BUTTON_VOL_UP | 227 | #define BTN_UP BUTTON_VOL_UP |
228 | #define BTN_DOWN BUTTON_VOL_DOWN | 228 | #define BTN_DOWN BUTTON_VOL_DOWN |
229 | #define BTN_LEFT BUTTON_PREV | 229 | #define BTN_LEFT BUTTON_PREV |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 4d2a08cf47..4b5a0a4505 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -233,7 +233,7 @@ const struct button_mapping pla_main_ctx[] = | |||
233 | { PLA_DOWN_REPEAT, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_NONE }, | 233 | { PLA_DOWN_REPEAT, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_NONE }, |
234 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 234 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
235 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 235 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
236 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 236 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
237 | { PLA_UP, BUTTON_HOME, BUTTON_NONE }, | 237 | { PLA_UP, BUTTON_HOME, BUTTON_NONE }, |
238 | { PLA_DOWN, BUTTON_OPTION, BUTTON_NONE }, | 238 | { PLA_DOWN, BUTTON_OPTION, BUTTON_NONE }, |
239 | { PLA_LEFT, BUTTON_PREV, BUTTON_NONE }, | 239 | { PLA_LEFT, BUTTON_PREV, BUTTON_NONE }, |
@@ -482,7 +482,7 @@ const struct button_mapping pla_main_ctx[] = | |||
482 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 482 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
483 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | 483 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, |
484 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 484 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
485 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 485 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
486 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, | 486 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, |
487 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, | 487 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, |
488 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 488 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index 641991cfeb..7dde947e1c 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -301,7 +301,7 @@ | |||
301 | #define MIDI_VOL_DOWN BUTTON_VOL_DOWN | 301 | #define MIDI_VOL_DOWN BUTTON_VOL_DOWN |
302 | #define MIDI_PLAYPAUSE BUTTON_PLAY | 302 | #define MIDI_PLAYPAUSE BUTTON_PLAY |
303 | 303 | ||
304 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 304 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
305 | #define MIDI_QUIT BUTTON_POWER | 305 | #define MIDI_QUIT BUTTON_POWER |
306 | #define MIDI_FFWD BUTTON_NEXT | 306 | #define MIDI_FFWD BUTTON_NEXT |
307 | #define MIDI_REWIND BUTTON_PREV | 307 | #define MIDI_REWIND BUTTON_PREV |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 11c0e86619..590ea56d08 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -395,7 +395,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
395 | # define MINESWP_DISCOVER2 BUTTON_VOL_UP | 395 | # define MINESWP_DISCOVER2 BUTTON_VOL_UP |
396 | # define MINESWP_INFO (BUTTON_PLAY | BUTTON_OPTION) | 396 | # define MINESWP_INFO (BUTTON_PLAY | BUTTON_OPTION) |
397 | 397 | ||
398 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 398 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
399 | # define MINESWP_LEFT BUTTON_PREV | 399 | # define MINESWP_LEFT BUTTON_PREV |
400 | # define MINESWP_RIGHT BUTTON_NEXT | 400 | # define MINESWP_RIGHT BUTTON_NEXT |
401 | # define MINESWP_UP BUTTON_HOME | 401 | # define MINESWP_UP BUTTON_HOME |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 177835549c..244265b250 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2562,7 +2562,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
2562 | #define MP3ENC_DONE BUTTON_POWER | 2562 | #define MP3ENC_DONE BUTTON_POWER |
2563 | #define MP3ENC_SELECT BUTTON_PLAY | 2563 | #define MP3ENC_SELECT BUTTON_PLAY |
2564 | 2564 | ||
2565 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 2565 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
2566 | #define MP3ENC_PREV BUTTON_HOME | 2566 | #define MP3ENC_PREV BUTTON_HOME |
2567 | #define MP3ENC_NEXT BUTTON_OPTION | 2567 | #define MP3ENC_NEXT BUTTON_OPTION |
2568 | #define MP3ENC_DONE BUTTON_POWER | 2568 | #define MP3ENC_DONE BUTTON_POWER |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 1bc7d4db96..44c72dd853 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -326,7 +326,7 @@ struct mpeg_settings settings; | |||
326 | #define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN | 326 | #define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN |
327 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 327 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
328 | 328 | ||
329 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 329 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
330 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 330 | #define MPEG_START_TIME_SELECT BUTTON_PLAY |
331 | #define MPEG_START_TIME_LEFT BUTTON_PREV | 331 | #define MPEG_START_TIME_LEFT BUTTON_PREV |
332 | #define MPEG_START_TIME_RIGHT BUTTON_NEXT | 332 | #define MPEG_START_TIME_RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 619be8f1ef..81b6d37857 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -459,7 +459,7 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
459 | #define MPEG_RW BUTTON_PREV | 459 | #define MPEG_RW BUTTON_PREV |
460 | #define MPEG_FF BUTTON_NEXT | 460 | #define MPEG_FF BUTTON_NEXT |
461 | 461 | ||
462 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 462 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
463 | #define MPEG_MENU BUTTON_PLAY | 463 | #define MPEG_MENU BUTTON_PLAY |
464 | #define MPEG_STOP BUTTON_POWER | 464 | #define MPEG_STOP BUTTON_POWER |
465 | #define MPEG_PAUSE BUTTON_HOME | 465 | #define MPEG_PAUSE BUTTON_HOME |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 62c11b91c9..d50de7f2a0 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -498,7 +498,7 @@ | |||
498 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | 498 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
499 | #define NEED_LASTBUTTON | 499 | #define NEED_LASTBUTTON |
500 | 500 | ||
501 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 501 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
502 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | 502 | #define OSCILLOSCOPE_QUIT BUTTON_POWER |
503 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY | 503 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY |
504 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) | 504 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL) |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 39583edbd4..48196146a7 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -373,7 +373,7 @@ | |||
373 | #define PACMAN_1UP BUTTON_VOL_UP | 373 | #define PACMAN_1UP BUTTON_VOL_UP |
374 | #define PACMAN_COIN BUTTON_PLAY | 374 | #define PACMAN_COIN BUTTON_PLAY |
375 | 375 | ||
376 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 376 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
377 | #define PACMAN_UP BUTTON_PREV | 377 | #define PACMAN_UP BUTTON_PREV |
378 | #define PACMAN_DOWN BUTTON_NEXT | 378 | #define PACMAN_DOWN BUTTON_NEXT |
379 | #define PACMAN_LEFT BUTTON_HOME | 379 | #define PACMAN_LEFT BUTTON_HOME |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index a84b687763..e16cf2921e 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -643,7 +643,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
643 | #define LVL_UP_TEXT "VOL+" | 643 | #define LVL_UP_TEXT "VOL+" |
644 | #define LVL_DOWN_TEXT "VOL-" | 644 | #define LVL_DOWN_TEXT "VOL-" |
645 | 645 | ||
646 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 646 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
647 | #define PEGBOX_SELECT BUTTON_PLAY | 647 | #define PEGBOX_SELECT BUTTON_PLAY |
648 | #define PEGBOX_QUIT BUTTON_POWER | 648 | #define PEGBOX_QUIT BUTTON_POWER |
649 | #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) | 649 | #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) |
@@ -677,7 +677,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
677 | #define LVL_UP_TEXT "VOL+" | 677 | #define LVL_UP_TEXT "VOL+" |
678 | #define LVL_DOWN_TEXT "VOL-" | 678 | #define LVL_DOWN_TEXT "VOL-" |
679 | 679 | ||
680 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 680 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
681 | #define PEGBOX_SELECT BUTTON_PLAY | 681 | #define PEGBOX_SELECT BUTTON_PLAY |
682 | #define PEGBOX_QUIT BUTTON_POWER | 682 | #define PEGBOX_QUIT BUTTON_POWER |
683 | #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) | 683 | #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index d5952aac35..4df4db66bb 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -301,7 +301,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
301 | #define PONG_RIGHT_UP BUTTON_HOME | 301 | #define PONG_RIGHT_UP BUTTON_HOME |
302 | #define PONG_RIGHT_DOWN BUTTON_NEXT | 302 | #define PONG_RIGHT_DOWN BUTTON_NEXT |
303 | 303 | ||
304 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 304 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
305 | #define PONG_QUIT BUTTON_POWER | 305 | #define PONG_QUIT BUTTON_POWER |
306 | #define PONG_PAUSE BUTTON_PLAY | 306 | #define PONG_PAUSE BUTTON_PLAY |
307 | #define PONG_LEFT_UP BUTTON_PREV | 307 | #define PONG_LEFT_UP BUTTON_PREV |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index 0a2348a28d..c94ca59179 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -330,7 +330,7 @@ | |||
330 | #define REVERSI_BUTTON_MENU BUTTON_PLAY | 330 | #define REVERSI_BUTTON_MENU BUTTON_PLAY |
331 | #define REVERSI_BUTTON_MENU_LONGPRESS | 331 | #define REVERSI_BUTTON_MENU_LONGPRESS |
332 | 332 | ||
333 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 333 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
334 | #define REVERSI_BUTTON_QUIT BUTTON_POWER | 334 | #define REVERSI_BUTTON_QUIT BUTTON_POWER |
335 | #define REVERSI_BUTTON_UP BUTTON_HOME | 335 | #define REVERSI_BUTTON_UP BUTTON_HOME |
336 | #define REVERSI_BUTTON_DOWN BUTTON_OPTION | 336 | #define REVERSI_BUTTON_DOWN BUTTON_OPTION |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 6a8b50a68d..7958818a8e 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -443,7 +443,7 @@ | |||
443 | #define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) | 443 | #define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) |
444 | #define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) | 444 | #define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) |
445 | 445 | ||
446 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 446 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
447 | 447 | ||
448 | #define ROCKBLOX_OFF BUTTON_POWER | 448 | #define ROCKBLOX_OFF BUTTON_POWER |
449 | #define ROCKBLOX_ROTATE_CCW BUTTON_HOME | 449 | #define ROCKBLOX_ROTATE_CCW BUTTON_HOME |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 75de5230f2..1f65b780a6 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -435,7 +435,7 @@ static void setoptions (void) | |||
435 | options.SELECT = BUTTON_VOL_UP; | 435 | options.SELECT = BUTTON_VOL_UP; |
436 | options.MENU = BUTTON_POWER; | 436 | options.MENU = BUTTON_POWER; |
437 | 437 | ||
438 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 438 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
439 | options.UP = BUTTON_PREV; | 439 | options.UP = BUTTON_PREV; |
440 | options.DOWN = BUTTON_NEXT; | 440 | options.DOWN = BUTTON_NEXT; |
441 | 441 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index f28fbdf622..e2b1f2a3e3 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -360,7 +360,7 @@ | |||
360 | #define ROCKPAINT_LEFT BUTTON_PREV | 360 | #define ROCKPAINT_LEFT BUTTON_PREV |
361 | #define ROCKPAINT_RIGHT BUTTON_NEXT | 361 | #define ROCKPAINT_RIGHT BUTTON_NEXT |
362 | 362 | ||
363 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 363 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
364 | #define ROCKPAINT_QUIT BUTTON_POWER | 364 | #define ROCKPAINT_QUIT BUTTON_POWER |
365 | #define ROCKPAINT_DRAW BUTTON_PLAY | 365 | #define ROCKPAINT_DRAW BUTTON_PLAY |
366 | #define ROCKPAINT_MENU (BUTTON_HOME | BUTTON_POWER) | 366 | #define ROCKPAINT_MENU (BUTTON_HOME | BUTTON_POWER) |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 8c70f6b4a6..dec400c079 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -321,7 +321,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
321 | #define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER) | 321 | #define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER) |
322 | #define PUZZLE_PICTURE BUTTON_PLAY | 322 | #define PUZZLE_PICTURE BUTTON_PLAY |
323 | 323 | ||
324 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 324 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
325 | #define PUZZLE_QUIT BUTTON_POWER | 325 | #define PUZZLE_QUIT BUTTON_POWER |
326 | #define PUZZLE_LEFT BUTTON_PREV | 326 | #define PUZZLE_LEFT BUTTON_PREV |
327 | #define PUZZLE_RIGHT BUTTON_NEXT | 327 | #define PUZZLE_RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 0f2bcdce6c..c5c28eba6e 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -281,7 +281,7 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
281 | #define SNAKE_DOWN BUTTON_OPTION | 281 | #define SNAKE_DOWN BUTTON_OPTION |
282 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | 282 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
283 | 283 | ||
284 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 284 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
285 | #define SNAKE_QUIT BUTTON_POWER | 285 | #define SNAKE_QUIT BUTTON_POWER |
286 | #define SNAKE_LEFT BUTTON_PREV | 286 | #define SNAKE_LEFT BUTTON_PREV |
287 | #define SNAKE_RIGHT BUTTON_NEXT | 287 | #define SNAKE_RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 464af413f9..fcc1790a13 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -410,7 +410,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
410 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY | 410 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY |
411 | #define SNAKE2_PLAYPAUSE_TEXT "PLAY" | 411 | #define SNAKE2_PLAYPAUSE_TEXT "PLAY" |
412 | 412 | ||
413 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 413 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
414 | #define SNAKE2_LEFT BUTTON_PREV | 414 | #define SNAKE2_LEFT BUTTON_PREV |
415 | #define SNAKE2_RIGHT BUTTON_NEXT | 415 | #define SNAKE2_RIGHT BUTTON_NEXT |
416 | #define SNAKE2_UP BUTTON_HOME | 416 | #define SNAKE2_UP BUTTON_HOME |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index e779722790..2dcea7546f 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -647,7 +647,7 @@ | |||
647 | #define BUTTON_SAVE BUTTON_PLAY | 647 | #define BUTTON_SAVE BUTTON_PLAY |
648 | #define BUTTON_SAVE_NAME "PLAY" | 648 | #define BUTTON_SAVE_NAME "PLAY" |
649 | 649 | ||
650 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 650 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
651 | #define SOKOBAN_LEFT BUTTON_PREV | 651 | #define SOKOBAN_LEFT BUTTON_PREV |
652 | #define SOKOBAN_RIGHT BUTTON_NEXT | 652 | #define SOKOBAN_RIGHT BUTTON_NEXT |
653 | #define SOKOBAN_UP BUTTON_HOME | 653 | #define SOKOBAN_UP BUTTON_HOME |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 6c496663cf..d14c608396 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -665,7 +665,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
665 | # define HK_CUR2STACK "DBL PLAY" | 665 | # define HK_CUR2STACK "DBL PLAY" |
666 | # define HK_REM2STACK "NEXT" | 666 | # define HK_REM2STACK "NEXT" |
667 | 667 | ||
668 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 668 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
669 | # define SOL_QUIT BUTTON_POWER | 669 | # define SOL_QUIT BUTTON_POWER |
670 | # define SOL_UP BUTTON_HOME | 670 | # define SOL_UP BUTTON_HOME |
671 | # define SOL_DOWN BUTTON_OPTION | 671 | # define SOL_DOWN BUTTON_OPTION |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 67816120a1..608f3ee512 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -336,7 +336,7 @@ | |||
336 | #define AST_RIGHT BUTTON_NEXT | 336 | #define AST_RIGHT BUTTON_NEXT |
337 | #define AST_FIRE BUTTON_PLAY | 337 | #define AST_FIRE BUTTON_PLAY |
338 | 338 | ||
339 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 339 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
340 | #define AST_PAUSE BUTTON_VOL_UP | 340 | #define AST_PAUSE BUTTON_VOL_UP |
341 | #define AST_QUIT BUTTON_POWER | 341 | #define AST_QUIT BUTTON_POWER |
342 | #define AST_THRUST BUTTON_HOME | 342 | #define AST_THRUST BUTTON_HOME |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index e44c867cdc..9de5032699 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -604,7 +604,7 @@ | |||
604 | #define STAR_LEVEL_DOWN_NAME "PLAY + PREV" | 604 | #define STAR_LEVEL_DOWN_NAME "PLAY + PREV" |
605 | #define STAR_LEVEL_REPEAT_NAME "PLAY + OPTION" | 605 | #define STAR_LEVEL_REPEAT_NAME "PLAY + OPTION" |
606 | 606 | ||
607 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 607 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
608 | #define STAR_QUIT BUTTON_POWER | 608 | #define STAR_QUIT BUTTON_POWER |
609 | #define STAR_LEFT BUTTON_PREV | 609 | #define STAR_LEFT BUTTON_PREV |
610 | #define STAR_RIGHT BUTTON_NEXT | 610 | #define STAR_RIGHT BUTTON_NEXT |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index db9cfd57da..82e6fba5c6 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -285,7 +285,7 @@ | |||
285 | #define STOPWATCH_SCROLL_UP BUTTON_HOME | 285 | #define STOPWATCH_SCROLL_UP BUTTON_HOME |
286 | #define STOPWATCH_SCROLL_DOWN BUTTON_OPTION | 286 | #define STOPWATCH_SCROLL_DOWN BUTTON_OPTION |
287 | 287 | ||
288 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 288 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
289 | #define STOPWATCH_QUIT BUTTON_POWER | 289 | #define STOPWATCH_QUIT BUTTON_POWER |
290 | #define STOPWATCH_START_STOP BUTTON_NEXT | 290 | #define STOPWATCH_START_STOP BUTTON_NEXT |
291 | #define STOPWATCH_RESET_TIMER BUTTON_PREV | 291 | #define STOPWATCH_RESET_TIMER BUTTON_PREV |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 36f47a377a..de3802d9bc 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -418,7 +418,7 @@ | |||
418 | #define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) | 418 | #define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) |
419 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_HOME | BUTTON_POWER) | 419 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_HOME | BUTTON_POWER) |
420 | 420 | ||
421 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 421 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
422 | #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER | 422 | #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER |
423 | #define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT) | 423 | #define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT) |
424 | #define SUDOKU_BUTTON_UP BUTTON_HOME | 424 | #define SUDOKU_BUTTON_UP BUTTON_HOME |
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index cf3a2b777e..ba71201cda 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -533,7 +533,7 @@ | |||
533 | #define TV_LINE_DOWN BUTTON_OPTION | 533 | #define TV_LINE_DOWN BUTTON_OPTION |
534 | #define TV_BOOKMARK (BUTTON_OPTION | BUTTON_PLAY) | 534 | #define TV_BOOKMARK (BUTTON_OPTION | BUTTON_PLAY) |
535 | 535 | ||
536 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 536 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
537 | #define TV_QUIT BUTTON_POWER | 537 | #define TV_QUIT BUTTON_POWER |
538 | #define TV_SCROLL_UP BUTTON_VOL_UP | 538 | #define TV_SCROLL_UP BUTTON_VOL_UP |
539 | #define TV_SCROLL_DOWN BUTTON_VOL_DOWN | 539 | #define TV_SCROLL_DOWN BUTTON_VOL_DOWN |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 80e1960fad..629294ce7f 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -408,7 +408,7 @@ | |||
408 | #define LABEL_MENU "PLAY" | 408 | #define LABEL_MENU "PLAY" |
409 | #define LABEL_VOLUME "VOL UP/DN" | 409 | #define LABEL_VOLUME "VOL UP/DN" |
410 | 410 | ||
411 | #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) | 411 | #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) |
412 | #define VUMETER_QUIT BUTTON_POWER | 412 | #define VUMETER_QUIT BUTTON_POWER |
413 | #define VUMETER_HELP BUTTON_HOME | 413 | #define VUMETER_HELP BUTTON_HOME |
414 | #define VUMETER_MENU BUTTON_PLAY | 414 | #define VUMETER_MENU BUTTON_PLAY |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index e4286f35b4..d3db768535 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -371,7 +371,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
371 | #define BTN_QUIT BUTTON_POWER | 371 | #define BTN_QUIT BUTTON_POWER |
372 | #define BTN_STOPRESET (BUTTON_HOME | BUTTON_POWER) | 372 | #define BTN_STOPRESET (BUTTON_HOME | BUTTON_POWER) |
373 | 373 | ||
374 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 374 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
375 | #define BTN_DIR_UP BUTTON_HOME | 375 | #define BTN_DIR_UP BUTTON_HOME |
376 | #define BTN_DIR_DOWN BUTTON_OPTION | 376 | #define BTN_DIR_DOWN BUTTON_OPTION |
377 | #define BTN_DIR_LEFT BUTTON_PREV | 377 | #define BTN_DIR_LEFT BUTTON_PREV |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 55a1dc4bdb..e04ecc225d 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -324,7 +324,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
324 | #define DOWN BUTTON_OPTION | 324 | #define DOWN BUTTON_OPTION |
325 | #define PAUSE BUTTON_PLAY | 325 | #define PAUSE BUTTON_PLAY |
326 | 326 | ||
327 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 327 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
328 | 328 | ||
329 | #define QUIT BUTTON_POWER | 329 | #define QUIT BUTTON_POWER |
330 | #define LEFT BUTTON_PREV | 330 | #define LEFT BUTTON_PREV |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 6c0fac6ddf..e62c33c157 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -274,7 +274,7 @@ | |||
274 | #define ZX_UP BUTTON_HOME | 274 | #define ZX_UP BUTTON_HOME |
275 | #define ZX_DOWN BUTTON_OPTION | 275 | #define ZX_DOWN BUTTON_OPTION |
276 | 276 | ||
277 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 277 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
278 | #define ZX_SELECT BUTTON_PLAY | 278 | #define ZX_SELECT BUTTON_PLAY |
279 | #define ZX_MENU BUTTON_POWER | 279 | #define ZX_MENU BUTTON_POWER |
280 | #define ZX_LEFT BUTTON_PREV | 280 | #define ZX_LEFT BUTTON_PREV |
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index f77ce538d1..6237ded8c1 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -266,7 +266,7 @@ | |||
266 | #define KBD_UP BUTTON_HOME | 266 | #define KBD_UP BUTTON_HOME |
267 | #define KBD_DOWN BUTTON_OPTION | 267 | #define KBD_DOWN BUTTON_OPTION |
268 | 268 | ||
269 | #elif CONFIG_KEYPAD == FIIO_M3K_PAD | 269 | #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD |
270 | 270 | ||
271 | #define KBD_SELECT BUTTON_PLAY | 271 | #define KBD_SELECT BUTTON_PLAY |
272 | #define KBD_ABORT BUTTON_POWER | 272 | #define KBD_ABORT BUTTON_POWER |
diff --git a/bootloader/SOURCES b/bootloader/SOURCES index e775fbe246..3c9a3068ad 100644 --- a/bootloader/SOURCES +++ b/bootloader/SOURCES | |||
@@ -78,7 +78,7 @@ show_logo.c | |||
78 | mpio_hd200_hd300.c | 78 | mpio_hd200_hd300.c |
79 | #elif defined(SONY_NWZ_LINUX) | 79 | #elif defined(SONY_NWZ_LINUX) |
80 | nwz_linux.c | 80 | nwz_linux.c |
81 | #elif defined(HIBY_LINUX) || defined(FIIO_M3K) | 81 | #elif defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) |
82 | rocker_linux.c | 82 | rocker_linux.c |
83 | #elif defined(RK27_GENERIC) || defined(HM60X) || defined(HM801) \ | 83 | #elif defined(RK27_GENERIC) || defined(HM60X) || defined(HM801) \ |
84 | || defined(MA9) || defined(MA9C) || defined(MA8) || defined(MA8C) \ | 84 | || defined(MA9) || defined(MA9C) || defined(MA8) || defined(MA8C) \ |
diff --git a/bootloader/rocker_linux.c b/bootloader/rocker_linux.c index fc633d504e..c0cba2776c 100644 --- a/bootloader/rocker_linux.c +++ b/bootloader/rocker_linux.c | |||
@@ -72,7 +72,7 @@ | |||
72 | #define BUTTON_DOWN BUTTON_HOME | 72 | #define BUTTON_DOWN BUTTON_HOME |
73 | #define BUTTON_SELECT BUTTON_PLAY | 73 | #define BUTTON_SELECT BUTTON_PLAY |
74 | #include "bitmaps/hibyicon.h" | 74 | #include "bitmaps/hibyicon.h" |
75 | #elif defined(FIIO_M3K) | 75 | #elif defined(FIIO_M3K_LINUX) |
76 | #define ICON_WIDTH 130 | 76 | #define ICON_WIDTH 130 |
77 | #define ICON_HEIGHT 130 | 77 | #define ICON_HEIGHT 130 |
78 | #define ICON_NAME bm_fiioicon | 78 | #define ICON_NAME bm_fiioicon |
@@ -95,7 +95,7 @@ | |||
95 | #endif | 95 | #endif |
96 | 96 | ||
97 | #define BASE_DIR PIVOT_ROOT | 97 | #define BASE_DIR PIVOT_ROOT |
98 | //#ifdef FIIO_M3K | 98 | //#ifdef FIIO_M3K_LINUX |
99 | //#define BASE_DIR "/mnt" | 99 | //#define BASE_DIR "/mnt" |
100 | //#else | 100 | //#else |
101 | //#define BASE_DIR "/mnt/sd_0" | 101 | //#define BASE_DIR "/mnt/sd_0" |
@@ -469,7 +469,7 @@ void run_script_menu(void) | |||
469 | 469 | ||
470 | static void adb(int start) | 470 | static void adb(int start) |
471 | { | 471 | { |
472 | #if defined(FIIO_M3K) | 472 | #if defined(FIIO_M3K_LINUX) |
473 | lcd_set_foreground(LCD_RGBPACK(255, 0, 0)); | 473 | lcd_set_foreground(LCD_RGBPACK(255, 0, 0)); |
474 | lcd_putsf(0, 1, "ADB not supported!"); | 474 | lcd_putsf(0, 1, "ADB not supported!"); |
475 | sleep(2*HZ); | 475 | sleep(2*HZ); |
@@ -622,7 +622,7 @@ int main(int argc, char **argv) | |||
622 | #endif | 622 | #endif |
623 | mount_storage(false); | 623 | mount_storage(false); |
624 | /* boot OF */ | 624 | /* boot OF */ |
625 | #if defined(FIIO_M3K) | 625 | #if defined(FIIO_M3K_LINUX) |
626 | execvp("/usr/project/bin/player_daemon", argv); | 626 | execvp("/usr/project/bin/player_daemon", argv); |
627 | #else | 627 | #else |
628 | execvp("/usr/bin/hiby_player", argv); | 628 | execvp("/usr/bin/hiby_player", argv); |
diff --git a/firmware/SOURCES b/firmware/SOURCES index 11929d8253..36a125783c 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -115,7 +115,7 @@ target/hosted/sonynwz/nvp-nwz.c | |||
115 | target/hosted/sonynwz/nwz-db.c | 115 | target/hosted/sonynwz/nwz-db.c |
116 | #endif | 116 | #endif |
117 | 117 | ||
118 | #if ((defined(HIBY_LINUX) || defined(FIIO_M3K)) && !defined(SIMULATOR)) | 118 | #if ((defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR)) |
119 | drivers/lcd-memframe.c | 119 | drivers/lcd-memframe.c |
120 | target/hosted/alsa-controls.c | 120 | target/hosted/alsa-controls.c |
121 | target/hosted/pcm-alsa.c | 121 | target/hosted/pcm-alsa.c |
@@ -148,7 +148,7 @@ target/hosted/usb-hiby.c | |||
148 | target/hosted/button-devinput.c | 148 | target/hosted/button-devinput.c |
149 | #endif | 149 | #endif |
150 | 150 | ||
151 | #if (defined(FIIO_M3K)) && !defined(SIMULATOR) | 151 | #if (defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR) |
152 | target/hosted/fiio/buttonlight-fiio.c | 152 | target/hosted/fiio/buttonlight-fiio.c |
153 | target/hosted/fiio/button-fiio.c | 153 | target/hosted/fiio/button-fiio.c |
154 | target/hosted/fiio/debug-fiio.c | 154 | target/hosted/fiio/debug-fiio.c |
diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES index 2b18ea2026..ebeaf49193 100644 --- a/firmware/asm/SOURCES +++ b/firmware/asm/SOURCES | |||
@@ -16,7 +16,7 @@ mempcpy.c | |||
16 | defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \ | 16 | defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \ |
17 | defined(SAMSUNG_YPR1) || defined(DX50) || defined(DX90) || (defined(MROBE_500) && !defined(LCD_USE_DMA)) || \ | 17 | defined(SAMSUNG_YPR1) || defined(DX50) || defined(DX90) || (defined(MROBE_500) && !defined(LCD_USE_DMA)) || \ |
18 | defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || \ | 18 | defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || \ |
19 | defined(FIIO_M3K)) && \ | 19 | defined(FIIO_M3K_LINUX)) && \ |
20 | !defined(SIMULATOR) | 20 | !defined(SIMULATOR) |
21 | #if LCD_DEPTH >= 24 | 21 | #if LCD_DEPTH >= 24 |
22 | lcd-as-memframe-24bit.c | 22 | lcd-as-memframe-24bit.c |
diff --git a/firmware/drivers/audio/fiiolinux_codec.c b/firmware/drivers/audio/fiiolinux_codec.c index b2d95c91e9..31731fd6ed 100644 --- a/firmware/drivers/audio/fiiolinux_codec.c +++ b/firmware/drivers/audio/fiiolinux_codec.c | |||
@@ -166,7 +166,7 @@ void audiohw_set_filter_roll_off(int value) | |||
166 | 1 = Slow; | 166 | 1 = Slow; |
167 | 2 = Short Sharp | 167 | 2 = Short Sharp |
168 | 3 = Short Slow */ | 168 | 3 = Short Slow */ |
169 | #if 0 // defined(FIIO_M3K) | 169 | #if 0 // defined(FIIO_M3K_LINUX) |
170 | // AK4376 supports this but the control isn't wired into ALSA! | 170 | // AK4376 supports this but the control isn't wired into ALSA! |
171 | long int value_hw = value; | 171 | long int value_hw = value; |
172 | alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw); | 172 | alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw); |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 547c359d8d..e35d407372 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -163,7 +163,7 @@ | |||
163 | #define IHIFI_800_PAD 68 | 163 | #define IHIFI_800_PAD 68 |
164 | #define XDUOO_X3II_PAD 69 | 164 | #define XDUOO_X3II_PAD 69 |
165 | #define XDUOO_X20_PAD 70 | 165 | #define XDUOO_X20_PAD 70 |
166 | #define FIIO_M3K_PAD 71 | 166 | #define FIIO_M3K_LINUX_PAD 71 |
167 | #define EROSQ_PAD 72 | 167 | #define EROSQ_PAD 72 |
168 | 168 | ||
169 | /* CONFIG_REMOTE_KEYPAD */ | 169 | /* CONFIG_REMOTE_KEYPAD */ |
@@ -603,8 +603,8 @@ Lyre prototype 1 */ | |||
603 | #include "config/xduoox3ii.h" | 603 | #include "config/xduoox3ii.h" |
604 | #elif defined(XDUOO_X20) | 604 | #elif defined(XDUOO_X20) |
605 | #include "config/xduoox20.h" | 605 | #include "config/xduoox20.h" |
606 | #elif defined(FIIO_M3K) | 606 | #elif defined(FIIO_M3K_LINUX) |
607 | #include "config/fiiom3k.h" | 607 | #include "config/fiiom3klinux.h" |
608 | #elif defined(EROS_Q) | 608 | #elif defined(EROS_Q) |
609 | #include "config/aigoerosq.h" | 609 | #include "config/aigoerosq.h" |
610 | #else | 610 | #else |
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3klinux.h index 6e831f2f55..51d2a222e6 100644 --- a/firmware/export/config/fiiom3k.h +++ b/firmware/export/config/fiiom3klinux.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * This config file is for the FiiO M3K | 2 | * This config file is for the FiiO M3K (Linux version) |
3 | */ | 3 | */ |
4 | 4 | ||
5 | /* For Rolo and boot loader */ | 5 | /* For Rolo and boot loader */ |
@@ -74,7 +74,7 @@ | |||
74 | #define HAVE_HEADPHONE_DETECTION | 74 | #define HAVE_HEADPHONE_DETECTION |
75 | 75 | ||
76 | /* KeyPad configuration for plugins */ | 76 | /* KeyPad configuration for plugins */ |
77 | #define CONFIG_KEYPAD FIIO_M3K_PAD | 77 | #define CONFIG_KEYPAD FIIO_M3K_LINUX_PAD |
78 | 78 | ||
79 | /* Define this if a programmable hotkey is mapped */ | 79 | /* Define this if a programmable hotkey is mapped */ |
80 | #define HAVE_HOTKEY | 80 | #define HAVE_HOTKEY |
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index da5a2fb71c..f53d0eb480 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h | |||
@@ -43,7 +43,7 @@ | |||
43 | /* NOTE: target-specific hosted HOME_DIR resides in filesystem-app.c */ | 43 | /* NOTE: target-specific hosted HOME_DIR resides in filesystem-app.c */ |
44 | #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ | 44 | #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ |
45 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \ | 45 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \ |
46 | defined(HIBY_LINUX) || defined(FIIO_M3K) | 46 | defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) |
47 | 47 | ||
48 | #define HOME_DIR "/" | 48 | #define HOME_DIR "/" |
49 | 49 | ||
@@ -80,7 +80,7 @@ | |||
80 | 80 | ||
81 | #if defined(APPLICATION) && \ | 81 | #if defined(APPLICATION) && \ |
82 | !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ | 82 | !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ |
83 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)) | 83 | defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) |
84 | 84 | ||
85 | #define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" | 85 | #define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" |
86 | #define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR | 86 | #define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR |
diff --git a/firmware/export/system.h b/firmware/export/system.h index 68d7958870..f9a074349b 100644 --- a/firmware/export/system.h +++ b/firmware/export/system.h | |||
@@ -347,7 +347,7 @@ static inline void cpu_boost_unlock(void) | |||
347 | #ifndef SIMULATOR | 347 | #ifndef SIMULATOR |
348 | bool dbg_ports(void); | 348 | bool dbg_ports(void); |
349 | #endif | 349 | #endif |
350 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K) | 350 | #if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) |
351 | bool dbg_hw_info(void); | 351 | bool dbg_hw_info(void); |
352 | #endif | 352 | #endif |
353 | 353 | ||
diff --git a/firmware/font.c b/firmware/font.c index b2ac1a3c3c..595410fed2 100644 --- a/firmware/font.c +++ b/firmware/font.c | |||
@@ -85,7 +85,7 @@ | |||
85 | /* compiled-in font */ | 85 | /* compiled-in font */ |
86 | extern struct font sysfont; | 86 | extern struct font sysfont; |
87 | 87 | ||
88 | #if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K) | 88 | #if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) |
89 | 89 | ||
90 | struct buflib_alloc_data { | 90 | struct buflib_alloc_data { |
91 | struct font font; /* must be the first member! */ | 91 | struct font font; /* must be the first member! */ |
diff --git a/tools/builds.pm b/tools/builds.pm index b46b32f0a0..fbe8902e9e 100644 --- a/tools/builds.pm +++ b/tools/builds.pm | |||
@@ -448,7 +448,7 @@ $releasenotes="/wiki/ReleaseNotes315"; | |||
448 | name => 'xDuoo X20', | 448 | name => 'xDuoo X20', |
449 | status => 2, | 449 | status => 2, |
450 | }, | 450 | }, |
451 | 'fiiom3k' => { | 451 | 'fiiom3klinux' => { |
452 | name => 'FiiO M3K', | 452 | name => 'FiiO M3K', |
453 | status => 1, | 453 | status => 1, |
454 | }, | 454 | }, |
diff --git a/tools/configure b/tools/configure index 07d90b26ef..c057f90006 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1595,7 +1595,7 @@ cat <<EOF | |||
1595 | ==AgpTek== 252) 800 227) NW-A20 series | 1595 | ==AgpTek== 252) 800 227) NW-A20 series |
1596 | 240) Rocker 228) NWZ-A860 series | 1596 | 240) Rocker 228) NWZ-A860 series |
1597 | ==FiiO== 229) NWZ-S750 series | 1597 | ==FiiO== 229) NWZ-S750 series |
1598 | ==AIGO== 244) M3K | 1598 | ==AIGO== 244) M3K Linux |
1599 | 245) Eros Q / K | 1599 | 245) Eros Q / K |
1600 | 1600 | ||
1601 | EOF | 1601 | EOF |
@@ -4088,12 +4088,12 @@ fi | |||
4088 | sysfontbl="16-Terminus" | 4088 | sysfontbl="16-Terminus" |
4089 | ;; | 4089 | ;; |
4090 | 4090 | ||
4091 | 244|fiiom3k) | 4091 | 244|fiiom3klinux) |
4092 | application="yes" | 4092 | application="yes" |
4093 | app_type="fiio" | 4093 | app_type="fiio" |
4094 | target_id=112 | 4094 | target_id=112 |
4095 | modelname="fiiom3k" | 4095 | modelname="fiiom3klinux" |
4096 | target="FIIO_M3K" | 4096 | target="FIIO_M3K_LINUX" |
4097 | memory=16 # XXX Can probably go over 32? | 4097 | memory=16 # XXX Can probably go over 32? |
4098 | tool="cp " | 4098 | tool="cp " |
4099 | boottool="cp " | 4099 | boottool="cp " |
diff --git a/tools/rockboxdev.sh b/tools/rockboxdev.sh index ac21a4c524..667dad318d 100755 --- a/tools/rockboxdev.sh +++ b/tools/rockboxdev.sh | |||
@@ -845,7 +845,7 @@ do | |||
845 | # glibc: 2.16 | 845 | # glibc: 2.16 |
846 | # alsa: 1.0.29 | 846 | # alsa: 1.0.29 |
847 | # | 847 | # |
848 | # FiiO M3K: | 848 | # FiiO M3K Linux: |
849 | # kernel: 3.10.14 | 849 | # kernel: 3.10.14 |
850 | # glibc: 2.16 | 850 | # glibc: 2.16 |
851 | # alsa: 1.0.26 | 851 | # alsa: 1.0.26 |