diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-22 00:40:03 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-22 00:40:03 +0000 |
| commit | 22c9c3850c0937b005b1a8552095891e59df87c2 (patch) | |
| tree | e3633a0c9690c06d26a567eb2f2c6e937c26db61 /sys/arch/sparc64 | |
| parent | 2122cf052cb864c6d41447b67783028f0ee3a145 (diff) | |
b_cylin -> b_cylinder; no functional change.
Diffstat (limited to 'sys/arch/sparc64')
| -rw-r--r-- | sys/arch/sparc64/dev/fd.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c index a52f156a50c..406dc7d7f96 100644 --- a/sys/arch/sparc64/dev/fd.c +++ b/sys/arch/sparc64/dev/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.4 2005/08/01 12:10:25 miod Exp $ */ +/* $OpenBSD: fd.c,v 1.5 2006/01/22 00:40:02 miod Exp $ */ /* $NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $ */ /*- @@ -156,8 +156,6 @@ /* XXX misuse a flag to identify format operation */ #define B_FORMAT B_XXX -#define b_cylin b_resid - #ifdef FD_DEBUG int fdc_debug = 0; #endif @@ -743,14 +741,14 @@ fdstrategy(bp) bp->b_bcount = sz << DEV_BSHIFT; } - bp->b_cylin = (bp->b_blkno * DEV_BSIZE) / + bp->b_cylinder = (bp->b_blkno * DEV_BSIZE) / (FD_BSIZE(fd) * fd->sc_type->seccyl); #ifdef FD_DEBUG if (fdc_debug > 1) printf("fdstrategy: b_blkno %lld b_bcount %ld blkno %lld cylin %ld\n", (long long)bp->b_blkno, bp->b_bcount, - (long long)fd->sc_blkno, bp->b_cylin); + (long long)fd->sc_blkno, bp->b_cylinder); #endif /* Queue transfer on drive, activate drive and controller if idle. */ @@ -1370,12 +1368,12 @@ loop: doseek: if ((fdc->sc_flags & FDC_EIS) && (bp->b_flags & B_FORMAT) == 0) { - fd->sc_cylin = bp->b_cylin; + fd->sc_cylin = bp->b_cylinder; /* We use implied seek */ goto doio; } - if (fd->sc_cylin == bp->b_cylin) + if (fd->sc_cylin == bp->b_cylinder) goto doio; fd->sc_cylin = -1; @@ -1397,7 +1395,7 @@ loop: /* seek function */ FDC_WRFIFO(fdc, NE7CMD_SEEK); FDC_WRFIFO(fdc, fd->sc_drive); /* drive number */ - FDC_WRFIFO(fdc, bp->b_cylin * fd->sc_type->step); + FDC_WRFIFO(fdc, bp->b_cylinder * fd->sc_type->step); return (1); case DODSKCHG: @@ -1525,7 +1523,7 @@ loop: /* Make sure seek really happened. */ if (fdc->sc_nstat != 2 || (st0 & 0xf8) != 0x20 || - cyl != bp->b_cylin * fd->sc_type->step) { + cyl != bp->b_cylinder * fd->sc_type->step) { #ifdef FD_DEBUG if (fdc_debug) fdcstatus(fdc, "seek failed"); @@ -1533,7 +1531,7 @@ loop: fdcretry(fdc); goto loop; } - fd->sc_cylin = bp->b_cylin; + fd->sc_cylin = bp->b_cylinder; goto doio; case IOTIMEDOUT: @@ -1642,7 +1640,7 @@ loop: fd->sc_skip += fd->sc_nbytes; fd->sc_bcount -= fd->sc_nbytes; if (finfo == NULL && fd->sc_bcount > 0) { - bp->b_cylin = fd->sc_blkno / fd->sc_type->seccyl; + bp->b_cylinder = fd->sc_blkno / fd->sc_type->seccyl; goto doseek; } fdfinish(fd, bp); |