diff options
| author | thorpej <thorpej@NetBSD.org> | 2000-05-19 18:54:22 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2000-05-19 18:54:22 +0000 |
| commit | 071aed40ac83ee9fb0aa80f37c3eca5337e6b660 (patch) | |
| tree | 96b6a078fac5648683f968e6800b54f9c4dcbb0d /sys/dev | |
| parent | 646555bbd5a6b8ff23460a2fd80cc62ee0669b03 (diff) | |
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.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/bi/kdb.c | 6 | ||||
| -rw-r--r-- | sys/dev/qbus/rl.c | 4 | ||||
| -rw-r--r-- | sys/dev/qbus/uda.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_netbsdkintf.c | 12 | ||||
| -rw-r--r-- | sys/dev/vme/xd.c | 4 | ||||
| -rw-r--r-- | sys/dev/vme/xy.c | 4 |
6 files changed, 18 insertions, 18 deletions
diff --git a/sys/dev/bi/kdb.c b/sys/dev/bi/kdb.c index 9f9069a7605..7b099941776 100644 --- a/sys/dev/bi/kdb.c +++ b/sys/dev/bi/kdb.c @@ -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 */ diff --git a/sys/dev/qbus/rl.c b/sys/dev/qbus/rl.c index 2e252b04701..ce4276c2a1a 100644 --- a/sys/dev/qbus/rl.c +++ b/sys/dev/qbus/rl.c @@ -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; diff --git a/sys/dev/qbus/uda.c b/sys/dev/qbus/uda.c index b7bcae136a6..0ff912bc85d 100644 --- a/sys/dev/qbus/uda.c +++ b/sys/dev/qbus/uda.c @@ -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; diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index 44cd59bbace..5b9375e372f 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -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); diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c index 99237069522..2aae23a1670 100644 --- a/sys/dev/vme/xd.c +++ b/sys/dev/vme/xd.c @@ -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; } diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c index b755856eeee..abaacc47e5c 100644 --- a/sys/dev/vme/xy.c +++ b/sys/dev/vme/xy.c @@ -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; } |
