len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

storage: Misc corrections and cleanups

Browse source 
* Make the partial sector logic a little clearer (no functional change)
 * Corrections for debugging messages
 * Also use MAX_VIRT_SECTOR_SIZE in BOUNCE_BUFFER calculations

Change-Id: I89363824b092b2e3bddd5e0f75bf81200c9bc513
This commit is contained in:
Solomon Peachy 2024-11-26 08:35:33 -05:00
parent 127b583a4d
commit dfbbfb12d4
3 changed files with 55 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

97
firmware/drivers/ata-common.c
View file

@ -84,7 +84,7 @@ int ata_read_sectors(IF_MD(int drive,)
offset = start & (phys_sector_mult - 1);
if (offset) /* first partial sector */
if (offset) /* first partial physical sector */
{
int partcount = MIN(incount, phys_sector_mult - offset);
@ -101,32 +101,30 @@ int ata_read_sectors(IF_MD(int drive,)
inbuf += partcount * log_sector_size;
incount -= partcount;
}
if (incount)
{
offset = incount & (phys_sector_mult - 1);
incount -= offset;
offset = incount & (phys_sector_mult - 1);
incount -= offset;
if (incount)
if (incount) /* all complete physical sectors */
{
rc = ata_transfer_sectors(start, incount, inbuf, false);
if (rc)
{
rc = ata_transfer_sectors(start, incount, inbuf, false);
if (rc)
{
rc = rc * 10 - 2;
goto error;
}
start += incount;
inbuf += incount * log_sector_size;
rc = rc * 10 - 2;
goto error;
}
if (offset)
start += incount;
inbuf += incount * log_sector_size;
}
if (offset) /* Trailing partial logical sector */
{
rc = cache_sector(start);
if (rc)
{
rc = cache_sector(start);
if (rc)
{
rc = rc * 10 - 3;
goto error;
}
memcpy(inbuf, sector_cache.data, offset * log_sector_size);
rc = rc * 10 - 3;
goto error;
}
memcpy(inbuf, sector_cache.data, offset * log_sector_size);
}
error:
@ -150,7 +148,7 @@ int ata_write_sectors(IF_MD(int drive,)
offset = start & (phys_sector_mult - 1);
if (offset) /* first partial sector */
if (offset) /* first partial physical sector */
{
int partcount = MIN(count, phys_sector_mult - offset);
@ -172,37 +170,36 @@ int ata_write_sectors(IF_MD(int drive,)
buf += partcount * log_sector_size;
count -= partcount;
}
if (count)
{
offset = count & (phys_sector_mult - 1);
count -= offset;
if (count)
offset = count & (phys_sector_mult - 1);
count -= offset;
if (count) /* all complete physical sectors */
{
rc = ata_transfer_sectors(start, count, (void*)buf, true);
if (rc)
{
rc = ata_transfer_sectors(start, count, (void*)buf, true);
if (rc)
{
rc = rc * 10 - 3;
goto error;
}
start += count;
buf += count * log_sector_size;
rc = rc * 10 - 3;
goto error;
}
if (offset)
start += count;
buf += count * log_sector_size;
}
if (offset) /* Trailing partial logical sector */
{
rc = cache_sector(start);
if (rc)
{
rc = cache_sector(start);
if (rc)
{
rc = rc * 10 - 4;
goto error;
}
memcpy(sector_cache.data, buf, offset * log_sector_size);
rc = flush_current_sector();
if (rc)
{
rc = rc * 10 - 5;
goto error;
}
rc = rc * 10 - 4;
goto error;
}
memcpy(sector_cache.data, buf, offset * log_sector_size);
rc = flush_current_sector();
if (rc)
{
rc = rc * 10 - 5;
goto error;
}
}