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

A foolish consistency; most parts of the kernel use bp->b_data, so 

change these from bp->b_un.b_addr to bp->b_data, as well.  This also
allows us more flexibility to experiment with other data buffer types
hung off of struct buf.
This commit is contained in:
thorpej 2000-05-19 18:54:22 +00:00
parent 646555bbd5
commit 071aed40ac
39 changed files with 144 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/adosfs/advnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: advnops.c,v 1.52 1999/08/19 03:42:23 itohy Exp $ */
/* $NetBSD: advnops.c,v 1.53 2000/05/19 18:54:22 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -322,7 +322,7 @@ adosfs_read(v)
printf(" %d+%d-%d+%d", lbn, on, lbn, n);
#endif
n = min(n, (u_int)size - bp->b_resid);
error = uiomove(bp->b_un.b_addr + on +
error = uiomove(bp->b_data + on +
amp->bsize - amp->dbsize, (int)n, uio);
brelse(bp);
} while (error == 0 && uio->uio_resid > 0 && n != 0);

10
sys/arch/alpha/alpha/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.19 2000/05/16 05:45:44 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.20 2000/05/19 18:54:24 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.19 2000/05/16 05:45:44 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2000/05/19 18:54:24 thorpej Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@ -96,7 +96,7 @@ readdisklabel(dev, strat, lp, clp)
goto done;
}
dlp = (struct disklabel *)(bp->b_un.b_addr + LABELOFFSET);
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
if (dlp->d_magic == DISKMAGIC) {
if (dkcksum(dlp))
msg = "NetBSD disk label corrupted";
@ -230,7 +230,7 @@ writedisklabel(dev, strat, lp, clp)
if ((error = biowait(bp)) != 0)
goto done;
dlp = (struct disklabel *)(bp->b_un.b_addr + LABELOFFSET);
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
*dlp = *lp; /* struct assignment */
/*
@ -241,7 +241,7 @@ writedisklabel(dev, strat, lp, clp)
int i;
u_long *dp, sum;
dp = (u_long *)bp->b_un.b_addr;
dp = (u_long *)bp->b_data;
sum = 0;
for (i = 0; i < 63; i++)
sum += dp[i];

4
sys/arch/amiga/amiga/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.34 2000/05/16 05:45:44 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.35 2000/05/19 18:54:24 thorpej Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@ -79,7 +79,7 @@ struct rdbmap {
} tab[0];
};
#define baddr(bp) (void *)((bp)->b_un.b_addr)
#define baddr(bp) (void *)((bp)->b_data)
u_long rdbchksum __P((void *));
struct adostype getadostype __P((u_long));

4
sys/arch/hp300/dev/ac.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ac.c,v 1.11 1998/01/12 18:30:41 thorpej Exp $ */
/* $NetBSD: ac.c,v 1.12 2000/05/19 18:54:31 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -358,7 +358,7 @@ accommand(dev, command, bufp, buflen)
}
bp->b_flags = B_BUSY|B_READ;
bp->b_dev = dev;
bp->b_un.b_addr = bufp;
bp->b_data = bufp;
bp->b_bcount = buflen;
bp->b_resid = 0;
bp->b_blkno = 0;

6
sys/arch/hp300/dev/ct.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ct.c,v 1.24 2000/01/21 23:29:02 thorpej Exp $ */
/* $NetBSD: ct.c,v 1.25 2000/05/19 18:54:31 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -465,7 +465,7 @@ ctcommand(dev, cmd, cnt)
bp->b_dev = dev;
if (cmd == MTFSF) {
nbp = (struct buf *)geteblk(MAXBSIZE);
bp->b_un.b_addr = nbp->b_un.b_addr;
bp->b_data = nbp->b_data;
bp->b_bcount = MAXBSIZE;
}
@ -516,7 +516,7 @@ ctustart(sc)
struct buf *bp;
bp = BUFQ_FIRST(&sc->sc_tab);
sc->sc_addr = bp->b_un.b_addr;
sc->sc_addr = bp->b_data;
sc->sc_resid = bp->b_bcount;
if (hpibreq(sc->sc_dev.dv_parent, &sc->sc_hq))
ctstart(sc);

4
sys/arch/hp300/dev/mt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mt.c,v 1.13 2000/03/23 06:37:24 thorpej Exp $ */
/* $NetBSD: mt.c,v 1.14 2000/05/19 18:54:31 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -768,7 +768,7 @@ mtgo(arg)
bp = BUFQ_FIRST(&sc->sc_tab);
rw = bp->b_flags & B_READ;
hpibgo(sc->sc_hpibno, sc->sc_slave, rw ? MTT_READ : MTL_WRITE,
bp->b_un.b_addr, bp->b_bcount, rw, rw != 0);
bp->b_data, bp->b_bcount, rw, rw != 0);
}
void

6
sys/arch/hp300/dev/rd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rd.c,v 1.41 2000/03/23 06:37:24 thorpej Exp $ */
/* $NetBSD: rd.c,v 1.42 2000/05/19 18:54:31 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -738,7 +738,7 @@ rdustart(rs)
struct buf *bp;
bp = BUFQ_FIRST(&rs->sc_tab);
rs->sc_addr = bp->b_un.b_addr;
rs->sc_addr = bp->b_data;
rs->sc_resid = bp->b_bcount;
if (hpibreq(rs->sc_dev.dv_parent, &rs->sc_hq))
rdstart(rs);
@ -837,7 +837,7 @@ again:
bp->b_error = EIO;
bp = rdfinish(rs, bp);
if (bp) {
rs->sc_addr = bp->b_un.b_addr;
rs->sc_addr = bp->b_data;
rs->sc_resid = bp->b_bcount;
if (hpibreq(rs->sc_dev.dv_parent, &rs->sc_hq))
goto again;

6
sys/arch/hp300/dev/scsi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: scsi.c,v 1.27 2000/01/21 23:29:03 thorpej Exp $ */
/* $NetBSD: scsi.c,v 1.28 2000/05/19 18:54:31 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -1287,12 +1287,12 @@ out:
if (bp->b_flags & B_READ)
dmaflags |= DMAGO_READ;
if ((hs->sc_flags & SCSI_DMA32) &&
((int)bp->b_un.b_addr & 3) == 0 && (bp->b_bcount & 3) == 0) {
((int)bp->b_data & 3) == 0 && (bp->b_bcount & 3) == 0) {
cmd |= CSR_DMA32;
dmaflags |= DMAGO_LWORD;
} else
dmaflags |= DMAGO_WORD;
dmago(hs->sc_dq.dq_chan, bp->b_un.b_addr, bp->b_bcount, dmaflags);
dmago(hs->sc_dq.dq_chan, bp->b_data, bp->b_bcount, dmaflags);
if (bp->b_flags & B_READ) {
cmd |= CSR_DMAIN;

14
sys/arch/hp300/dev/sd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sd.c,v 1.40 2000/02/10 23:02:16 thorpej Exp $ */
/* $NetBSD: sd.c,v 1.41 2000/05/19 18:54:32 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -349,7 +349,7 @@ sdgetcapacity(sc, dev)
bcopy(&cap, &sc->sc_cmdstore, sizeof cap);
bp->b_dev = dev;
bp->b_flags = B_READ | B_BUSY;
bp->b_un.b_addr = (caddr_t)capbuf;
bp->b_data = (caddr_t)capbuf;
bp->b_bcount = capbufsize;
sdstrategy(bp);
i = biowait(bp) ? sc->sc_sensestore.status : 0;
@ -627,7 +627,7 @@ sdlblkstrat(bp, bsize)
cbp->b_dev = bp->b_dev;
bn = bp->b_blkno;
resid = bp->b_bcount;
addr = bp->b_un.b_addr;
addr = bp->b_data;
#ifdef DEBUG
if (sddebug & SDB_PARTIAL)
printf("sdlblkstrat: bp %p flags %lx bn %x resid %x addr %p\n",
@ -643,7 +643,7 @@ sdlblkstrat(bp, bsize)
count = min(resid, bsize - boff);
cbp->b_flags = B_BUSY | B_PHYS | B_READ;
cbp->b_blkno = bn - btodb(boff);
cbp->b_un.b_addr = cbuf;
cbp->b_data = cbuf;
cbp->b_bcount = bsize;
#ifdef DEBUG
if (sddebug & SDB_PARTIAL)
@ -670,7 +670,7 @@ sdlblkstrat(bp, bsize)
} else {
count = resid & ~(bsize - 1);
cbp->b_blkno = bn;
cbp->b_un.b_addr = addr;
cbp->b_data = addr;
cbp->b_bcount = count;
#ifdef DEBUG
if (sddebug & SDB_PARTIAL)
@ -894,7 +894,7 @@ sdstart(arg)
while (1) {
sts = scsi_immed_command(sc->sc_dev.dv_parent->dv_unit,
sc->sc_target, sc->sc_lun, &sc->sc_cmdstore,
bp->b_un.b_addr, bp->b_bcount,
bp->b_data, bp->b_bcount,
bp->b_flags & B_READ);
sc->sc_sensestore.status = sts;
if ((sts & 0xfe) == 0 ||
@ -961,7 +961,7 @@ sdgo(arg)
printf("%s: sdstart: %s adr %p blk %ld len %ld ecnt %d\n",
sc->sc_dev.dv_xname,
bp->b_flags & B_READ? "read" : "write",
bp->b_un.b_addr, bp->b_rawblkno, bp->b_bcount,
bp->b_data, bp->b_rawblkno, bp->b_bcount,
sc->sc_errcnt);
#endif
bp->b_flags |= B_ERROR;

6
sys/arch/hp300/dev/st.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: st.c,v 1.26 2000/01/21 23:29:04 thorpej Exp $ */
/* $NetBSD: st.c,v 1.27 2000/05/19 18:54:32 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -792,7 +792,7 @@ stgo(arg)
sc->sc_dev.dv_xname, bp->b_bcount);
#endif
stat = scsi_tt_oddio(sc->sc_dev.dv_parent->dv_unit,
sc->sc_target, sc->sc_lun, bp->b_un.b_addr, bp->b_bcount,
sc->sc_target, sc->sc_lun, bp->b_data, bp->b_bcount,
bp->b_flags, 1);
if (stat == 0) {
bp->b_resid = 0;
@ -1047,7 +1047,7 @@ stintr(arg, stat)
stat = scsi_tt_oddio(
sc->sc_dev.dv_parent->dv_unit,
sc->sc_target, sc->sc_lun,
bp->b_un.b_addr,
bp->b_data,
bp->b_bcount - bp->b_resid,
bp->b_flags, 0);
if (stat) {

6
sys/arch/luna68k/luna68k/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.8 2000/05/16 05:45:47 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.9 2000/05/19 18:54:24 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -143,7 +143,7 @@ readdisklabel(dev, strat, lp, clp)
error = biowait(bp);
if (!error) {
/* Save the whole block in case it has info we need. */
bcopy(bp->b_un.b_addr, clp->cd_block, sizeof(clp->cd_block));
bcopy(bp->b_data, clp->cd_block, sizeof(clp->cd_block));
}
bp->b_flags = B_INVAL | B_AGE | B_READ;
brelse(bp);
@ -242,7 +242,7 @@ writedisklabel(dev, strat, lp, clp)
/* Get a buffer and copy the new label into it. */
bp = geteblk((int)lp->d_secsize);
bcopy(clp->cd_block, bp->b_un.b_addr, sizeof(clp->cd_block));
bcopy(clp->cd_block, bp->b_data, sizeof(clp->cd_block));
/* Write out the updated label. */
bp->b_dev = dev;

10
sys/arch/mac68k/mac68k/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.34 2000/05/16 05:45:47 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.35 2000/05/19 18:54:25 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -447,14 +447,14 @@ readdisklabel(dev, strat, lp, osdep)
} else {
u_int16_t *sbSigp;
sbSigp = (u_int16_t *)bp->b_un.b_addr;
sbSigp = (u_int16_t *)bp->b_data;
if (*sbSigp == 0x4552) {
msg = read_mac_label(dev, strat, lp, osdep);
} else if (bswap16(*(u_int16_t *)(bp->b_data + MBR_MAGICOFF))
== MBR_MAGIC) {
msg = read_dos_label(dev, strat, lp, osdep);
} else {
dlp = (struct disklabel *)(bp->b_un.b_addr + 0);
dlp = (struct disklabel *)(bp->b_data + 0);
if (dlp->d_magic == DISKMAGIC) {
*lp = *dlp;
} else {
@ -544,9 +544,9 @@ writedisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if (error = biowait(bp))
goto done;
for (dlp = (struct disklabel *)bp->b_un.b_addr;
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)
(bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));
(bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {

10
sys/arch/mac68k/obio/iwm_fd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iwm_fd.c,v 1.9 2000/04/05 11:37:13 jdolecek Exp $ */
/* $NetBSD: iwm_fd.c,v 1.10 2000/05/19 18:54:25 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@ -1056,8 +1056,8 @@ fdstrategy(bp)
printf(" struct buf is at %p\n", bp);
printf(" Allocated buffer size (b_bufsize): 0x0%lx\n",
bp->b_bufsize);
printf(" Base address of buffer (b_un.b_addr): %p\n",
bp->b_un.b_addr);
printf(" Base address of buffer (b_data): %p\n",
bp->b_data);
printf(" Bytes to be transferred (b_bcount): 0x0%lx\n",
bp->b_bcount);
printf(" Remaining I/O (b_resid): 0x0%lx\n",
@ -1266,7 +1266,7 @@ fdstart_Init(fd)
iwmMotor(fd->unit, 1);
fd->state |= IWM_FD_MOTOR_ON;
}
fd->current_buffer = bp->b_un.b_addr;
fd->current_buffer = bp->b_data;
/* XXX - assumes blocks of 512 bytes */
fd->startBlk = bp->b_blkno;
@ -1667,7 +1667,7 @@ fdstart_Exit(fd)
printf(" fdstart() finished job; fd->iwmErr = %d, b_error = %d",
fd->iwmErr, bp->b_error);
if (DISABLED)
hexDump(bp->b_un.b_addr, bp->b_bcount);
hexDump(bp->b_data, bp->b_bcount);
}
/*
* Remove requested buf from beginning of queue

4
sys/arch/macppc/macppc/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.7 2000/02/10 12:33:45 tsubai Exp $ */
/* $NetBSD: disksubr.c,v 1.8 2000/05/19 18:54:25 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -529,7 +529,7 @@ readdisklabel(dev, strat, lp, osdep)
else {
u_int16_t *sbSigp;
sbSigp = (u_int16_t *)bp->b_un.b_addr;
sbSigp = (u_int16_t *)bp->b_data;
if (*sbSigp == 0x4552) {
msg = read_mac_label(dev, strat, lp, osdep);
} else if (bswap16(*(u_int16_t *)(bp->b_data + MBR_MAGICOFF))

10
sys/arch/news68k/news68k/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.5 2000/05/16 05:45:48 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.6 2000/05/19 18:54:26 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -77,8 +77,8 @@ readdisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if (biowait(bp)) {
msg = "I/O error";
} else for (dlp = (struct disklabel *)bp->b_un.b_addr;
dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
} else for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)(bp->b_data+DEV_BSIZE-sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
@ -168,9 +168,9 @@ writedisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if ((error = biowait(bp)) != 0)
goto done;
for (dlp = (struct disklabel *)bp->b_un.b_addr;
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)
(bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));
(bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {

10
sys/arch/newsmips/newsmips/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.6 2000/05/16 05:45:48 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.7 2000/05/19 18:54:26 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -77,8 +77,8 @@ readdisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if (biowait(bp)) {
msg = "I/O error";
} else for (dlp = (struct disklabel *)bp->b_un.b_addr;
dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
} else for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)(bp->b_data+DEV_BSIZE-sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
@ -168,9 +168,9 @@ writedisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if ((error = biowait(bp)) != 0)
goto done;
for (dlp = (struct disklabel *)bp->b_un.b_addr;
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)
(bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));
(bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {

10
sys/arch/pc532/pc532/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.16 2000/03/07 15:55:16 tsutsui Exp $ */
/* $NetBSD: disksubr.c,v 1.17 2000/05/19 18:54:26 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -85,8 +85,8 @@ readdisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if (biowait(bp)) {
msg = "I/O error";
} else for (dlp = (struct disklabel *)bp->b_un.b_addr;
dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
} else for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)(bp->b_data+DEV_BSIZE-sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
@ -178,9 +178,9 @@ writedisklabel(dev, strat, lp, osdep)
/* if successful, locate disk label within block and validate */
if ((error = biowait(bp)) != 0)
goto done;
for (dlp = (struct disklabel *)bp->b_un.b_addr;
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)
(bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));
(bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {

26
sys/arch/pmax/dev/rz.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rz.c,v 1.59 2000/03/30 14:45:05 simonb Exp $ */
/* $NetBSD: rz.c,v 1.60 2000/05/19 18:54:26 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: rz.c,v 1.59 2000/03/30 14:45:05 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: rz.c,v 1.60 2000/05/19 18:54:26 thorpej Exp $");
/*
* SCSI CCS (Command Command Set) disk driver.
@ -270,7 +270,7 @@ rzready(sc)
0, 0, (ScsiGroup0Cmd *)sc->sc_cdb.cdb);
sc->sc_buf.b_flags = B_BUSY | B_PHYS | B_READ;
sc->sc_buf.b_bcount = 0;
sc->sc_buf.b_un.b_addr = (caddr_t)0;
sc->sc_buf.b_data = (caddr_t)0;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
sc->sc_cmd.cmd = sc->sc_cdb.cdb;
@ -317,7 +317,7 @@ rzready(sc)
cp->control = 0;
sc->sc_buf.b_flags = B_BUSY | B_PHYS | B_READ;
sc->sc_buf.b_bcount = 0;
sc->sc_buf.b_un.b_addr = (caddr_t)0;
sc->sc_buf.b_data = (caddr_t)0;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
rzstart(sc->sc_cmd.unit);
if (biowait(&sc->sc_buf))
@ -373,7 +373,7 @@ rz_getsize(sc, flags)
(ScsiGroup1Cmd *)sc->sc_cdb.cdb);
sc->sc_buf.b_flags = B_BUSY | B_PHYS | B_READ;
sc->sc_buf.b_bcount = 8; /* XXX 8 was sizeof(sc->sc_capbuf). */
sc->sc_buf.b_un.b_addr = (caddr_t)sc->sc_capbuf;
sc->sc_buf.b_data = (caddr_t)sc->sc_capbuf;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
sc->sc_flags |= RZF_ALTCMD;
rzstart(sc->sc_cmd.unit);
@ -439,7 +439,7 @@ rzprobe(xxxsd)
(ScsiGroup0Cmd *)sc->sc_cdb.cdb);
sc->sc_buf.b_flags = B_BUSY | B_PHYS | B_READ;
sc->sc_buf.b_bcount = sizeof(inqbuf);
sc->sc_buf.b_un.b_addr = (caddr_t)&inqbuf;
sc->sc_buf.b_data = (caddr_t)&inqbuf;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
rzstart(sd->sd_unit);
@ -572,7 +572,7 @@ rzlblkstrat(bp, bsize)
cbp->b_dev = bp->b_dev;
bn = bp->b_blkno;
resid = bp->b_bcount;
addr = bp->b_un.b_addr;
addr = bp->b_data;
#ifdef DEBUG
if (rzdebug & RZB_PARTIAL)
printf("rzlblkstrat: bp %p flags %lx bn %x resid %x addr %p\n",
@ -588,7 +588,7 @@ rzlblkstrat(bp, bsize)
count = min(resid, bsize - boff);
cbp->b_flags = B_BUSY | B_PHYS | B_READ;
cbp->b_blkno = bn - btodb(boff);
cbp->b_un.b_addr = cbuf;
cbp->b_data = cbuf;
cbp->b_bcount = bsize;
#ifdef DEBUG
if (rzdebug & RZB_PARTIAL)
@ -615,7 +615,7 @@ rzlblkstrat(bp, bsize)
} else {
count = resid & ~(bsize - 1);
cbp->b_blkno = bn;
cbp->b_un.b_addr = addr;
cbp->b_data = addr;
cbp->b_bcount = count;
#ifdef DEBUG
if (rzdebug & RZB_PARTIAL)
@ -728,7 +728,7 @@ rzstart(unit)
struct buf *bp = BUFQ_FIRST(&sc->sc_tab);
int n;
sc->sc_cmd.buf = bp->b_un.b_addr;
sc->sc_cmd.buf = bp->b_data;
sc->sc_cmd.buflen = bp->b_bcount;
if (sc->sc_format_pid ||
@ -854,7 +854,7 @@ rzdone(unit, error, resid, status)
(ScsiGroup0Cmd *)sc->sc_cdb.cdb);
sc->sc_errbuf.b_flags = B_BUSY | B_PHYS | B_READ;
sc->sc_errbuf.b_bcount = sizeof(sc->sc_sense.sense);
sc->sc_errbuf.b_un.b_addr = (caddr_t)sc->sc_sense.sense;
sc->sc_errbuf.b_data = (caddr_t)sc->sc_sense.sense;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_errbuf);
rzstart(unit);
return;
@ -1372,7 +1372,7 @@ rz_command(sc, scsi_cmd, cmdlen, data_addr, datalen, nretries, timeout,
sc->sc_buf.b_flags = B_BUSY | B_PHYS |
(flags & SCSI_DATA_IN) ? B_READ : B_WRITE;
sc->sc_buf.b_bcount = datalen;
sc->sc_buf.b_un.b_addr = (caddr_t)data_addr;
sc->sc_buf.b_data = (caddr_t)data_addr;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
sc->sc_flags |= RZF_ALTCMD;
rzstart(sc->sc_cmd.unit);
@ -1705,7 +1705,7 @@ rzdump(dev, blkno, va, size)
*/
sc->sc_buf.b_flags = B_BUSY | B_PHYS | B_WRITE;
sc->sc_buf.b_bcount = nwrt * sectorsize;
sc->sc_buf.b_un.b_addr = va;
sc->sc_buf.b_data = va;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
sc->sc_cmd.flags = SCSICMD_DATA_TO_DEVICE;

12
sys/arch/pmax/dev/tz.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tz.c,v 1.28 2000/03/23 06:43:01 thorpej Exp $ */
/* $NetBSD: tz.c,v 1.29 2000/05/19 18:54:27 thorpej Exp $ */
/*
* Copyright (c) 1992, 1993
@ -228,7 +228,7 @@ tzprobe(xxxsd)
(ScsiGroup0Cmd *)sc->sc_cdb.cdb);
sc->sc_buf.b_flags = B_BUSY | B_READ;
sc->sc_buf.b_bcount = sizeof(inqbuf);
sc->sc_buf.b_un.b_addr = (caddr_t)&inqbuf;
sc->sc_buf.b_data = (caddr_t)&inqbuf;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
tzstart(sd->sd_unit);
if (biowait(&sc->sc_buf) ||
@ -243,7 +243,7 @@ tzprobe(xxxsd)
(ScsiGroup0Cmd *)sc->sc_cdb.cdb);
sc->sc_buf.b_flags = B_BUSY | B_READ;
sc->sc_buf.b_bcount = 0;
sc->sc_buf.b_un.b_addr = (caddr_t)0;
sc->sc_buf.b_data = (caddr_t)0;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
tzstart(sd->sd_unit);
(void) biowait(&sc->sc_buf);
@ -354,7 +354,7 @@ tzcommand(dev, command, code, count, data)
sc->sc_buf.b_flags = B_BUSY | B_READ;
}
sc->sc_buf.b_bcount = data ? count : 0;
sc->sc_buf.b_un.b_addr = data;
sc->sc_buf.b_data = data;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_buf);
tzstart(sc->sc_sd->sd_unit);
error = biowait(&sc->sc_buf);
@ -414,7 +414,7 @@ tzstart(unit)
struct buf *bp = BUFQ_FIRST(&sc->sc_tab);
int n;
sc->sc_cmd.buf = bp->b_un.b_addr;
sc->sc_cmd.buf = bp->b_data;
sc->sc_cmd.buflen = bp->b_bcount;
if (sc->sc_flags & (TZF_SENSEINPROGRESS | TZF_ALTCMD)) {
@ -595,7 +595,7 @@ tzdone(unit, error, resid, status)
(ScsiGroup0Cmd *)sc->sc_cdb.cdb);
sc->sc_errbuf.b_flags = B_BUSY | B_PHYS | B_READ;
sc->sc_errbuf.b_bcount = sizeof(sc->sc_sense.sense);
sc->sc_errbuf.b_un.b_addr = (caddr_t)sc->sc_sense.sense;
sc->sc_errbuf.b_data = (caddr_t)sc->sc_sense.sense;
BUFQ_INSERT_HEAD(&sc->sc_tab, &sc->sc_errbuf);
tzstart(unit);
return;

14
sys/arch/pmax/pmax/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.31 2000/05/16 05:45:49 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.32 2000/05/19 18:54:27 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -88,8 +88,8 @@ readdisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if (biowait(bp)) {
msg = "I/O error";
} else for (dlp = (struct disklabel *)bp->b_un.b_addr;
dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
} else for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)(bp->b_data+DEV_BSIZE-sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)
@ -151,8 +151,8 @@ compat_label(dev, strat, lp, osdep)
goto done;
}
for (dlp = (dec_disklabel *)bp->b_un.b_addr;
dlp <= (dec_disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
for (dlp = (dec_disklabel *)bp->b_data;
dlp <= (dec_disklabel *)(bp->b_data+DEV_BSIZE-sizeof(*dlp));
dlp = (dec_disklabel *)((char *)dlp + sizeof(long))) {
int part;
@ -275,9 +275,9 @@ writedisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if ((error = biowait(bp)) != 0)
goto done;
for (dlp = (struct disklabel *)bp->b_un.b_addr;
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)
(bp->b_un.b_addr + lp->d_secsize - sizeof(*dlp));
(bp->b_data + lp->d_secsize - sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic == DISKMAGIC && dlp->d_magic2 == DISKMAGIC &&
dkcksum(dlp) == 0) {

6
sys/arch/sparc/sparc/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.28 2000/05/16 05:45:50 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.29 2000/05/19 18:54:27 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -108,7 +108,7 @@ readdisklabel(dev, strat, lp, clp)
error = biowait(bp);
if (error == 0) {
/* Save the whole block in case it has info we need. */
bcopy(bp->b_un.b_addr, clp->cd_block, sizeof(clp->cd_block));
bcopy(bp->b_data, clp->cd_block, sizeof(clp->cd_block));
}
bp->b_flags = B_INVAL | B_AGE | B_READ;
brelse(bp);
@ -211,7 +211,7 @@ writedisklabel(dev, strat, lp, clp)
/* Get a buffer and copy the new label into it. */
bp = geteblk((int)lp->d_secsize);
bcopy(clp->cd_block, bp->b_un.b_addr, sizeof(clp->cd_block));
bcopy(clp->cd_block, bp->b_data, sizeof(clp->cd_block));
/* Write out the updated label. */
bp->b_dev = dev;

4
sys/arch/sparc64/sparc64/db_interface.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.30 2000/04/14 08:29:03 mrg Exp $ */
/* $NetBSD: db_interface.c,v 1.31 2000/05/19 18:54:27 thorpej Exp $ */
/*
* Mach Operating System
@ -829,7 +829,7 @@ db_dump_buf(addr, have_addr, count, modif)
db_printf("flags:%x => %b\n", buf->b_flags, buf->b_flags, flagnames);
db_printf("error:%x bufsiz:%x bcount:%x resid:%x dev:%x un.addr:%x\n",
buf->b_error, buf->b_bufsize, buf->b_bcount, buf->b_resid,
buf->b_dev, buf->b_un.b_addr);
buf->b_dev, buf->b_data);
db_printf("saveaddr:%p lblkno:%x blkno:%x iodone:%x",
buf->b_saveaddr, buf->b_lblkno, buf->b_blkno, buf->b_iodone);
db_printsym((long)buf->b_iodone, DB_STGY_PROC);

6
sys/arch/sparc64/sparc64/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.10 2000/05/16 05:45:50 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.11 2000/05/19 18:54:28 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -106,7 +106,7 @@ readdisklabel(dev, strat, lp, clp)
error = biowait(bp);
if (error == 0) {
/* Save the whole block in case it has info we need. */
bcopy(bp->b_un.b_addr, clp->cd_block, sizeof(clp->cd_block));
bcopy(bp->b_data, clp->cd_block, sizeof(clp->cd_block));
}
bp->b_flags = B_INVAL | B_AGE | B_READ;
brelse(bp);
@ -209,7 +209,7 @@ writedisklabel(dev, strat, lp, clp)
/* Get a buffer and copy the new label into it. */
bp = geteblk((int)lp->d_secsize);
bcopy(clp->cd_block, bp->b_un.b_addr, sizeof(clp->cd_block));
bcopy(clp->cd_block, bp->b_data, sizeof(clp->cd_block));
/* Write out the updated label. */
bp->b_dev = dev;

4
sys/arch/sun3/dev/xd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xd.c,v 1.27 2000/05/16 05:45:51 thorpej Exp $ */
/* $NetBSD: xd.c,v 1.28 2000/05/19 18:54:28 thorpej Exp $ */
/*
*
@ -294,7 +294,7 @@ xddummystrat(bp)
{
if (bp->b_bcount != XDFM_BPS)
panic("xddummystrat");
bcopy(xd_labeldata, bp->b_un.b_addr, XDFM_BPS);
bcopy(xd_labeldata, bp->b_data, XDFM_BPS);
bp->b_flags |= B_DONE;
bp->b_flags &= ~B_BUSY;
}

4
sys/arch/sun3/dev/xy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xy.c,v 1.28 2000/05/16 05:45:51 thorpej Exp $ */
/* $NetBSD: xy.c,v 1.29 2000/05/19 18:54:28 thorpej Exp $ */
/*
*
@ -233,7 +233,7 @@ xydummystrat(bp)
{
if (bp->b_bcount != XYFM_BPS)
panic("xydummystrat");
bcopy(xy_labeldata, bp->b_un.b_addr, XYFM_BPS);
bcopy(xy_labeldata, bp->b_data, XYFM_BPS);
bp->b_flags |= B_DONE;
bp->b_flags &= ~B_BUSY;
}

6
sys/arch/sun3/sun3/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.23 2000/05/16 05:45:51 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.24 2000/05/19 18:54:28 thorpej Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -107,7 +107,7 @@ readdisklabel(dev, strat, lp, clp)
error = biowait(bp);
if (!error) {
/* Save the whole block in case it has info we need. */
bcopy(bp->b_un.b_addr, clp->cd_block, sizeof(clp->cd_block));
bcopy(bp->b_data, clp->cd_block, sizeof(clp->cd_block));
}
bp->b_flags = B_INVAL | B_AGE | B_READ;
brelse(bp);
@ -208,7 +208,7 @@ writedisklabel(dev, strat, lp, clp)
/* Get a buffer and copy the new label into it. */
bp = geteblk((int)lp->d_secsize);
bcopy(clp->cd_block, bp->b_un.b_addr, sizeof(clp->cd_block));
bcopy(clp->cd_block, bp->b_data, sizeof(clp->cd_block));
/* Write out the updated label. */
bp->b_dev = dev;

4
sys/arch/vax/mba/mba.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mba.c,v 1.18 2000/01/24 02:40:36 matt Exp $ */
/* $NetBSD: mba.c,v 1.19 2000/05/19 18:54:29 thorpej Exp $ */
/*
* Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -292,7 +292,7 @@ mbastart(sc)
0, PG_V);
sc->sc_state = SC_ACTIVE;
mr->mba_var = ((u_int)bp->b_un.b_addr & VAX_PGOFSET);
mr->mba_var = ((u_int)bp->b_data & VAX_PGOFSET);
mr->mba_bc = (~bp->b_bcount) + 1;
(*md->md_start)(md); /* machine-dependent start */
}

6
sys/arch/vax/uba/uba.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $ */
/* $NetBSD: uba.c,v 1.44 2000/05/19 18:54:29 thorpej Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
* Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@ -582,7 +582,7 @@ ubasetup(uh, bp, flags)
if (uh->uh_nbdp == 0)
flags &= ~UBA_NEEDBDP;
o = (int)bp->b_un.b_addr & VAX_PGOFSET;
o = (int)bp->b_data & VAX_PGOFSET;
npf = vax_btoc(bp->b_bcount + o) + 1;
if (npf > UBA_MAXNMR)
panic("uba xfer too big");
@ -641,7 +641,7 @@ uballoc(uh, addr, bcnt, flags)
{
struct buf ubabuf;
ubabuf.b_un.b_addr = addr;
ubabuf.b_data = addr;
ubabuf.b_flags = B_BUSY;
ubabuf.b_bcount = bcnt;
/* that's all the fields ubasetup() needs */

8
sys/arch/vax/vax/cfl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cfl.c,v 1.2 1998/04/13 12:10:26 ragge Exp $ */
/* $NetBSD: cfl.c,v 1.3 2000/05/19 18:54:32 thorpej Exp $ */
/*-
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1982, 1986 The Regents of the University of California.
@ -151,7 +151,7 @@ cflrw(dev, uio, flag)
break;
}
if (uio->uio_rw == UIO_WRITE) {
error = uiomove(bp->b_un.b_addr, i, uio);
error = uiomove(bp->b_data, i, uio);
if (error)
break;
}
@ -166,7 +166,7 @@ cflrw(dev, uio, flag)
break;
}
if (uio->uio_rw == UIO_READ) {
error = uiomove(bp->b_un.b_addr, i, uio);
error = uiomove(bp->b_data, i, uio);
if (error)
break;
}
@ -183,7 +183,7 @@ cflstart()
bp = cfltab.cfl_buf;
cfltab.cfl_errcnt = 0;
cfltab.cfl_xaddr = (unsigned char *) bp->b_un.b_addr;
cfltab.cfl_xaddr = (unsigned char *) bp->b_data;
cfltab.cfl_active = CFL_START;
bp->b_resid = 0;

8
sys/arch/vax/vax/crl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: crl.c,v 1.6 2000/01/24 02:40:33 matt Exp $ */
/* $NetBSD: crl.c,v 1.7 2000/05/19 18:54:32 thorpej Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
* All rights reserved.
@ -143,7 +143,7 @@ crlrw(dev, uio, flag)
break;
}
if (uio->uio_rw == UIO_WRITE) {
error = uiomove(bp->b_un.b_addr, i, uio);
error = uiomove(bp->b_data, i, uio);
if (error)
break;
}
@ -158,7 +158,7 @@ crlrw(dev, uio, flag)
break;
}
if (uio->uio_rw == UIO_READ) {
error = uiomove(bp->b_un.b_addr, i, uio);
error = uiomove(bp->b_data, i, uio);
if (error)
break;
}
@ -175,7 +175,7 @@ crlstart()
bp = crltab.crl_buf;
crltab.crl_errcnt = 0;
crltab.crl_xaddr = (ushort *) bp->b_un.b_addr;
crltab.crl_xaddr = (ushort *) bp->b_data;
bp->b_resid = 0;
if ((mfpr(PR_STXCS) & STXCS_RDY) == 0)

6
sys/arch/vax/vax/ctu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ctu.c,v 1.10 2000/03/23 06:46:44 thorpej Exp $ */
/* $NetBSD: ctu.c,v 1.11 2000/05/19 18:54:32 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -175,7 +175,7 @@ ctustrategy(bp)
#ifdef TUDEBUG
printf("addr %x, block %x, nblock %x, read %x\n",
bp->b_un.b_addr, bp->b_blkno, bp->b_bcount,
bp->b_data, bp->b_blkno, bp->b_bcount,
bp->b_flags & B_READ);
#endif
@ -198,7 +198,7 @@ ctustart(bp)
struct rsp *rsp = (struct rsp *)tu_sc.sc_rsp;
tu_sc.sc_xfptr = tu_sc.sc_blk = bp->b_un.b_addr;
tu_sc.sc_xfptr = tu_sc.sc_blk = bp->b_data;
tu_sc.sc_tpblk = bp->b_blkno;
tu_sc.sc_nbytes = bp->b_bcount;
tu_sc.sc_xbytes = tu_sc.sc_bbytes = 0;

10
sys/arch/vax/vax/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.23 2000/03/30 11:37:24 tsutsui Exp $ */
/* $NetBSD: disksubr.c,v 1.24 2000/05/19 18:54:32 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -137,7 +137,7 @@ readdisklabel(dev, strat, lp, osdep)
if (biowait(bp)) {
msg = "I/O error";
} else {
dlp = (struct disklabel *)(bp->b_un.b_addr + LABELOFFSET);
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
msg = "no disk label";
} else if (dlp->d_npartitions > MAXPARTITIONS ||
@ -217,7 +217,7 @@ writedisklabel(dev, strat, lp, osdep)
(*strat)(bp);
if ((error = biowait(bp)))
goto done;
dlp = (struct disklabel *)(bp->b_un.b_addr + LABELOFFSET);
dlp = (struct disklabel *)(bp->b_data + LABELOFFSET);
bcopy(lp, dlp, sizeof(struct disklabel));
bp->b_flags = B_WRITE;
(*strat)(bp);
@ -261,9 +261,9 @@ disk_reallymapin(bp, map, reg, flag)
int pfnum, npf, o, i;
caddr_t addr;
o = (int)bp->b_un.b_addr & VAX_PGOFSET;
o = (int)bp->b_data & VAX_PGOFSET;
npf = vax_btoc(bp->b_bcount + o) + 1;
addr = bp->b_un.b_addr;
addr = bp->b_data;
p = bp->b_proc;
/*

4
sys/arch/x68k/x68k/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.12 2000/05/16 05:45:51 thorpej Exp $ */
/* $NetBSD: disksubr.c,v 1.13 2000/05/19 18:54:29 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -183,7 +183,7 @@ readdisklabel(dev, strat, lp, osdep)
goto done;
}
for (dlp = (struct disklabel *)bp->b_data;
dlp <= (struct disklabel *)(bp->b_un.b_addr+DEV_BSIZE-sizeof(*dlp));
dlp <= (struct disklabel *)(bp->b_data+DEV_BSIZE-sizeof(*dlp));
dlp = (struct disklabel *)((char *)dlp + sizeof(long))) {
if (dlp->d_magic != DISKMAGIC || dlp->d_magic2 != DISKMAGIC) {
if (msg == NULL)

6
sys/dev/bi/kdb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kdb.c,v 1.17 2000/03/26 11:45:04 ragge Exp $ */
/* $NetBSD: kdb.c,v 1.18 2000/05/19 18:54:30 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -220,7 +220,7 @@ kdbgo(usc, mxi)
struct kdb_softc *sc = (void *)usc;
struct buf *bp = mxi->mxi_bp;
struct mscp *mp = mxi->mxi_mp;
u_int32_t addr = (u_int32_t)bp->b_un.b_addr;
u_int32_t addr = (u_int32_t)bp->b_data;
u_int32_t mapaddr;
int err;
@ -232,7 +232,7 @@ kdbgo(usc, mxi)
* On VAX, point to the corresponding page tables. (user/sys)
* On other systems, do something else...
*/
err = bus_dmamap_load(sc->sc_dmat, mxi->mxi_dmam, bp->b_un.b_addr,
err = bus_dmamap_load(sc->sc_dmat, mxi->mxi_dmam, bp->b_data,
bp->b_bcount, bp->b_proc, BUS_DMA_NOWAIT);
if (err) /* Shouldn't happen */

4
sys/dev/qbus/rl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rl.c,v 1.2 2000/04/30 11:46:49 ragge Exp $ */
/* $NetBSD: rl.c,v 1.3 2000/05/19 18:54:30 thorpej Exp $ */
/*
* Copyright (c) 2000 Ludd, University of Lule}, Sweden. All rights reserved.
@ -511,7 +511,7 @@ rlcstart(struct rlc_softc *sc, struct buf *ob)
if (bp == NULL)
return; /* Nothing to do */
BUFQ_REMOVE(&sc->sc_q, bp);
sc->sc_bufaddr = bp->b_un.b_addr;
sc->sc_bufaddr = bp->b_data;
sc->sc_diskblk = bp->b_rawblkno;
sc->sc_bytecnt = bp->b_bcount;
bp->b_resid = 0;

6
sys/dev/qbus/uda.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uda.c,v 1.34 2000/04/30 11:46:49 ragge Exp $ */
/* $NetBSD: uda.c,v 1.35 2000/05/19 18:54:30 thorpej Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@ -288,7 +288,7 @@ udago(usc, mxi)
*/
if (sc->sc_inq == 0) {
err = bus_dmamap_load(sc->sc_dmat, mxi->mxi_dmam,
bp->b_un.b_addr,
bp->b_data,
bp->b_bcount, bp->b_proc, BUS_DMA_NOWAIT);
if (err == 0) {
mscp_dgo(sc->sc_softc, mxi);
@ -320,7 +320,7 @@ udaready(uu)
struct buf *bp = mxi->mxi_bp;
int err;
err = bus_dmamap_load(sc->sc_dmat, mxi->mxi_dmam, bp->b_un.b_addr,
err = bus_dmamap_load(sc->sc_dmat, mxi->mxi_dmam, bp->b_data,
bp->b_bcount, bp->b_proc, BUS_DMA_NOWAIT);
if (err)
return 0;

12
sys/dev/raidframe/rf_netbsdkintf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_netbsdkintf.c,v 1.78 2000/05/19 04:53:25 minoura Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.79 2000/05/19 18:54:30 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@ -1614,7 +1614,7 @@ raidstart(raidPtr)
retcode = rf_DoAccess(raidPtr, (bp->b_flags & B_READ) ?
RF_IO_TYPE_READ : RF_IO_TYPE_WRITE,
do_async, raid_addr, num_blocks,
bp->b_un.b_addr, bp, NULL, NULL,
bp->b_data, bp, NULL, NULL,
RF_DAG_NONBLOCKING_IO, NULL, NULL, NULL);
@ -1853,7 +1853,7 @@ InitBP(bp, b_vp, rw_flag, dev, startSect, numSect, buf, cbFunc, cbArg,
bp->b_bufsize = bp->b_bcount;
bp->b_error = 0;
bp->b_dev = dev;
bp->b_un.b_addr = buf;
bp->b_data = buf;
bp->b_blkno = startSect;
bp->b_resid = bp->b_bcount; /* XXX is this right!??!?!! */
if (bp->b_bcount == 0) {
@ -2116,7 +2116,7 @@ raidread_component_label(dev, b_vp, clabel)
error = biowait(bp);
if (!error) {
memcpy(clabel, bp->b_un.b_addr,
memcpy(clabel, bp->b_data,
sizeof(RF_ComponentLabel_t));
#if 0
rf_print_component_label( clabel );
@ -2151,9 +2151,9 @@ raidwrite_component_label(dev, b_vp, clabel)
bp->b_flags = B_BUSY | B_WRITE;
bp->b_resid = RF_COMPONENT_INFO_SIZE / DEV_BSIZE;
memset( bp->b_un.b_addr, 0, RF_COMPONENT_INFO_SIZE );
memset(bp->b_data, 0, RF_COMPONENT_INFO_SIZE );
memcpy( bp->b_un.b_addr, clabel, sizeof(RF_ComponentLabel_t));
memcpy(bp->b_data, clabel, sizeof(RF_ComponentLabel_t));
(*bdevsw[major(bp->b_dev)].d_strategy)(bp);
error = biowait(bp);

4
sys/dev/vme/xd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xd.c,v 1.23 2000/05/16 05:45:53 thorpej Exp $ */
/* $NetBSD: xd.c,v 1.24 2000/05/19 18:54:31 thorpej Exp $ */
/*
*
@ -315,7 +315,7 @@ xddummystrat(bp)
{
if (bp->b_bcount != XDFM_BPS)
panic("xddummystrat");
bcopy(xd_labeldata, bp->b_un.b_addr, XDFM_BPS);
bcopy(xd_labeldata, bp->b_data, XDFM_BPS);
bp->b_flags |= B_DONE;
bp->b_flags &= ~B_BUSY;
}

4
sys/dev/vme/xy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xy.c,v 1.21 2000/05/16 05:45:53 thorpej Exp $ */
/* $NetBSD: xy.c,v 1.22 2000/05/19 18:54:31 thorpej Exp $ */
/*
*
@ -229,7 +229,7 @@ xydummystrat(bp)
{
if (bp->b_bcount != XYFM_BPS)
panic("xydummystrat");
bcopy(xy_labeldata, bp->b_un.b_addr, XYFM_BPS);
bcopy(xy_labeldata, bp->b_data, XYFM_BPS);
bp->b_flags |= B_DONE;
bp->b_flags &= ~B_BUSY;
}