devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests 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
Download patch file Download diff file Expand all files Collapse all files

20
firmware/common/disk.c
View file

@ -30,10 +30,6 @@
#include "dircache_redirect.h"
#include "disk.h"
#if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER)
#include "bootdata.h"
#include "crc32.h"
#endif
#ifndef CONFIG_DEFAULT_PARTNUM
#define CONFIG_DEFAULT_PARTNUM 0
@ -253,23 +249,7 @@ 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))