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 | |
parent | 71846b09ab45ec98b98e1d65e450371e8967c037 (diff) | |
download | rockbox-31fc46ded69be7438cca2ba2c2b93c1f200165a6.tar.gz rockbox-31fc46ded69be7438cca2ba2c2b93c1f200165a6.zip |
Revert g#1612
Change-Id: Ia971919ecb1690875c916c62ced04bccf99c5aee
Diffstat (limited to 'firmware/common')
-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 @@ | |||
30 | #include "dircache_redirect.h" | 30 | #include "dircache_redirect.h" |
31 | #include "disk.h" | 31 | #include "disk.h" |
32 | 32 | ||
33 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER) | ||
34 | #include "bootdata.h" | ||
35 | #include "crc32.h" | ||
36 | #endif | ||
37 | 33 | ||
38 | #ifndef CONFIG_DEFAULT_PARTNUM | 34 | #ifndef CONFIG_DEFAULT_PARTNUM |
39 | #define CONFIG_DEFAULT_PARTNUM 0 | 35 | #define CONFIG_DEFAULT_PARTNUM 0 |
@@ -253,23 +249,7 @@ int disk_mount_all(void) | |||
253 | for (int i = 0; i < NUM_VOLUMES; i++) | 249 | for (int i = 0; i < NUM_VOLUMES; i++) |
254 | vol_drive[i] = -1; /* mark all as unassigned */ | 250 | vol_drive[i] = -1; /* mark all as unassigned */ |
255 | 251 | ||
256 | #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR) && !defined(BOOTLOADER) | ||
257 | unsigned int crc = 0; | ||
258 | int boot_volume = 0; | ||
259 | crc = crc_32(boot_data.payload, boot_data.length, 0xffffffff); | ||
260 | if(crc == boot_data.crc) | ||
261 | { | ||
262 | boot_volume = boot_data.boot_volume; /* boot volume contained in uint8_t payload */ | ||
263 | } | ||
264 | #ifdef HAVE_HOTSWAP | ||
265 | if (storage_present(boot_volume)) | ||
266 | #endif | ||
267 | mounted += disk_mount(boot_volume); /* mount boot volume first */ | ||
268 | for (int i = 0; i < NUM_DRIVES; i++) | ||
269 | if (i != boot_volume) | ||
270 | #else | ||
271 | for (int i = 0; i < NUM_DRIVES; i++) | 252 | for (int i = 0; i < NUM_DRIVES; i++) |
272 | #endif | ||
273 | { | 253 | { |
274 | #ifdef HAVE_HOTSWAP | 254 | #ifdef HAVE_HOTSWAP |
275 | if (storage_present(i)) | 255 | if (storage_present(i)) |