[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/9edfccc85edf
branches:  trunk
changeset: 480713:9edfccc85edf
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jan 18 19:37:58 2000 +0000

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

diffstat:

 sys/arch/bebox/bebox/disksubr.c     |  15 +++++++--------
 sys/arch/hpcmips/hpcmips/disksubr.c |  16 +++++++---------
 2 files changed, 14 insertions(+), 17 deletions(-)

diffs (143 lines):

diff -r 6d41ed1d7bb6 -r 9edfccc85edf sys/arch/bebox/bebox/disksubr.c
--- a/sys/arch/bebox/bebox/disksubr.c   Tue Jan 18 19:36:58 2000 +0000
+++ b/sys/arch/bebox/bebox/disksubr.c   Tue Jan 18 19:37:58 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.6 1999/06/25 01:54:39 sakamoto Exp $    */
+/*     $NetBSD: disksubr.c,v 1.7 2000/01/18 19:37:58 thorpej Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -43,7 +43,6 @@
 
 #include "opt_mbr.h"
 
-#define        b_cylin b_resid
 
 int fat_types[] = { MBR_PTYPE_FAT12, MBR_PTYPE_FAT16S,
                    MBR_PTYPE_FAT16B, MBR_PTYPE_FAT32,
@@ -178,7 +177,7 @@
        bp->b_blkno = MBR_BBSECTOR;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
-       bp->b_cylin = MBR_BBSECTOR / lp->d_secpercyl;
+       bp->b_cylinder = MBR_BBSECTOR / lp->d_secpercyl;
        (*strat)(bp);
 
        /* if successful, wander through dos partition table */
@@ -244,7 +243,7 @@
 nombrpart:
        /* next, dig out disk label */
        bp->b_blkno = dospartoff + LABELSECTOR;
-       bp->b_cylin = cyl;
+       bp->b_cylinder = cyl;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
        (*strat)(bp);
@@ -288,7 +287,7 @@
                        else
                                bp->b_blkno /= DEV_BSIZE / lp->d_secsize;
                        bp->b_bcount = lp->d_secsize;
-                       bp->b_cylin = lp->d_ncylinders - 1;
+                       bp->b_cylinder = lp->d_ncylinders - 1;
                        (*strat)(bp);
 
                        /* if successful, validate, otherwise try another */
@@ -402,7 +401,7 @@
        bp->b_blkno = MBR_BBSECTOR;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
-       bp->b_cylin = MBR_BBSECTOR / lp->d_secpercyl;
+       bp->b_cylinder = MBR_BBSECTOR / lp->d_secpercyl;
        (*strat)(bp);
 
        if ((error = biowait(bp)) == 0) {
@@ -432,7 +431,7 @@
 
        /* next, dig out disk label */
        bp->b_blkno = dospartoff + LABELSECTOR;
-       bp->b_cylin = cyl;
+       bp->b_cylinder = cyl;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
        (*strat)(bp);
@@ -504,7 +503,7 @@
        }
 
        /* calculate cylinder for disksort to order transfers with */
-       bp->b_cylin = (bp->b_blkno + p->p_offset) /
+       bp->b_cylinder = (bp->b_blkno + p->p_offset) /
            (lp->d_secsize / DEV_BSIZE) / lp->d_secpercyl;
        return (1);
 
diff -r 6d41ed1d7bb6 -r 9edfccc85edf sys/arch/hpcmips/hpcmips/disksubr.c
--- a/sys/arch/hpcmips/hpcmips/disksubr.c       Tue Jan 18 19:36:58 2000 +0000
+++ b/sys/arch/hpcmips/hpcmips/disksubr.c       Tue Jan 18 19:37:58 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disksubr.c,v 1.3 1999/10/30 10:54:13 uch Exp $ */
+/*     $NetBSD: disksubr.c,v 1.4 2000/01/18 19:39:18 thorpej Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -44,8 +44,6 @@
 
 #include "opt_mbr.h"
 
-#define        b_cylin b_resid
-
 int fat_types[] = { MBR_PTYPE_FAT12, MBR_PTYPE_FAT16S,
                    MBR_PTYPE_FAT16B, MBR_PTYPE_FAT32,
                    MBR_PTYPE_FAT32L, MBR_PTYPE_FAT16L,
@@ -179,7 +177,7 @@
        bp->b_blkno = MBR_BBSECTOR;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
-       bp->b_cylin = MBR_BBSECTOR / lp->d_secpercyl;
+       bp->b_cylinder = MBR_BBSECTOR / lp->d_secpercyl;
        (*strat)(bp);
 
        /* if successful, wander through dos partition table */
@@ -245,7 +243,7 @@
 nombrpart:
        /* next, dig out disk label */
        bp->b_blkno = dospartoff + LABELSECTOR;
-       bp->b_cylin = cyl;
+       bp->b_cylinder = cyl;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
        (*strat)(bp);
@@ -289,7 +287,7 @@
                        else
                                bp->b_blkno /= DEV_BSIZE / lp->d_secsize;
                        bp->b_bcount = lp->d_secsize;
-                       bp->b_cylin = lp->d_ncylinders - 1;
+                       bp->b_cylinder = lp->d_ncylinders - 1;
                        (*strat)(bp);
 
                        /* if successful, validate, otherwise try another */
@@ -403,7 +401,7 @@
        bp->b_blkno = MBR_BBSECTOR;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
-       bp->b_cylin = MBR_BBSECTOR / lp->d_secpercyl;
+       bp->b_cylinder = MBR_BBSECTOR / lp->d_secpercyl;
        (*strat)(bp);
 
        if ((error = biowait(bp)) == 0) {
@@ -433,7 +431,7 @@
 
        /* next, dig out disk label */
        bp->b_blkno = dospartoff + LABELSECTOR;
-       bp->b_cylin = cyl;
+       bp->b_cylinder = cyl;
        bp->b_bcount = lp->d_secsize;
        bp->b_flags = B_BUSY | B_READ;
        (*strat)(bp);
@@ -505,7 +503,7 @@
        }
 
        /* calculate cylinder for disksort to order transfers with */
-       bp->b_cylin = (bp->b_blkno + p->p_offset) /
+       bp->b_cylinder = (bp->b_blkno + p->p_offset) /
            (lp->d_secsize / DEV_BSIZE) / lp->d_secpercyl;
        return (1);