nihilazo/rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a bug in disk.c that really wasn't affecting anything.

Browse Source 
volume_onmount_internal() was being given the next volume to mount
instead of the one just mounted. Only dircache was being notified
for now, which always attempts to scan everything that needs to be
rebuilt, currently making the volume parameter value immaterial.

Put things in the right place and also set the disk sector
multiplier before notifying anybody of the new volume.

Change-Id: Ibc8f26c1d1eca672c753280b49fd8259fde51047
This commit is contained in:
Michael Sevakis 2017-02-06 02:25:22 -05:00
parent d7871914ac
commit 29c493dd74
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
firmware/common/disk.c
View File

@ -199,8 +199,6 @@ int disk_mount(int drive)
sizeof(fat_partition_types)) == NULL)
continue; /* not an accepted partition type */
bool success = false;
#ifdef MAX_LOG_SECTOR_SIZE
for (int j = 1; j <= (MAX_LOG_SECTOR_SIZE/SECTOR_SIZE); j <<= 1)
{
@ -210,9 +208,9 @@ int disk_mount(int drive)
pinfo[i].size *= j;
mounted++;
vol_drive[volume] = drive; /* remember the drive for this volume */
volume = get_free_volume(); /* prepare next entry */
disk_sector_multiplier[drive] = j;
success = true;
volume_onmount_internal(IF_MV(volume));
volume = get_free_volume(); /* prepare next entry */
break;
}
}
@ -221,13 +219,10 @@ int disk_mount(int drive)
{
mounted++;
vol_drive[volume] = drive; /* remember the drive for this volume */
volume_onmount_internal(IF_MV(volume));
volume = get_free_volume(); /* prepare next entry */
success = true;
}
#endif /* MAX_LOG_SECTOR_SIZE */
if (success)
volume_onmount_internal(IF_MV(volume));
}
if (mounted == 0 && volume != -1) /* none of the 4 entries worked? */