summaryrefslogtreecommitdiffstats
path: root/firmware/common
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-08-20 19:19:55 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2020-08-20 19:19:55 -0400
commitbd744059cf959c8b9086978b32660efef5925b7d (patch)
treec445741c74a6312b5b8a2c64452ac48e20b182eb /firmware/common
parent5ef28cccf92f5eada6d502fa4b0e16a13e94be5b (diff)
downloadrockbox-bd744059cf959c8b9086978b32660efef5925b7d.tar.gz
rockbox-bd744059cf959c8b9086978b32660efef5925b7d.tar.bz2
rockbox-bd744059cf959c8b9086978b32660efef5925b7d.zip
Multiboot Firmware Root Redirect
Firmware now includes rudimentary redirect functionality but this only supports /.rockbox in the root of the device This patch allows loading external drive and directory 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 Redirect will be updated if code refactor is ever done Requires Multiboot bootloader (already in main) Change-Id: I697b3d0499f85e789c3020bc2133fbe0023f72a2
Diffstat (limited to 'firmware/common')
-rw-r--r--firmware/common/disk.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/firmware/common/disk.c b/firmware/common/disk.c
index 3bd88f66a8..49137286a3 100644
--- a/firmware/common/disk.c
+++ b/firmware/common/disk.c
@@ -27,7 +27,7 @@
#include "disk_cache.h"
#include "fileobj_mgr.h"
#include "dir.h"
-#include "rb_namespace.h"
+#include "dircache_redirect.h"
#include "disk.h"
@@ -249,7 +249,23 @@ int disk_mount_all(void)
for (int i = 0; i < NUM_VOLUMES; i++)
vol_drive[i] = -1; /* mark all as unassigned */
+#if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER)
+ unsigned int crc = 0;
+ int boot_volume = 0;
+ crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
+ if(crc == boot_data.crc)
+ {
+ boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
+ }
+ #ifdef HAVE_HOTSWAP
+ if (storage_present(boot_volume))
+ #endif
+ mounted += disk_mount(boot_volume); /* mount boot volume first */
+ for (int i = 0; i < NUM_DRIVES; i++)
+ if (i != boot_volume)
+#else
for (int i = 0; i < NUM_DRIVES; i++)
+#endif
{
#ifdef HAVE_HOTSWAP
if (storage_present(i))