Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adapt to const changes.

Browse Source 
replace local b_cylin alias with the usual b_cylinder.
This commit is contained in:
chs 2005-05-31 16:13:09 +00:00
parent 90fe0e8ced
commit 34945e7b56
1 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/arch/hp700/hp700/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.13 2004/07/31 07:31:08 skrll Exp $ */ /* $NetBSD: disksubr.c,v 1.14 2005/05/31 16:13:09 chs Exp $ */
/* $OpenBSD: disksubr.c,v 1.6 2000/10/18 21:00:34 mickey Exp $ */ /* $OpenBSD: disksubr.c,v 1.6 2000/10/18 21:00:34 mickey Exp $ */
@ -106,7 +106,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.13 2004/07/31 07:31:08 skrll Exp $"); __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.14 2005/05/31 16:13:09 chs Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -116,12 +116,10 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.13 2004/07/31 07:31:08 skrll Exp $");
#include <sys/syslog.h> #include <sys/syslog.h>
#include <sys/disk.h> #include <sys/disk.h>
#define b_cylin b_resid const char *readliflabel(struct buf *, void (*)(struct buf *),
char *readliflabel(struct buf *, void (*)(struct buf *),
struct disklabel *, struct cpu_disklabel *, int *, int *, int); struct disklabel *, struct cpu_disklabel *, int *, int *, int);
char *readbsdlabel(struct buf *bp, void (*strat)(struct buf *), int cyl, const char *readbsdlabel(struct buf *, void (*)(struct buf *), int,
int sec, int off, int endian, struct disklabel *lp, int spoofonly); int, int, int, struct disklabel *, int);
void swapdisklabel(struct disklabel *); void swapdisklabel(struct disklabel *);
/* /*
@ -177,12 +175,12 @@ swapdisklabel(struct disklabel *dlp)
/* /*
* Try to read a standard BSD disklabel at a certain sector. * Try to read a standard BSD disklabel at a certain sector.
*/ */
char * const char *
readbsdlabel(struct buf *bp, void (*strat)(struct buf *), int cyl, int sec, readbsdlabel(struct buf *bp, void (*strat)(struct buf *), int cyl, int sec,
int off, int endian, struct disklabel *lp, int spoofonly) int off, int endian, struct disklabel *lp, int spoofonly)
{ {
struct disklabel *dlp; struct disklabel *dlp;
char *msg = NULL; const char *msg = NULL;
u_int16_t cksum; u_int16_t cksum;
u_int32_t magic; u_int32_t magic;
@ -194,7 +192,7 @@ readbsdlabel(struct buf *bp, void (*strat)(struct buf *), int cyl, int sec,
return (NULL); return (NULL);
bp->b_blkno = sec; bp->b_blkno = sec;
bp->b_cylin = cyl; bp->b_cylinder = cyl;
bp->b_bcount = lp->d_secsize; bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ; bp->b_flags = B_BUSY | B_READ;
(*strat)(bp); (*strat)(bp);
@ -262,7 +260,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
{ {
int spoofonly = 0; int spoofonly = 0;
struct buf *bp = NULL; struct buf *bp = NULL;
char *msg = "no disk label"; const char *msg = "no disk label";
int i; int i;
struct disklabel minilabel, fallbacklabel; struct disklabel minilabel, fallbacklabel;
@ -309,7 +307,7 @@ done:
} }
char * const char *
readliflabel(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp, readliflabel(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp,
struct cpu_disklabel *osdep, int *partoffp, int *cylp, int spoofonly) struct cpu_disklabel *osdep, int *partoffp, int *cylp, int spoofonly)
{ {
@ -319,7 +317,7 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp,
bp->b_blkno = btodb(HP700_LIF_VOLSTART); bp->b_blkno = btodb(HP700_LIF_VOLSTART);
bp->b_bcount = lp->d_secsize; bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ; bp->b_flags = B_BUSY | B_READ;
bp->b_cylin = btodb(HP700_LIF_VOLSTART) / lp->d_secpercyl; bp->b_cylinder = btodb(HP700_LIF_VOLSTART) / lp->d_secpercyl;
(*strat)(bp); (*strat)(bp);
if (biowait(bp)) { if (biowait(bp)) {
@ -338,7 +336,7 @@ readliflabel(struct buf *bp, void (*strat)(struct buf *), struct disklabel *lp,
bp->b_blkno = btodb(HP700_LIF_DIRSTART); bp->b_blkno = btodb(HP700_LIF_DIRSTART);
bp->b_bcount = lp->d_secsize; bp->b_bcount = lp->d_secsize;
bp->b_flags = B_BUSY | B_READ; bp->b_flags = B_BUSY | B_READ;
bp->b_cylin = (HP700_LIF_DIRSTART) / lp->d_secpercyl; bp->b_cylinder = (HP700_LIF_DIRSTART) / lp->d_secpercyl;
(*strat)(bp); (*strat)(bp);
if (biowait(bp)) { if (biowait(bp)) {
@ -436,7 +434,7 @@ int
writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp, writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
struct cpu_disklabel *osdep) struct cpu_disklabel *osdep)
{ {
char *msg = "no disk label"; const char *msg = "no disk label";
struct buf *bp; struct buf *bp;
struct disklabel dl; struct disklabel dl;
struct cpu_disklabel cdl; struct cpu_disklabel cdl;
@ -469,7 +467,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
labeloffset = LABELOFFSET; labeloffset = LABELOFFSET;
endian = BYTE_ORDER; endian = BYTE_ORDER;
bp->b_blkno = partoff + LABELSECTOR; bp->b_blkno = partoff + LABELSECTOR;
bp->b_cylin = cyl; bp->b_cylinder = cyl;
bp->b_bcount = lp->d_secsize; bp->b_bcount = lp->d_secsize;
} }
@ -538,7 +536,7 @@ bounds_check_with_label(struct disk *dk, struct buf *bp, int wlabel)
} }
/* calculate cylinder for disksort to order transfers with */ /* calculate cylinder for disksort to order transfers with */
bp->b_cylin = (bp->b_blkno + blockpersec(p->p_offset, lp)) / bp->b_cylinder = (bp->b_blkno + blockpersec(p->p_offset, lp)) /
lp->d_secpercyl; lp->d_secpercyl;
return (1); return (1);