diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2024-10-31 21:50:09 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2024-10-31 21:51:42 -0400 |
commit | 0a11b06d93c7593350d07e944adc00ab0e1d0108 (patch) | |
tree | 189d4f9a1a5bcef22edef6236232b0394b90d087 /firmware/drivers/ata.c | |
parent | d401501fdad9a3c0299e1b8bdfadcb8a41c2eba5 (diff) | |
download | rockbox-0a11b06d93c7593350d07e944adc00ab0e1d0108.tar.gz rockbox-0a11b06d93c7593350d07e944adc00ab0e1d0108.zip |
ata: Correct parsing of the logical sector size in the IDENTIFY DEVICE
....It's specified in 16-bit words, not bytes. So multiply it by 2.
(This hasn't been a problem in practice as everything uses 512B logical
sectors so far..)
Change-Id: I0b1abd0f6184330f0b7f5c000c5ad547038f7c95
Diffstat (limited to 'firmware/drivers/ata.c')
-rw-r--r-- | firmware/drivers/ata.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 8df9acb9da..7bb492c39d 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c | |||
@@ -1310,7 +1310,7 @@ int STORAGE_INIT_ATTR ata_init(void) | |||
1310 | 1310 | ||
1311 | #ifdef MAX_PHYS_SECTOR_SIZE | 1311 | #ifdef MAX_PHYS_SECTOR_SIZE |
1312 | /* Find out the physical sector size */ | 1312 | /* Find out the physical sector size */ |
1313 | if((identify_info[106] & 0xe000) == 0x6000) | 1313 | if((identify_info[106] & 0xe000) == 0x6000) /* B14, B13 */ |
1314 | phys_sector_mult = BIT_N(identify_info[106] & 0x000f); | 1314 | phys_sector_mult = BIT_N(identify_info[106] & 0x000f); |
1315 | else | 1315 | else |
1316 | phys_sector_mult = 1; | 1316 | phys_sector_mult = 1; |
@@ -1386,8 +1386,8 @@ void ata_get_info(IF_MD(int drive,)struct storage_info *info) | |||
1386 | int i; | 1386 | int i; |
1387 | 1387 | ||
1388 | /* Logical sector size > 512B ? */ | 1388 | /* Logical sector size > 512B ? */ |
1389 | if ((identify_info[106] & 0xd000) == 0x5000) | 1389 | if ((identify_info[106] & 0xd000) == 0x5000) /* B14, B12 */ |
1390 | info->sector_size = identify_info[117] | (identify_info[118] << 16); | 1390 | info->sector_size = (identify_info[117] | (identify_info[118] << 16)) * 2; |
1391 | else | 1391 | else |
1392 | info->sector_size = SECTOR_SIZE; | 1392 | info->sector_size = SECTOR_SIZE; |
1393 | 1393 | ||