diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-05 09:38:13 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-03-12 18:25:10 +0000 |
commit | 7554a49309fe31e69747c64caa28b4303270481b (patch) | |
tree | 0712f67d4e7d3b7ae4b33709f4a1f7e426c5210b /bootloader/x1000/boot.c | |
parent | 905591215fdad421f9985ad846b082b86a9ed0b7 (diff) | |
download | rockbox-7554a49309fe31e69747c64caa28b4303270481b.tar.gz rockbox-7554a49309fe31e69747c64caa28b4303270481b.zip |
x1000: bootloader: refactor init_disk
Add check_disk() to query the disk insertion status and prompt the
user if necessary. Use this in place of init_disk().
Perform an unconditional disk_mount_all() from the main function.
Change-Id: I9a8cc42266edf99cd15ece3aee8fa25835df04ae
Diffstat (limited to 'bootloader/x1000/boot.c')
-rw-r--r-- | bootloader/x1000/boot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/bootloader/x1000/boot.c b/bootloader/x1000/boot.c index f9e04d1223..bb9528ba3c 100644 --- a/bootloader/x1000/boot.c +++ b/bootloader/x1000/boot.c | |||
@@ -28,11 +28,9 @@ | |||
28 | #include "power.h" | 28 | #include "power.h" |
29 | #include "boot-x1000.h" | 29 | #include "boot-x1000.h" |
30 | 30 | ||
31 | extern int init_disk(void); | ||
32 | |||
33 | void boot_rockbox(void) | 31 | void boot_rockbox(void) |
34 | { | 32 | { |
35 | if(init_disk() != 0) | 33 | if(check_disk(true) != DISK_PRESENT) |
36 | return; | 34 | return; |
37 | 35 | ||
38 | size_t max_size = 0; | 36 | size_t max_size = 0; |