[src/trunk]: src/sys/arch Use b_cylinder as defined in sys/buf.h

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6d46cd3cc8e7
branches:  trunk
changeset: 480717:6d46cd3cc8e7
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jan 18 19:46:07 2000 +0000

description:
Use b_cylinder as defined in sys/buf.h

diffstat:

 sys/arch/newsmips/newsmips/disksubr.c |  6 ++----
 sys/arch/pc532/pc532/disksubr.c       |  8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r 10fa41aa1d65 -r 6d46cd3cc8e7 sys/arch/newsmips/newsmips/disksubr.c
--- a/sys/arch/newsmips/newsmips/disksubr.c     Tue Jan 18 19:45:58 2000 +0000
+++ b/sys/arch/newsmips/newsmips/disksubr.c     Tue Jan 18 19:46:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.2 1998/06/01 19:31:05 tsubai Exp $      */
+/*     $NetBSD: disksubr.c,v 1.3 2000/01/18 19:46:07 thorpej Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -43,8 +43,6 @@
 #include <sys/disklabel.h>
 #include <sys/syslog.h>
 
-#define        b_cylin b_resid
-
 char*  readdisklabel __P((dev_t dev, void (*strat) __P((struct buf *bp)),
                       register struct disklabel *lp,
                       struct cpu_disklabel *osdep));
@@ -80,7 +78,7 @@
        bp->b_blkno = LABELSECTOR;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
-       bp->b_cylin = LABELSECTOR / lp->d_secpercyl;
+       bp->b_cylinder = LABELSECTOR / lp->d_secpercyl;
        (*strat)(bp);
        if (biowait(bp)) {
                msg = "I/O error";
diff -r 10fa41aa1d65 -r 6d46cd3cc8e7 sys/arch/pc532/pc532/disksubr.c
--- a/sys/arch/pc532/pc532/disksubr.c   Tue Jan 18 19:45:58 2000 +0000
+++ b/sys/arch/pc532/pc532/disksubr.c   Tue Jan 18 19:46:07 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.14 1998/04/21 20:12:17 matthias Exp $   */
+/*     $NetBSD: disksubr.c,v 1.15 2000/01/18 19:46:35 thorpej Exp $    */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -50,8 +50,6 @@
 
 #include <machine/autoconf.h>
 
-#define        b_cylin b_resid
-
 /*
  * Attempt to read a disk label from a device
  * using the indicated stategy routine.
@@ -83,7 +81,7 @@
        bp->b_blkno = LABELSECTOR;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
-       bp->b_cylin = LABELSECTOR / lp->d_secpercyl;
+       bp->b_cylinder = LABELSECTOR / lp->d_secpercyl;
        (*strat)(bp);
        if (biowait(bp)) {
                msg = "I/O error";
@@ -240,7 +238,7 @@
        }
 
        /* calculate cylinder for disksort to order transfers with */
-       bp->b_cylin = (bp->b_blkno + p->p_offset) / lp->d_secpercyl;
+       bp->b_cylinder = (bp->b_blkno + p->p_offset) / lp->d_secpercyl;
        return(1);
 
 bad: