summaryrefslogtreecommitdiff
path: root/firmware/common/rb-loader.c
diff options
context:
space:
mode:
authorAidan MacDonald <amachronic@protonmail.com>2022-03-07 11:36:00 +0000
committerAidan MacDonald <amachronic@protonmail.com>2022-03-27 09:50:33 -0400
commitbcbb5a8b00770ac0d2794e59876d8187ccfea6af (patch)
tree3fea3428991da6089c4fd4b76bdb51e8e362ca25 /firmware/common/rb-loader.c
parentdf3afcfa3b63b8f4ca012a428e35dfb24bba4bb9 (diff)
downloadrockbox-bcbb5a8b00770ac0d2794e59876d8187ccfea6af.tar.gz
rockbox-bcbb5a8b00770ac0d2794e59876d8187ccfea6af.zip
multiboot: Allow searching in volume 0 for redirect file
Searching in volume 0 is necessary for multiboot targets with only one drive, like the M3K/Q1/ErosQ. Without this the search code will never look at the redirect file on these targets. The search bound is configured with a setting MULTIBOOT_MIN_VOLUME, which defaults to 0, but is defined to 1 for Sansa players so they keep their old behavior. Change-Id: I6dc5cf98db4258731de2c68c3ab1182b4a4a655b
Diffstat (limited to 'firmware/common/rb-loader.c')
-rw-r--r--firmware/common/rb-loader.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/common/rb-loader.c b/firmware/common/rb-loader.c
index e3fc90342c..430ed6ec7b 100644
--- a/firmware/common/rb-loader.c
+++ b/firmware/common/rb-loader.c
@@ -106,7 +106,7 @@ int load_firmware(unsigned char* buf, const char* firmware, int buffer_size)
106 * 0 is the default boot volume, it is not checked here 106 * 0 is the default boot volume, it is not checked here
107 * if found <volume>/rockbox_main.<playername> and firmware 107 * if found <volume>/rockbox_main.<playername> and firmware
108 * has a bootdata region this firmware will be loaded */ 108 * has a bootdata region this firmware will be loaded */
109 for (unsigned int i = NUM_VOLUMES - 1; i > 0 && ret < 0; i--) 109 for (int i = NUM_VOLUMES - 1; i >= MULTIBOOT_MIN_VOLUME && ret < 0; i--)
110 { 110 {
111 if (get_redirect_dir(filename, sizeof(filename), i, 111 if (get_redirect_dir(filename, sizeof(filename), i,
112 BOOTDIR, firmware) > 0) 112 BOOTDIR, firmware) > 0)