tsiry-sandratraina.com / rockbox-zig
A modern Music Player Daemon based on Rockbox open source high quality audio player
libadwaita audio rust zig deno mpris rockbox mpd
2
fork

Configure Feed

Select the types of activity you want to include in your feed.

Rename symbols of FiiO M3K Linux-based port

Mainly a straight replacement of FIIO_M3K -> FIIO_M3K_LINUX.

Change-Id: Id07c84f8150991d1b6851540c2c3f8f67e3f12c2

authored by

Aidan MacDonald and committed by
Solomon Peachy aacb0811 55dc86f5

+79 -79
+2 -2
apps/SOURCES
··· 300 300 keymaps/keymap-xduoox3ii.c 301 301 #elif CONFIG_KEYPAD == XDUOO_X20_PAD 302 302 keymaps/keymap-xduoox20.c 303 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 304 - keymaps/keymap-fiiom3k.c 303 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 304 + keymaps/keymap-fiiom3klinux.c 305 305 #elif CONFIG_KEYPAD == EROSQ_PAD 306 306 keymaps/keymap-erosq.c 307 307 #endif
+1 -1
apps/bitmaps/native/SOURCES
··· 50 50 hibyicon.130x130x16.bmp 51 51 rockboxicon.130x130x16.bmp 52 52 toolsicon.130x130x16.bmp 53 - #elif defined(FIIO_M3K) 53 + #elif defined(FIIO_M3K_LINUX) 54 54 fiioicon.130x130x16.bmp 55 55 rockboxicon.130x130x16.bmp 56 56 toolsicon.130x130x16.bmp
+1 -1
apps/debug_menu.c
··· 2528 2528 { "Screendump", dbg_screendump }, 2529 2529 #endif 2530 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 2532 { "View HW info", dbg_hw_info }, 2533 2533 #endif 2534 2534 #if (CONFIG_PLATFORM & PLATFORM_NATIVE)
+1 -1
apps/keymaps/keymap-fiiom3k.c apps/keymaps/keymap-fiiom3klinux.c
··· 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 24 #include "config.h" 25 25 #include "action.h"
+1 -1
apps/plugins/battery_bench.c
··· 91 91 CONFIG_KEYPAD == IHIFI_800_PAD || \ 92 92 CONFIG_KEYPAD == XDUOO_X3II_PAD || \ 93 93 CONFIG_KEYPAD == XDUOO_X20_PAD || \ 94 - CONFIG_KEYPAD == FIIO_M3K_PAD || \ 94 + CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD || \ 95 95 CONFIG_KEYPAD == EROSQ_PAD) 96 96 97 97 #define BATTERY_ON BUTTON_PLAY
+1 -1
apps/plugins/blackjack.c
··· 559 559 #define BJACK_RIGHT BUTTON_NEXT 560 560 #define BJACK_LEFT BUTTON_PREV 561 561 562 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 562 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 563 563 #define BJACK_SELECT_NAME "PLAY" 564 564 #define BJACK_STAY_NAME "NEXT" 565 565 #define BJACK_QUIT_NAME "POWER"
+1 -1
apps/plugins/brickmania.c
··· 314 314 #define UP BUTTON_HOME 315 315 #define DOWN BUTTON_OPTION 316 316 317 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 317 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 318 318 #define QUIT BUTTON_POWER 319 319 #define LEFT BUTTON_PREV 320 320 #define RIGHT BUTTON_NEXT
+1 -1
apps/plugins/calculator.c
··· 504 504 #define CALCULATOR_CALC (BUTTON_PLAY|BUTTON_REPEAT) 505 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 508 #define CALCULATOR_LEFT BUTTON_PREV 509 509 #define CALCULATOR_RIGHT BUTTON_NEXT 510 510 #define CALCULATOR_UP BUTTON_HOME
+1 -1
apps/plugins/calendar.c
··· 391 391 #define CALENDAR_NEXT_MONTH BUTTON_VOL_UP 392 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 395 #define CALENDAR_QUIT BUTTON_POWER 396 396 #define CALENDAR_SELECT BUTTON_PLAY 397 397 #define CALENDAR_NEXT_WEEK BUTTON_OPTION
+1 -1
apps/plugins/chessbox/chessbox_pgn.h
··· 539 539 #define CB_SCROLL_LEFT (BUTTON_PREV|BUTTON_REPEAT) 540 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 543 #define CB_SELECT BUTTON_PLAY 544 544 #define CB_UP BUTTON_HOME 545 545 #define CB_DOWN BUTTON_OPTION
+1 -1
apps/plugins/chessclock.c
··· 376 376 #define CHC_SETTINGS_OK BUTTON_PLAY 377 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 380 #define CHC_QUIT BUTTON_POWER 381 381 #define CHC_STARTSTOP BUTTON_PLAY 382 382 #define CHC_RESET BUTTON_OPTION
+1 -1
apps/plugins/chip8.c
··· 1259 1259 #define CHIP8_KEY6 BUTTON_NEXT 1260 1260 #define CHIP8_KEY8 BUTTON_OPTION 1261 1261 1262 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 1262 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 1263 1263 #define CHIP8_OFF BUTTON_POWER 1264 1264 #define CHIP8_KEY2 BUTTON_HOME 1265 1265 #define CHIP8_KEY4 BUTTON_PREV
+1 -1
apps/plugins/chopper.c
··· 198 198 #define ACTION BUTTON_SELECT 199 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 202 #define QUIT BUTTON_POWER 203 203 #define ACTION BUTTON_PLAY 204 204 #define ACTIONTEXT "PLAY"
+1 -1
apps/plugins/clix.c
··· 292 292 #define CLIX_BUTTON_RIGHT BUTTON_NEXT 293 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 296 #define CLIX_BUTTON_QUIT BUTTON_POWER 297 297 #define CLIX_BUTTON_UP BUTTON_HOME 298 298 #define CLIX_BUTTON_DOWN BUTTON_OPTION
+1 -1
apps/plugins/cube.c
··· 380 380 #define CUBE_PAUSE BUTTON_HOME 381 381 #define CUBE_HIGHSPEED BUTTON_PLAY 382 382 383 - #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) 383 + #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) 384 384 #define CUBE_QUIT BUTTON_POWER 385 385 #define CUBE_NEXT BUTTON_NEXT 386 386 #define CUBE_PREV BUTTON_PREV
+1 -1
apps/plugins/doom/i_video.c
··· 577 577 #define DOOMBUTTON_ENTER BUTTON_PLAY 578 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 581 #define DOOMBUTTON_UP BUTTON_UP 582 582 #define DOOMBUTTON_DOWN BUTTON_DOWN 583 583 #define DOOMBUTTON_LEFT BUTTON_PREV
+1 -1
apps/plugins/flipit.c
··· 448 448 #define FLIPIT_STEP_BY_STEP (BUTTON_HOME | BUTTON_PLAY) 449 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 453 #define FLIPIT_LEFT BUTTON_PREV 454 454 #define FLIPIT_RIGHT BUTTON_NEXT
+1 -1
apps/plugins/fractals/fractal.h
··· 470 470 #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_PREV) 471 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 474 #define FRACTAL_QUIT BUTTON_POWER 475 475 #define FRACTAL_UP BUTTON_HOME 476 476 #define FRACTAL_DOWN BUTTON_OPTION
+1 -1
apps/plugins/goban/goban.h
··· 455 455 #define GBN_BUTTON_CONTEXT BUTTON_PLAY | BUTTON_REPEAT 456 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 459 #define GBN_BUTTON_UP BUTTON_HOME 460 460 #define GBN_BUTTON_DOWN BUTTON_OPTION 461 461 #define GBN_BUTTON_LEFT BUTTON_PREV
+1 -1
apps/plugins/imageviewer/imageviewer_button.h
··· 491 491 #define IMGVIEW_MENU BUTTON_POWER 492 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 495 #define IMGVIEW_ZOOM_PRE BUTTON_PLAY 496 496 #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) 497 497 #define IMGVIEW_ZOOM_OUT (BUTTON_PLAY | BUTTON_REPEAT)
+1 -1
apps/plugins/invadrox.c
··· 275 275 #define RIGHT BUTTON_VOL_DOWN 276 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 280 #define QUIT BUTTON_POWER 281 281 #define LEFT BUTTON_HOME
+1 -1
apps/plugins/jewels.c
··· 357 357 #define HK_SELECT "PLAY" 358 358 #define HK_CANCEL "POWER" 359 359 360 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 360 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 361 361 #define JEWELS_UP BUTTON_HOME 362 362 #define JEWELS_DOWN BUTTON_OPTION 363 363 #define JEWELS_LEFT BUTTON_PREV
+1 -1
apps/plugins/lib/keymaps.h
··· 223 223 #define BTN_FIRE BUTTON_PLAY 224 224 #define BTN_PAUSE BUTTON_POWER 225 225 226 - #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) 226 + #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) 227 227 #define BTN_UP BUTTON_VOL_UP 228 228 #define BTN_DOWN BUTTON_VOL_DOWN 229 229 #define BTN_LEFT BUTTON_PREV
+2 -2
apps/plugins/lib/pluginlib_actions.c
··· 233 233 { PLA_DOWN_REPEAT, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_NONE }, 234 234 { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, 235 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 237 { PLA_UP, BUTTON_HOME, BUTTON_NONE }, 238 238 { PLA_DOWN, BUTTON_OPTION, BUTTON_NONE }, 239 239 { PLA_LEFT, BUTTON_PREV, BUTTON_NONE }, ··· 482 482 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, 483 483 {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, 484 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 486 {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, 487 487 {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, 488 488 {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE},
+1 -1
apps/plugins/midi/midiplay.c
··· 301 301 #define MIDI_VOL_DOWN BUTTON_VOL_DOWN 302 302 #define MIDI_PLAYPAUSE BUTTON_PLAY 303 303 304 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 304 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 305 305 #define MIDI_QUIT BUTTON_POWER 306 306 #define MIDI_FFWD BUTTON_NEXT 307 307 #define MIDI_REWIND BUTTON_PREV
+1 -1
apps/plugins/minesweeper.c
··· 395 395 # define MINESWP_DISCOVER2 BUTTON_VOL_UP 396 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 399 # define MINESWP_LEFT BUTTON_PREV 400 400 # define MINESWP_RIGHT BUTTON_NEXT 401 401 # define MINESWP_UP BUTTON_HOME
+1 -1
apps/plugins/mp3_encoder.c
··· 2562 2562 #define MP3ENC_DONE BUTTON_POWER 2563 2563 #define MP3ENC_SELECT BUTTON_PLAY 2564 2564 2565 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 2565 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 2566 2566 #define MP3ENC_PREV BUTTON_HOME 2567 2567 #define MP3ENC_NEXT BUTTON_OPTION 2568 2568 #define MP3ENC_DONE BUTTON_POWER
+1 -1
apps/plugins/mpegplayer/mpeg_settings.c
··· 326 326 #define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN 327 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 330 #define MPEG_START_TIME_SELECT BUTTON_PLAY 331 331 #define MPEG_START_TIME_LEFT BUTTON_PREV 332 332 #define MPEG_START_TIME_RIGHT BUTTON_NEXT
+1 -1
apps/plugins/mpegplayer/mpegplayer.c
··· 459 459 #define MPEG_RW BUTTON_PREV 460 460 #define MPEG_FF BUTTON_NEXT 461 461 462 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 462 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 463 463 #define MPEG_MENU BUTTON_PLAY 464 464 #define MPEG_STOP BUTTON_POWER 465 465 #define MPEG_PAUSE BUTTON_HOME
+1 -1
apps/plugins/oscilloscope.c
··· 498 498 #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN 499 499 #define NEED_LASTBUTTON 500 500 501 - #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) 501 + #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) 502 502 #define OSCILLOSCOPE_QUIT BUTTON_POWER 503 503 #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_PLAY 504 504 #define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY | BUTTON_REL)
+1 -1
apps/plugins/pacbox/pacbox.h
··· 373 373 #define PACMAN_1UP BUTTON_VOL_UP 374 374 #define PACMAN_COIN BUTTON_PLAY 375 375 376 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 376 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 377 377 #define PACMAN_UP BUTTON_PREV 378 378 #define PACMAN_DOWN BUTTON_NEXT 379 379 #define PACMAN_LEFT BUTTON_HOME
+2 -2
apps/plugins/pegbox.c
··· 643 643 #define LVL_UP_TEXT "VOL+" 644 644 #define LVL_DOWN_TEXT "VOL-" 645 645 646 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 646 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 647 647 #define PEGBOX_SELECT BUTTON_PLAY 648 648 #define PEGBOX_QUIT BUTTON_POWER 649 649 #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME) ··· 677 677 #define LVL_UP_TEXT "VOL+" 678 678 #define LVL_DOWN_TEXT "VOL-" 679 679 680 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 680 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 681 681 #define PEGBOX_SELECT BUTTON_PLAY 682 682 #define PEGBOX_QUIT BUTTON_POWER 683 683 #define PEGBOX_RESTART (BUTTON_POWER | BUTTON_HOME)
+1 -1
apps/plugins/pong.c
··· 301 301 #define PONG_RIGHT_UP BUTTON_HOME 302 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 305 #define PONG_QUIT BUTTON_POWER 306 306 #define PONG_PAUSE BUTTON_PLAY 307 307 #define PONG_LEFT_UP BUTTON_PREV
+1 -1
apps/plugins/reversi/reversi-gui.h
··· 330 330 #define REVERSI_BUTTON_MENU BUTTON_PLAY 331 331 #define REVERSI_BUTTON_MENU_LONGPRESS 332 332 333 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 333 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 334 334 #define REVERSI_BUTTON_QUIT BUTTON_POWER 335 335 #define REVERSI_BUTTON_UP BUTTON_HOME 336 336 #define REVERSI_BUTTON_DOWN BUTTON_OPTION
+1 -1
apps/plugins/rockblox.c
··· 443 443 #define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) 444 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 448 #define ROCKBLOX_OFF BUTTON_POWER 449 449 #define ROCKBLOX_ROTATE_CCW BUTTON_HOME
+1 -1
apps/plugins/rockboy/rockboy.c
··· 435 435 options.SELECT = BUTTON_VOL_UP; 436 436 options.MENU = BUTTON_POWER; 437 437 438 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 438 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 439 439 options.UP = BUTTON_PREV; 440 440 options.DOWN = BUTTON_NEXT; 441 441
+1 -1
apps/plugins/rockpaint.c
··· 360 360 #define ROCKPAINT_LEFT BUTTON_PREV 361 361 #define ROCKPAINT_RIGHT BUTTON_NEXT 362 362 363 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 363 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 364 364 #define ROCKPAINT_QUIT BUTTON_POWER 365 365 #define ROCKPAINT_DRAW BUTTON_PLAY 366 366 #define ROCKPAINT_MENU (BUTTON_HOME | BUTTON_POWER)
+1 -1
apps/plugins/sliding_puzzle.c
··· 321 321 #define PUZZLE_SHUFFLE (BUTTON_HOME | BUTTON_POWER) 322 322 #define PUZZLE_PICTURE BUTTON_PLAY 323 323 324 - #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) 324 + #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) 325 325 #define PUZZLE_QUIT BUTTON_POWER 326 326 #define PUZZLE_LEFT BUTTON_PREV 327 327 #define PUZZLE_RIGHT BUTTON_NEXT
+1 -1
apps/plugins/snake.c
··· 281 281 #define SNAKE_DOWN BUTTON_OPTION 282 282 #define SNAKE_PLAYPAUSE BUTTON_PLAY 283 283 284 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 284 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 285 285 #define SNAKE_QUIT BUTTON_POWER 286 286 #define SNAKE_LEFT BUTTON_PREV 287 287 #define SNAKE_RIGHT BUTTON_NEXT
+1 -1
apps/plugins/snake2.c
··· 410 410 #define SNAKE2_PLAYPAUSE BUTTON_PLAY 411 411 #define SNAKE2_PLAYPAUSE_TEXT "PLAY" 412 412 413 - #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) 413 + #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) 414 414 #define SNAKE2_LEFT BUTTON_PREV 415 415 #define SNAKE2_RIGHT BUTTON_NEXT 416 416 #define SNAKE2_UP BUTTON_HOME
+1 -1
apps/plugins/sokoban.c
··· 647 647 #define BUTTON_SAVE BUTTON_PLAY 648 648 #define BUTTON_SAVE_NAME "PLAY" 649 649 650 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 650 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 651 651 #define SOKOBAN_LEFT BUTTON_PREV 652 652 #define SOKOBAN_RIGHT BUTTON_NEXT 653 653 #define SOKOBAN_UP BUTTON_HOME
+1 -1
apps/plugins/solitaire.c
··· 665 665 # define HK_CUR2STACK "DBL PLAY" 666 666 # define HK_REM2STACK "NEXT" 667 667 668 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 668 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 669 669 # define SOL_QUIT BUTTON_POWER 670 670 # define SOL_UP BUTTON_HOME 671 671 # define SOL_DOWN BUTTON_OPTION
+1 -1
apps/plugins/spacerocks.c
··· 336 336 #define AST_RIGHT BUTTON_NEXT 337 337 #define AST_FIRE BUTTON_PLAY 338 338 339 - #elif (CONFIG_KEYPAD == FIIO_M3K_PAD) 339 + #elif (CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD) 340 340 #define AST_PAUSE BUTTON_VOL_UP 341 341 #define AST_QUIT BUTTON_POWER 342 342 #define AST_THRUST BUTTON_HOME
+1 -1
apps/plugins/star.c
··· 604 604 #define STAR_LEVEL_DOWN_NAME "PLAY + PREV" 605 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 608 #define STAR_QUIT BUTTON_POWER 609 609 #define STAR_LEFT BUTTON_PREV 610 610 #define STAR_RIGHT BUTTON_NEXT
+1 -1
apps/plugins/stopwatch.c
··· 285 285 #define STOPWATCH_SCROLL_UP BUTTON_HOME 286 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 289 #define STOPWATCH_QUIT BUTTON_POWER 290 290 #define STOPWATCH_START_STOP BUTTON_NEXT 291 291 #define STOPWATCH_RESET_TIMER BUTTON_PREV
+1 -1
apps/plugins/sudoku/sudoku.h
··· 418 418 #define SUDOKU_BUTTON_MENU (BUTTON_POWER | BUTTON_REL) 419 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 422 #define SUDOKU_BUTTON_QUIT_PRE BUTTON_POWER 423 423 #define SUDOKU_BUTTON_QUIT (BUTTON_POWER | BUTTON_REPEAT) 424 424 #define SUDOKU_BUTTON_UP BUTTON_HOME
+1 -1
apps/plugins/text_viewer/tv_button.h
··· 533 533 #define TV_LINE_DOWN BUTTON_OPTION 534 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 537 #define TV_QUIT BUTTON_POWER 538 538 #define TV_SCROLL_UP BUTTON_VOL_UP 539 539 #define TV_SCROLL_DOWN BUTTON_VOL_DOWN
+1 -1
apps/plugins/vu_meter.c
··· 408 408 #define LABEL_MENU "PLAY" 409 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 412 #define VUMETER_QUIT BUTTON_POWER 413 413 #define VUMETER_HELP BUTTON_HOME 414 414 #define VUMETER_MENU BUTTON_PLAY
+1 -1
apps/plugins/wormlet.c
··· 371 371 #define BTN_QUIT BUTTON_POWER 372 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 375 #define BTN_DIR_UP BUTTON_HOME 376 376 #define BTN_DIR_DOWN BUTTON_OPTION 377 377 #define BTN_DIR_LEFT BUTTON_PREV
+1 -1
apps/plugins/xobox.c
··· 324 324 #define DOWN BUTTON_OPTION 325 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 329 #define QUIT BUTTON_POWER 330 330 #define LEFT BUTTON_PREV
+1 -1
apps/plugins/zxbox/keymaps.h
··· 274 274 #define ZX_UP BUTTON_HOME 275 275 #define ZX_DOWN BUTTON_OPTION 276 276 277 - #elif CONFIG_KEYPAD == FIIO_M3K_PAD 277 + #elif CONFIG_KEYPAD == FIIO_M3K_LINUX_PAD 278 278 #define ZX_SELECT BUTTON_PLAY 279 279 #define ZX_MENU BUTTON_POWER 280 280 #define ZX_LEFT BUTTON_PREV
+1 -1
apps/plugins/zxbox/zxbox_keyb.c
··· 266 266 #define KBD_UP BUTTON_HOME 267 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 271 #define KBD_SELECT BUTTON_PLAY 272 272 #define KBD_ABORT BUTTON_POWER
+1 -1
bootloader/SOURCES
··· 78 78 mpio_hd200_hd300.c 79 79 #elif defined(SONY_NWZ_LINUX) 80 80 nwz_linux.c 81 - #elif defined(HIBY_LINUX) || defined(FIIO_M3K) 81 + #elif defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX) 82 82 rocker_linux.c 83 83 #elif defined(RK27_GENERIC) || defined(HM60X) || defined(HM801) \ 84 84 || defined(MA9) || defined(MA9C) || defined(MA8) || defined(MA8C) \
+4 -4
bootloader/rocker_linux.c
··· 72 72 #define BUTTON_DOWN BUTTON_HOME 73 73 #define BUTTON_SELECT BUTTON_PLAY 74 74 #include "bitmaps/hibyicon.h" 75 - #elif defined(FIIO_M3K) 75 + #elif defined(FIIO_M3K_LINUX) 76 76 #define ICON_WIDTH 130 77 77 #define ICON_HEIGHT 130 78 78 #define ICON_NAME bm_fiioicon ··· 95 95 #endif 96 96 97 97 #define BASE_DIR PIVOT_ROOT 98 - //#ifdef FIIO_M3K 98 + //#ifdef FIIO_M3K_LINUX 99 99 //#define BASE_DIR "/mnt" 100 100 //#else 101 101 //#define BASE_DIR "/mnt/sd_0" ··· 469 469 470 470 static void adb(int start) 471 471 { 472 - #if defined(FIIO_M3K) 472 + #if defined(FIIO_M3K_LINUX) 473 473 lcd_set_foreground(LCD_RGBPACK(255, 0, 0)); 474 474 lcd_putsf(0, 1, "ADB not supported!"); 475 475 sleep(2*HZ); ··· 622 622 #endif 623 623 mount_storage(false); 624 624 /* boot OF */ 625 - #if defined(FIIO_M3K) 625 + #if defined(FIIO_M3K_LINUX) 626 626 execvp("/usr/project/bin/player_daemon", argv); 627 627 #else 628 628 execvp("/usr/bin/hiby_player", argv);
+2 -2
firmware/SOURCES
··· 115 115 target/hosted/sonynwz/nwz-db.c 116 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 119 drivers/lcd-memframe.c 120 120 target/hosted/alsa-controls.c 121 121 target/hosted/pcm-alsa.c ··· 148 148 target/hosted/button-devinput.c 149 149 #endif 150 150 151 - #if (defined(FIIO_M3K)) && !defined(SIMULATOR) 151 + #if (defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR) 152 152 target/hosted/fiio/buttonlight-fiio.c 153 153 target/hosted/fiio/button-fiio.c 154 154 target/hosted/fiio/debug-fiio.c
+1 -1
firmware/asm/SOURCES
··· 16 16 defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \ 17 17 defined(SAMSUNG_YPR1) || defined(DX50) || defined(DX90) || (defined(MROBE_500) && !defined(LCD_USE_DMA)) || \ 18 18 defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || \ 19 - defined(FIIO_M3K)) && \ 19 + defined(FIIO_M3K_LINUX)) && \ 20 20 !defined(SIMULATOR) 21 21 #if LCD_DEPTH >= 24 22 22 lcd-as-memframe-24bit.c
+1 -1
firmware/drivers/audio/fiiolinux_codec.c
··· 166 166 1 = Slow; 167 167 2 = Short Sharp 168 168 3 = Short Slow */ 169 - #if 0 // defined(FIIO_M3K) 169 + #if 0 // defined(FIIO_M3K_LINUX) 170 170 // AK4376 supports this but the control isn't wired into ALSA! 171 171 long int value_hw = value; 172 172 alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw);
+3 -3
firmware/export/config.h
··· 163 163 #define IHIFI_800_PAD 68 164 164 #define XDUOO_X3II_PAD 69 165 165 #define XDUOO_X20_PAD 70 166 - #define FIIO_M3K_PAD 71 166 + #define FIIO_M3K_LINUX_PAD 71 167 167 #define EROSQ_PAD 72 168 168 169 169 /* CONFIG_REMOTE_KEYPAD */ ··· 603 603 #include "config/xduoox3ii.h" 604 604 #elif defined(XDUOO_X20) 605 605 #include "config/xduoox20.h" 606 - #elif defined(FIIO_M3K) 607 - #include "config/fiiom3k.h" 606 + #elif defined(FIIO_M3K_LINUX) 607 + #include "config/fiiom3klinux.h" 608 608 #elif defined(EROS_Q) 609 609 #include "config/aigoerosq.h" 610 610 #else
+2 -2
firmware/export/config/fiiom3k.h firmware/export/config/fiiom3klinux.h
··· 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 5 /* For Rolo and boot loader */ ··· 74 74 #define HAVE_HEADPHONE_DETECTION 75 75 76 76 /* KeyPad configuration for plugins */ 77 - #define CONFIG_KEYPAD FIIO_M3K_PAD 77 + #define CONFIG_KEYPAD FIIO_M3K_LINUX_PAD 78 78 79 79 /* Define this if a programmable hotkey is mapped */ 80 80 #define HAVE_HOTKEY
+2 -2
firmware/export/rbpaths.h
··· 43 43 /* NOTE: target-specific hosted HOME_DIR resides in filesystem-app.c */ 44 44 #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ 45 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 48 #define HOME_DIR "/" 49 49 ··· 80 80 81 81 #if defined(APPLICATION) && \ 82 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 85 #define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" 86 86 #define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR
+1 -1
firmware/export/system.h
··· 347 347 #ifndef SIMULATOR 348 348 bool dbg_ports(void); 349 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 351 bool dbg_hw_info(void); 352 352 #endif 353 353
+1 -1
firmware/font.c
··· 85 85 /* compiled-in font */ 86 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 90 struct buflib_alloc_data { 91 91 struct font font; /* must be the first member! */
+1 -1
tools/builds.pm
··· 448 448 name => 'xDuoo X20', 449 449 status => 2, 450 450 }, 451 - 'fiiom3k' => { 451 + 'fiiom3klinux' => { 452 452 name => 'FiiO M3K', 453 453 status => 1, 454 454 },
+4 -4
tools/configure
··· 1595 1595 ==AgpTek== 252) 800 227) NW-A20 series 1596 1596 240) Rocker 228) NWZ-A860 series 1597 1597 ==FiiO== 229) NWZ-S750 series 1598 - ==AIGO== 244) M3K 1598 + ==AIGO== 244) M3K Linux 1599 1599 245) Eros Q / K 1600 1600 1601 1601 EOF ··· 4088 4088 sysfontbl="16-Terminus" 4089 4089 ;; 4090 4090 4091 - 244|fiiom3k) 4091 + 244|fiiom3klinux) 4092 4092 application="yes" 4093 4093 app_type="fiio" 4094 4094 target_id=112 4095 - modelname="fiiom3k" 4096 - target="FIIO_M3K" 4095 + modelname="fiiom3klinux" 4096 + target="FIIO_M3K_LINUX" 4097 4097 memory=16 # XXX Can probably go over 32? 4098 4098 tool="cp " 4099 4099 boottool="cp "
+1 -1
tools/rockboxdev.sh
··· 845 845 # glibc: 2.16 846 846 # alsa: 1.0.29 847 847 # 848 - # FiiO M3K: 848 + # FiiO M3K Linux: 849 849 # kernel: 3.10.14 850 850 # glibc: 2.16 851 851 # alsa: 1.0.26