diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-14 12:54:03 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-14 13:42:52 -0400 |
commit | ca4d63d4d903e3de356afb8d129ae61c660ff9b4 (patch) | |
tree | 21bee54c19bc90b660c215f9c7afa4a47c21b32c | |
parent | 1b449abf39feeace10b6db604a4537718769141e (diff) | |
download | rockbox-ca4d63d4d903e3de356afb8d129ae61c660ff9b4.tar.gz rockbox-ca4d63d4d903e3de356afb8d129ae61c660ff9b4.zip |
m3k: Fixes to the launcher/loader.
* Execute the correct OF player binary
* We don't have adb, so error out
Change-Id: I4fb39fcdf5e437450c059e6c1296ea6cb99298fe
-rw-r--r-- | bootloader/rocker_linux.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bootloader/rocker_linux.c b/bootloader/rocker_linux.c index a6d69d0e9d..3d35f22ba6 100644 --- a/bootloader/rocker_linux.c +++ b/bootloader/rocker_linux.c | |||
@@ -469,6 +469,11 @@ 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) | ||
473 | lcd_set_foreground(LCD_RGBPACK(255, 0, 0)); | ||
474 | lcd_putsf(0, 1, "ADB not supported!"); | ||
475 | sleep(2*HZ); | ||
476 | #else | ||
472 | pid_t pid = fork(); | 477 | pid_t pid = fork(); |
473 | if(pid == 0) | 478 | if(pid == 0) |
474 | { | 479 | { |
@@ -490,6 +495,7 @@ static void adb(int start) | |||
490 | lcd_putsf(0, 1, "an error occured: %x", status); | 495 | lcd_putsf(0, 1, "an error occured: %x", status); |
491 | } | 496 | } |
492 | #endif | 497 | #endif |
498 | #endif | ||
493 | } | 499 | } |
494 | 500 | ||
495 | static void tools_screen(void) | 501 | static void tools_screen(void) |
@@ -615,7 +621,11 @@ int main(int argc, char **argv) | |||
615 | #endif | 621 | #endif |
616 | mount_storage(false); | 622 | mount_storage(false); |
617 | /* boot OF */ | 623 | /* boot OF */ |
624 | #if defined(FIIO_M3K) | ||
625 | execvp("/usr/project/bin/player_daemon", argv); | ||
626 | #else | ||
618 | execvp("/usr/bin/hiby_player", argv); | 627 | execvp("/usr/bin/hiby_player", argv); |
628 | #endif | ||
619 | error_screen("Cannot boot OF"); | 629 | error_screen("Cannot boot OF"); |
620 | sleep(5 * HZ); | 630 | sleep(5 * HZ); |
621 | } | 631 | } |