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/dev | |
| parent | 2122cf052cb864c6d41447b67783028f0ee3a145 (diff) | |
b_cylin -> b_cylinder; no functional change.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isa/fd.c | 18 | ||||
| -rw-r--r-- | sys/dev/vnd.c | 6 |
2 files changed, 10 insertions, 14 deletions
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index c5d812f9ce9..ef58b4e79ca 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.51 2005/09/19 01:28:04 deraadt Exp $ */ +/* $OpenBSD: fd.c,v 1.52 2006/01/22 00:40:02 miod Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -79,8 +79,6 @@ /* XXX misuse a flag to identify format operation */ #define B_FORMAT B_XXX -#define b_cylin b_resid - /* fd_type struct now in ioctl_fd.h */ /* The order of entries in the following table is important -- BEWARE! */ @@ -381,11 +379,11 @@ fdstrategy(bp) bp->b_bcount = sz << DEV_BSHIFT; } - bp->b_cylin = bp->b_blkno / (fd_bsize / DEV_BSIZE) / fd->sc_type->seccyl; + bp->b_cylinder = bp->b_blkno / (fd_bsize / DEV_BSIZE) / fd->sc_type->seccyl; #ifdef FD_DEBUG printf("fdstrategy: b_blkno %d b_bcount %d blkno %d cylin %d sz %d\n", - bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylin, sz); + bp->b_blkno, bp->b_bcount, fd->sc_blkno, bp->b_cylinder, sz); #endif /* Queue transfer on drive, activate drive and controller if idle. */ @@ -676,7 +674,7 @@ loop: /* fall through */ case DOSEEK: doseek: - if (fd->sc_cylin == bp->b_cylin) + if (fd->sc_cylin == bp->b_cylinder) goto doio; out_fdc(iot, ioh, NE7CMD_SPECIFY);/* specify command */ @@ -685,7 +683,7 @@ loop: out_fdc(iot, ioh, NE7CMD_SEEK); /* seek function */ out_fdc(iot, ioh, fd->sc_drive); /* drive number */ - out_fdc(iot, ioh, bp->b_cylin * fd->sc_type->step); + out_fdc(iot, ioh, bp->b_cylinder * fd->sc_type->step); fd->sc_cylin = -1; fdc->sc_state = SEEKWAIT; @@ -776,14 +774,14 @@ loop: /* Make sure seek really happened. */ out_fdc(iot, ioh, NE7CMD_SENSEI); if (fdcresult(fdc) != 2 || (st0 & 0xf8) != 0x20 || - cyl != bp->b_cylin * fd->sc_type->step) { + cyl != bp->b_cylinder * fd->sc_type->step) { #ifdef FD_DEBUG fdcstatus(&fd->sc_dev, 2, "seek failed"); #endif fdretry(fd); goto loop; } - fd->sc_cylin = bp->b_cylin; + fd->sc_cylin = bp->b_cylinder; goto doio; case IOTIMEDOUT: @@ -823,7 +821,7 @@ loop: fd->sc_skip += fd->sc_nbytes; fd->sc_bcount -= fd->sc_nbytes; if (!finfo && 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); diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index a472e510bcb..ec6e527ac63 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnd.c,v 1.57 2005/12/29 20:02:03 pedro Exp $ */ +/* $OpenBSD: vnd.c,v 1.58 2006/01/22 00:40:02 miod Exp $ */ /* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */ /* @@ -93,8 +93,6 @@ int vnddebug = 0x00; #define VDB_IO 0x04 #endif -#define b_cylin b_resid - /* * vndunit is a bit weird. have to reconstitute the dev_t for * DISKUNIT(), but with the minor masked off. @@ -614,7 +612,7 @@ vndstrategy(bp) /* * Just sort by block number */ - nbp->vb_buf.b_cylin = nbp->vb_buf.b_blkno; + nbp->vb_buf.b_cylinder = nbp->vb_buf.b_blkno; s = splbio(); disksort(&vnd->sc_tab, &nbp->vb_buf); if (vnd->sc_tab.b_active < vnd->sc_maxactive) { |