Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert g#1612

Browse source 
Change-Id: Ia971919ecb1690875c916c62ced04bccf99c5aee
This commit is contained in:
William Wilgus 2020-08-20 19:04:05 -04:00
parent 71846b09ab
commit 31fc46ded6
2 changed files with 3 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/debug_menu.c
View file

@ -2451,21 +2451,10 @@ static bool dbg_boot_data(void)
info.scroll_all = true; info.scroll_all = true;
simplelist_info_init(&info, "Boot data", 1, NULL); simplelist_info_init(&info, "Boot data", 1, NULL);
simplelist_set_line_count(0); simplelist_set_line_count(0);
crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff); simplelist_addline("Magic: %.8s", boot_data.magic);
#if defined(HAVE_MULTIBOOT)
int boot_volume = 0;
if(crc == boot_data.crc)
{
boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */
}
simplelist_addline("Boot Volume: <%lu>", boot_volume);
simplelist_addline("");
#endif
simplelist_addline("Bootdata RAW:");
if (crc != boot_data.crc)
simplelist_addline("Magic: %.8s", boot_data.magic);
simplelist_addline("Length: %lu", boot_data.length); simplelist_addline("Length: %lu", boot_data.length);
simplelist_addline("CRC: %lx", boot_data.crc); simplelist_addline("CRC: %lx", boot_data.crc);
crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff);
(crc == boot_data.crc) ? simplelist_addline("CRC: OK!") : (crc == boot_data.crc) ? simplelist_addline("CRC: OK!") :
simplelist_addline("CRC: BAD"); simplelist_addline("CRC: BAD");
for (unsigned i = 0; i < boot_data.length; i += 4) for (unsigned i = 0; i < boot_data.length; i += 4)
@ -2477,7 +2466,7 @@ static bool dbg_boot_data(void)
info.hide_selection = true; info.hide_selection = true;
return simplelist_show_list(&info); return simplelist_show_list(&info);
} }
#endif /* defined(HAVE_BOOTDATA) && !defined(SIMULATOR) */ #endif
/****** The menu *********/ /****** The menu *********/
static const struct { static const struct {

20
firmware/common/disk.c
View file

@ -30,10 +30,6 @@
#include "dircache_redirect.h" #include "dircache_redirect.h"
#include "disk.h" #include "disk.h"
#if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER)
#include "bootdata.h"
#include "crc32.h"
#endif
#ifndef CONFIG_DEFAULT_PARTNUM #ifndef CONFIG_DEFAULT_PARTNUM
#define CONFIG_DEFAULT_PARTNUM 0 #define CONFIG_DEFAULT_PARTNUM 0
@ -253,23 +249,7 @@ int disk_mount_all(void)
for (int i = 0; i < NUM_VOLUMES; i++) for (int i = 0; i < NUM_VOLUMES; i++)
vol_drive[i] = -1; /* mark all as unassigned */ 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++) 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 #ifdef HAVE_HOTSWAP
if (storage_present(i)) if (storage_present(i))