summaryrefslogtreecommitdiffstats
path: root/firmware/include/dircache_redirect.h
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/include/dircache_redirect.h
parent5ef28cccf92f5eada6d502fa4b0e16a13e94be5b (diff)
downloadrockbox-bd744059cf.tar.gz
rockbox-bd744059cf.tar.bz2
rockbox-bd744059cf.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/include/dircache_redirect.h')
-rw-r--r--firmware/include/dircache_redirect.h42
1 files changed, 42 insertions, 0 deletions
diff --git a/firmware/include/dircache_redirect.h b/firmware/include/dircache_redirect.h
index 9a8de2fecd..e8cf8dc8f5 100644
--- a/firmware/include/dircache_redirect.h
+++ b/firmware/include/dircache_redirect.h
@@ -25,6 +25,12 @@
#include "dir.h"
#include "dircache.h"
+#if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR)
+#include "rb-loader.h"
+#include "bootdata.h"
+#include "crc32.h"
+#endif
+
/***
** Internal redirects that depend upon whether or not dircache is made
**
@@ -132,11 +138,47 @@ static inline void volume_onmount_internal(IF_MV_NONVOID(int volume))
#else
const char *path = PATH_ROOTSTR;
#endif
+
+#if defined(HAVE_MULTIBOOT) && !defined(SIMULATOR)
+ static char rtpath[VOL_MAX_LEN+2] = RB_ROOT_CONTENTS_DIR;
+ static bool redirected = false;
+ int boot_volume = 0;
+ unsigned int crc = 0;
+
+ crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
+ if (crc == boot_data.crc)
+ {
+ root_mount_path(path, 0); /*root could be different folder don't hide*/
+ boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
+ //root_mount_path(path, volume == boot_volume ? NSITEM_HIDDEN : 0);
+ if (!redirected && volume == boot_volume)
+ {
+ if (get_redirect_dir(rtpath, sizeof(rtpath), volume, "", "") < 0)
+ { /* Error occurred, card removed? Set root to default */
+ root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS);
+ }
+ else
+ redirected = true;
+ }
+ if (redirected && volume == boot_volume)
+ root_mount_path(rtpath, NSITEM_CONTENTS);
+ } /*CRC OK*/
+ else
+ {
+ root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0);
+ if (volume == path_strip_volume(RB_ROOT_CONTENTS_DIR, NULL, false))
+ root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS);
+ }
+#else
+
root_mount_path(path, RB_ROOT_VOL_HIDDEN(volume) ? NSITEM_HIDDEN : 0);
#ifdef HAVE_MULTIVOLUME
if (volume == path_strip_volume(RB_ROOT_CONTENTS_DIR, NULL, false))
#endif
root_mount_path(RB_ROOT_CONTENTS_DIR, NSITEM_CONTENTS);
+
+#endif /* HAVE_MULTIBOOT */
+
#ifdef HAVE_DIRCACHE
dircache_mount();
#endif