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

ata: if drive doesn't advertise a nonstandard sector size, default to 512

Browse source 
...Instead of SECTOR_SIZE, which might be different.  This way
we can properly validate the value.

Change-Id: I8e6ae5882792f301ac580a144556af94772f4cfe
This commit is contained in:
Solomon Peachy 2024-11-07 18:14:03 -05:00
parent 9dd2781b87
commit 3664d382e0
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/debug_menu.c
View file

@ -1445,7 +1445,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */ if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */
sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2; sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2;
else else
sector_size = SECTOR_SIZE; sector_size = 512;
total_sectors *= sector_size; /* Convert to bytes */ total_sectors *= sector_size; /* Convert to bytes */
total_sectors /= (1024 * 1024); /* Convert to MB */ total_sectors /= (1024 * 1024); /* Convert to MB */

2
firmware/drivers/ata.c
View file

@ -1116,7 +1116,7 @@ int STORAGE_INIT_ATTR ata_init(void)
if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */ if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */
log_sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2; log_sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2;
else else
log_sector_size = SECTOR_SIZE; log_sector_size = 512;
rc = freeze_lock(); rc = freeze_lock();
if (rc) { if (rc) {

2
firmware/target/arm/s5l8702/ipod6g/storage_ata-6g.c
View file

@ -1154,7 +1154,7 @@ int ata_init(void)
if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */ if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */
log_sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2; log_sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2;
else else
log_sector_size = SECTOR_SIZE; log_sector_size = 512;
#ifdef MAX_PHYS_SECTOR_SIZE #ifdef MAX_PHYS_SECTOR_SIZE
rc = ata_get_phys_sector_mult(); rc = ata_get_phys_sector_mult();