summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2020-08-20 21:54:00 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2020-08-20 21:54:00 -0400
commitf850bbbbc4b7345bebde241f651bad1c5c28df66 (patch)
tree1574bcca604f0617130aa9f1c426cfcdc097c901 /apps
parentbd744059cf959c8b9086978b32660efef5925b7d (diff)
downloadrockbox-f850bbbbc4b7345bebde241f651bad1c5c28df66.tar.gz
rockbox-f850bbbbc4b7345bebde241f651bad1c5c28df66.zip
Revert root_redirect :(
This reverts commit 31fc46ded69be7438cca2ba2c2b93c1f200165a6. Change-Id: Ia78618c0e8b25ca65f7c8ae0db1cb9c9b321bad9
Diffstat (limited to 'apps')
-rw-r--r--apps/debug_menu.c19
1 files changed, 7 insertions, 12 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index eae389d049..e75fce6d32 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -2453,21 +2453,16 @@ static bool dbg_boot_data(void)
2453 simplelist_set_line_count(0); 2453 simplelist_set_line_count(0);
2454 crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff); 2454 crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
2455#if defined(HAVE_MULTIBOOT) 2455#if defined(HAVE_MULTIBOOT)
2456 char rootpath[VOL_MAX_LEN+2] = RB_ROOT_CONTENTS_DIR;
2457 int boot_volume = 0; 2456 int boot_volume = 0;
2458 if(crc == boot_data.crc) 2457 if(crc == boot_data.crc)
2459 { 2458 {
2460 boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */ 2459 boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
2461 get_redirect_dir(rootpath, sizeof(rootpath), boot_volume, "", ""); 2460 }
2462 rootpath[path_strip_trailing_separators(rootpath,NULL)] = '\0'; 2461 simplelist_addline("Boot Volume: <%lu>", boot_volume);
2463 } 2462 simplelist_addline("");
2464 simplelist_addline("Boot Volume: <%lu>", boot_volume);
2465 simplelist_addline("Root:");
2466 simplelist_addline("%s", rootpath);
2467 simplelist_addline("");
2468#endif 2463#endif
2469 simplelist_addline("Bootdata RAW:"); 2464 simplelist_addline("Bootdata RAW:");
2470 if (crc != boot_data.crc) 2465 if (crc != boot_data.crc)
2471 simplelist_addline("Magic: %.8s", boot_data.magic); 2466 simplelist_addline("Magic: %.8s", boot_data.magic);
2472 simplelist_addline("Length: %lu", boot_data.length); 2467 simplelist_addline("Length: %lu", boot_data.length);
2473 simplelist_addline("CRC: %lx", boot_data.crc); 2468 simplelist_addline("CRC: %lx", boot_data.crc);