diff options
| author | William Wilgus <wilgus.william@gmail.com> | 2020-08-20 19:04:05 -0400 |
|---|---|---|
| committer | William Wilgus <wilgus.william@gmail.com> | 2020-08-20 19:04:05 -0400 |
| commit | 31fc46ded69be7438cca2ba2c2b93c1f200165a6 (patch) | |
| tree | 5032b2e0ca45fa35f1f77aadcc3be312afb3d903 /firmware/common/disk.c | |
| parent | 71846b09ab45ec98b98e1d65e450371e8967c037 (diff) | |
| download | rockbox-31fc46ded6.tar.gz rockbox-31fc46ded6.zip | |
Revert g#1612
Change-Id: Ia971919ecb1690875c916c62ced04bccf99c5aee
Diffstat (limited to 'firmware/common/disk.c')
| -rw-r--r-- | firmware/common/disk.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/firmware/common/disk.c b/firmware/common/disk.c index 51d033b678..98c273b26d 100644 --- a/firmware/common/disk.c +++ b/firmware/common/disk.c @@ -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)) |