aboutsummaryrefslogtreecommitdiffstats
path: root/core/fs/diskio.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-07-17 12:36:26 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-07-17 12:36:26 -0700
commit8cca6fd29bb7613f5ba6acb1b740d13f5b6ac01d (patch)
tree92643a34ef10eedcdf92fdeaf1911c561f4747d0 /core/fs/diskio.c
parent465b43c2e0b714336dcd9767ad9c9d39850f70ba (diff)
downloadhdt-pierre-8cca6fd29bb7613f5ba6acb1b740d13f5b6ac01d.tar.gz
hdt-pierre-8cca6fd29bb7613f5ba6acb1b740d13f5b6ac01d.tar.xz
hdt-pierre-8cca6fd29bb7613f5ba6acb1b740d13f5b6ac01d.zip
diskio: fix name for secpercyl field, remove unused type field
Fix the name for the incorrectly named "t" (track) field; it is in fact the sectors/cylinder (secpercyl) field. Furthermore, remove the completely unused "type" field... right now the pointer to the rdwr_sectors field acts as a proxy, and if we need more complex stuff in the future it is probably better handled by pointing to an ops structure. Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/fs/diskio.c')
-rw-r--r--core/fs/diskio.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/core/fs/diskio.c b/core/fs/diskio.c
index b6722e76..449e12c4 100644
--- a/core/fs/diskio.c
+++ b/core/fs/diskio.c
@@ -12,7 +12,7 @@
static inline sector_t chs_max(const struct disk *disk)
{
- return disk->t << 10;
+ return disk->secpercyl << 10;
}
static int chs_rdwr_sectors(struct disk *disk, void *buf,
@@ -24,7 +24,7 @@ static int chs_rdwr_sectors(struct disk *disk, void *buf,
int sector_shift = disk->sector_shift;
uint32_t xlba = lba + disk->part_start; /* Truncated LBA (CHS is << 2 TB) */
uint32_t t;
- uint16_t c, h, s;
+ uint32_t c, h, s;
com32sys_t ireg, oreg;
size_t done = 0;
size_t bytes;
@@ -377,11 +377,10 @@ struct disk *disk_init(uint8_t devno, bool cdrom, sector_t part_start,
}
disk.disk_number = devno;
- disk.type = ebios;
disk.sector_size = sector_size;
disk.sector_shift = ilog2(sector_size);
disk.part_start = part_start;
- disk.t = disk.h * disk.s;
+ disk.secpercyl = disk.h * disk.s;
disk.rdwr_sectors = ebios ? edd_rdwr_sectors : chs_rdwr_sectors;
if (!MaxTransfer || MaxTransfer > hard_max_transfer)