From b24a0490358935cd71e101bee2ac6c31b0da59b6 Mon Sep 17 00:00:00 2001 From: Miod Vallat Date: Fri, 20 Jan 2006 23:27:27 +0000 Subject: b_un.b_addr -> b_data; no functional change. --- sys/arch/hp300/dev/ct.c | 6 +++--- sys/arch/hp300/dev/hd.c | 6 +++--- sys/arch/hp300/dev/mt.c | 4 ++-- sys/arch/sparc/dev/xd.c | 8 ++++---- sys/arch/sparc/dev/xy.c | 8 ++++---- sys/arch/sparc/sparc/disksubr.c | 6 +++--- sys/arch/sparc/sparc/vm_machdep.c | 4 ++-- sys/arch/vax/mba/mba.c | 4 ++-- sys/arch/vax/uba/uba.c | 6 +++--- sys/arch/vax/vax/cfl.c | 8 ++++---- sys/arch/vax/vax/crl.c | 8 ++++---- sys/arch/vax/vax/ctu.c | 6 +++--- sys/arch/vax/vax/disksubr.c | 10 +++++----- 13 files changed, 42 insertions(+), 42 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/hp300/dev/ct.c b/sys/arch/hp300/dev/ct.c index d7cef2e372e..f8b42774ea3 100644 --- a/sys/arch/hp300/dev/ct.c +++ b/sys/arch/hp300/dev/ct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct.c,v 1.15 2005/12/27 18:34:58 miod Exp $ */ +/* $OpenBSD: ct.c,v 1.16 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */ /* @@ -422,7 +422,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; } @@ -478,7 +478,7 @@ ctustart(sc) struct buf *bp; bp = sc->sc_tab.b_actf; - 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); diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 74ca2a1e0af..24a13b51616 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.37 2005/11/18 00:16:48 miod Exp $ */ +/* $OpenBSD: hd.c,v 1.38 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -726,7 +726,7 @@ hdustart(rs) struct buf *bp; bp = rs->sc_tab.b_actf; - 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)) hdstart(rs); @@ -829,7 +829,7 @@ again: bp->b_error = EIO; bp = hdfinish(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; diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c index de75b87a6bb..1d2d00bffd1 100644 --- a/sys/arch/hp300/dev/mt.c +++ b/sys/arch/hp300/dev/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.16 2005/12/27 18:34:58 miod Exp $ */ +/* $OpenBSD: mt.c,v 1.17 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $ */ /* @@ -742,7 +742,7 @@ mtgo(arg) bp = sc->sc_tab.b_actf; 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 diff --git a/sys/arch/sparc/dev/xd.c b/sys/arch/sparc/dev/xd.c index 550e3877ebb..4b0bc5c8cab 100644 --- a/sys/arch/sparc/dev/xd.c +++ b/sys/arch/sparc/dev/xd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xd.c,v 1.30 2006/01/20 00:20:38 miod Exp $ */ +/* $OpenBSD: xd.c,v 1.31 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: xd.c,v 1.37 1997/07/29 09:58:16 fair Exp $ */ /* @@ -285,7 +285,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; } @@ -1729,7 +1729,7 @@ xdc_reset(xdcsc, quiet, blastmode, error, xdsc) iorq->buf->b_resid = iorq->sectcnt * XDFM_BPS; dvma_mapout((vaddr_t)iorq->dbufbase, - (vaddr_t)iorq->buf->b_un.b_addr, + (vaddr_t)iorq->buf->b_data, iorq->buf->b_bcount); disk_unbusy(&xdcsc->reqs[lcv].xd->sc_dk, (xdcsc->reqs[lcv].buf->b_bcount - @@ -1936,7 +1936,7 @@ xdc_remove_iorq(xdcsc) bp->b_resid = 0; /* done */ } dvma_mapout((vaddr_t) iorq->dbufbase, - (vaddr_t) bp->b_un.b_addr, + (vaddr_t) bp->b_data, bp->b_bcount); disk_unbusy(&iorq->xd->sc_dk, (bp->b_bcount - bp->b_resid), diff --git a/sys/arch/sparc/dev/xy.c b/sys/arch/sparc/dev/xy.c index 824998a4132..7731dd7644b 100644 --- a/sys/arch/sparc/dev/xy.c +++ b/sys/arch/sparc/dev/xy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xy.c,v 1.26 2006/01/20 00:20:38 miod Exp $ */ +/* $OpenBSD: xy.c,v 1.27 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: xy.c,v 1.26 1997/07/19 21:43:56 pk Exp $ */ /* @@ -225,7 +225,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; } @@ -1634,7 +1634,7 @@ xyc_reset(xycsc, quiet, blastmode, error, xysc) iorq->buf->b_flags |= B_ERROR; iorq->buf->b_resid = iorq->sectcnt * XYFM_BPS; dvma_mapout((vaddr_t)iorq->dbufbase, - (vaddr_t)iorq->buf->b_un.b_addr, + (vaddr_t)iorq->buf->b_data, iorq->buf->b_bcount); iorq->xy->xyq.b_actf = iorq->buf->b_actf; disk_unbusy(&xycsc->reqs[lcv].xy->sc_dk, @@ -1813,7 +1813,7 @@ xyc_remove_iorq(xycsc) bp->b_resid = 0; /* done */ } dvma_mapout((vaddr_t) iorq->dbufbase, - (vaddr_t) bp->b_un.b_addr, + (vaddr_t) bp->b_data, bp->b_bcount); iorq->xy->xyq.b_actf = bp->b_actf; disk_unbusy(&iorq->xy->sc_dk, diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c index b46931f57d2..11ea0a143b4 100644 --- a/sys/arch/sparc/sparc/disksubr.c +++ b/sys/arch/sparc/sparc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.34 2006/01/20 00:20:38 miod Exp $ */ +/* $OpenBSD: disksubr.c,v 1.35 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */ /* @@ -180,7 +180,7 @@ readdisklabel(dev, strat, lp, clp, spoofonly) 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); @@ -297,7 +297,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; diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c index 5d8a9bf6553..2679fd1367b 100644 --- a/sys/arch/sparc/sparc/vm_machdep.c +++ b/sys/arch/sparc/sparc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_machdep.c,v 1.46 2005/08/18 18:40:51 kettenis Exp $ */ +/* $OpenBSD: vm_machdep.c,v 1.47 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: vm_machdep.c,v 1.30 1997/03/10 23:55:40 pk Exp $ */ /* @@ -361,7 +361,7 @@ vunmapbuf(bp, sz) bp->b_data = bp->b_saveaddr; bp->b_saveaddr = NULL; if (CACHEINFO.c_vactype != VAC_NONE) - cpuinfo.cache_flush(bp->b_un.b_addr, bp->b_bcount - bp->b_resid); + cpuinfo.cache_flush(bp->b_data, bp->b_bcount - bp->b_resid); } diff --git a/sys/arch/vax/mba/mba.c b/sys/arch/vax/mba/mba.c index fa1a9f5a379..1a89f6ad2d1 100644 --- a/sys/arch/vax/mba/mba.c +++ b/sys/arch/vax/mba/mba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mba.c,v 1.9 2002/03/14 01:26:48 millert Exp $ */ +/* $OpenBSD: mba.c,v 1.10 2006/01/20 23:27:25 miod Exp $ */ /* $NetBSD: mba.c,v 1.18 2000/01/24 02:40:36 matt Exp $ */ /* * Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden. @@ -290,7 +290,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 */ } diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c index 4ce9b98cc04..74f369a6ab2 100644 --- a/sys/arch/vax/uba/uba.c +++ b/sys/arch/vax/uba/uba.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uba.c,v 1.21 2004/12/25 23:02:25 miod Exp $ */ +/* $OpenBSD: uba.c,v 1.22 2006/01/20 23:27:26 miod Exp $ */ /* $NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $ */ /* * Copyright (c) 1996 Jonathan Stone. @@ -580,7 +580,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"); @@ -644,7 +644,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 */ diff --git a/sys/arch/vax/vax/cfl.c b/sys/arch/vax/vax/cfl.c index ed3128bf91e..755dc404b60 100644 --- a/sys/arch/vax/vax/cfl.c +++ b/sys/arch/vax/vax/cfl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cfl.c,v 1.5 2003/06/02 23:27:58 millert Exp $ */ +/* $OpenBSD: cfl.c,v 1.6 2006/01/20 23:27:26 miod Exp $ */ /* $NetBSD: cfl.c,v 1.2 1998/04/13 12:10:26 ragge Exp $ */ /*- * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -148,7 +148,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; } @@ -163,7 +163,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; } @@ -180,7 +180,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; diff --git a/sys/arch/vax/vax/crl.c b/sys/arch/vax/vax/crl.c index 0e703e183b8..d940f7fca65 100644 --- a/sys/arch/vax/vax/crl.c +++ b/sys/arch/vax/vax/crl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crl.c,v 1.7 2003/06/02 23:27:58 millert Exp $ */ +/* $OpenBSD: crl.c,v 1.8 2006/01/20 23:27:26 miod Exp $ */ /* $NetBSD: crl.c,v 1.6 2000/01/24 02:40:33 matt Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -140,7 +140,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; } @@ -155,7 +155,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; } @@ -172,7 +172,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) diff --git a/sys/arch/vax/vax/ctu.c b/sys/arch/vax/vax/ctu.c index f6c5868402a..0e1cd8ee015 100644 --- a/sys/arch/vax/vax/ctu.c +++ b/sys/arch/vax/vax/ctu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ctu.c,v 1.8 2005/11/24 04:53:59 brad Exp $ */ +/* $OpenBSD: ctu.c,v 1.9 2006/01/20 23:27:26 miod Exp $ */ /* $NetBSD: ctu.c,v 1.10 2000/03/23 06:46:44 thorpej Exp $ */ /* * Copyright (c) 1996 Ludd, University of Lule}, Sweden. @@ -176,7 +176,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 @@ -201,7 +201,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; diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c index 6edaba6eb2c..4409b04072c 100644 --- a/sys/arch/vax/vax/disksubr.c +++ b/sys/arch/vax/vax/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.25 2005/12/22 02:51:25 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.26 2006/01/20 23:27:26 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.21 1999/06/30 18:48:06 ragge Exp $ */ /* @@ -157,7 +157,7 @@ readdisklabel(dev, strat, lp, osdep, spoofonly) 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 || @@ -260,7 +260,7 @@ writedisklabel(dev, strat, lp, osdep) bp = geteblk((int)lp->d_secsize); - dlp = (struct disklabel *)(bp->b_un.b_addr + LABELOFFSET); + dlp = (struct disklabel *)(bp->b_data + LABELOFFSET); bcopy(lp, dlp, sizeof(struct disklabel)); bp->b_dev = MAKEDISKDEV(major(dev), DISKUNIT(dev), RAW_PART); @@ -308,9 +308,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; /* -- cgit v1.2.3