diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-03-03 22:08:28 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-03-03 22:08:28 -0500 |
commit | c9857098ac0a3173d5d03baa3c32d9a8e29faec8 (patch) | |
tree | 3b3baeb89a9bb6440ad4518f5363338ca820cf29 /firmware/common | |
parent | c7bbd5b0902d7efc2fd204f2aa4ac8881c5a97be (diff) | |
download | rockbox-c9857098ac0a3173d5d03baa3c32d9a8e29faec8.tar.gz rockbox-c9857098ac0a3173d5d03baa3c32d9a8e29faec8.zip |
Multiboot Firmware Root Redirect - WIP
Loads external drive into root namespace
Root Redirects can now be put into different folders
For instance placing '/_test' into SD1/rockbox_main.<playername>
will redirect to /<1>/_test/.rockbox
Debug menu>Bootdata now has root directory listed in addition to RAW Bootdata
Redirect root work from Michael Sevakis g#1556, RESTORED -> g#4256
Change-Id: Ia97cf50ff5f5b440877f9c005da6f12c53af931e
Diffstat (limited to 'firmware/common')
-rw-r--r-- | firmware/common/disk.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/firmware/common/disk.c b/firmware/common/disk.c index c6fbc34409..e94e161d44 100644 --- a/firmware/common/disk.c +++ b/firmware/common/disk.c | |||
@@ -260,23 +260,7 @@ int disk_mount_all(void) | |||
260 | for (int i = 0; i < NUM_VOLUMES; i++) | 260 | for (int i = 0; i < NUM_VOLUMES; i++) |
261 | vol_drive[i] = -1; /* mark all as unassigned */ | 261 | vol_drive[i] = -1; /* mark all as unassigned */ |
262 | 262 | ||
263 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER) | ||
264 | unsigned int crc = 0; | ||
265 | int boot_volume = 0; | ||
266 | crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff); | ||
267 | if(crc == boot_data.crc) | ||
268 | { | ||
269 | boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */ | ||
270 | } | ||
271 | #ifdef HAVE_HOTSWAP | ||
272 | if (storage_present(boot_volume)) | ||
273 | #endif | ||
274 | mounted += disk_mount(boot_volume); /* mount boot volume first */ | ||
275 | for (int i = 0; i < NUM_DRIVES; i++) | ||
276 | if (i != boot_volume) | ||
277 | #else | ||
278 | for (int i = 0; i < NUM_DRIVES; i++) | 263 | for (int i = 0; i < NUM_DRIVES; i++) |
279 | #endif | ||
280 | { | 264 | { |
281 | #ifdef HAVE_HOTSWAP | 265 | #ifdef HAVE_HOTSWAP |
282 | if (storage_present(i)) | 266 | if (storage_present(i)) |