diff options
author | phk <phk@FreeBSD.org> | 1997-12-02 21:07:20 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1997-12-02 21:07:20 +0000 |
commit | a1bfb618d996ea613b9d640d00950f5ffef739db (patch) | |
tree | d373e61301d1dc027cf0572e25d38f7a9f63450d /sys | |
parent | bf21e6b4e0e85ae08cb5d1f2335da248f52e2d26 (diff) | |
download | FreeBSD-src-a1bfb618d996ea613b9d640d00950f5ffef739db.zip FreeBSD-src-a1bfb618d996ea613b9d640d00950f5ffef739db.tar.gz |
In all such uses of struct buf: 's/b_un.b_addr/b_data/g'
Diffstat (limited to 'sys')
40 files changed, 125 insertions, 135 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 2d3081f..d31c643 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.104 1997/09/23 22:14:43 gibbs Exp $ + * $Id: fd.c,v 1.105 1997/10/19 13:12:02 joerg Exp $ * */ @@ -1326,7 +1326,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) read = bp->b_flags & B_READ; format = bp->b_flags & B_FORMAT; if(format) { - finfo = (struct fd_formb *)bp->b_un.b_addr; + finfo = (struct fd_formb *)bp->b_data; fd->skip = (char *)&(finfo->fd_formb_cylno(0)) - (char *)finfo; } @@ -1468,7 +1468,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) } fd->track = b_cylinder; - isa_dmastart(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmastart(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); sectrac = fd->ft->sectrac; sec = blknum % (sectrac * fd->ft->heads); @@ -1560,7 +1560,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) /* FALLTHROUGH */ case IOTIMEDOUT: - isa_dmadone(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmadone(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); if (fdc->status[0] & NE7_ST0_IC) { @@ -1801,7 +1801,7 @@ fdformat(dev, finfo, p) + finfo->head * fd->ft->sectrac) * fdblk / DEV_BSIZE; bp->b_bcount = sizeof(struct fd_idfield_data) * finfo->fd_formb_nsecs; - bp->b_un.b_addr = (caddr_t)finfo; + bp->b_data = (caddr_t)finfo; /* now do the format */ fdstrategy(bp); diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index 377f589..35439a5 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.94 1997/09/21 21:41:26 gibbs Exp $ + * $Id: mcd.c,v 1.95 1997/11/07 08:52:40 phk Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -1131,7 +1131,7 @@ retry_read: RDELAY_WAITREAD-mbx->count); got_it: /* data is ready */ - addr = bp->b_un.b_addr + mbx->skip; + addr = bp->b_data + mbx->skip; outb(port+mcd_ctl2,0x04); /* XXX */ for (i=0; i<mbx->sz; i++) diff --git a/sys/dev/ppbus/nlpt.c b/sys/dev/ppbus/nlpt.c index 6f04c09..e82b4f4 100644 --- a/sys/dev/ppbus/nlpt.c +++ b/sys/dev/ppbus/nlpt.c @@ -47,7 +47,7 @@ * * from: unknown origin, 386BSD 0.1 * From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp - * $Id: nlpt.c,v 1.4 1997/08/28 11:12:08 msmith Exp $ + * $Id: nlpt.c,v 1.5 1997/08/29 00:30:11 msmith Exp $ */ /* @@ -663,7 +663,7 @@ nlptwrite(dev_t dev, struct uio *uio, int ioflag) sc->sc_state &= ~INTERRUPTED; while ((n = min(BUFSIZE, uio->uio_resid)) != 0) { - sc->sc_cp = sc->sc_inbuf->b_un.b_addr ; + sc->sc_cp = sc->sc_inbuf->b_data ; uiomove(sc->sc_cp, n, uio); sc->sc_xfercnt = n ; while ((sc->sc_xfercnt > 0)&&(sc->sc_irq & LP_USE_IRQ)) { diff --git a/sys/dev/scd/scd.c b/sys/dev/scd/scd.c index 72fd0ca..1d97b12 100644 --- a/sys/dev/scd/scd.c +++ b/sys/dev/scd/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.32 1997/07/20 14:10:10 bde Exp $ */ +/* $Id: scd.c,v 1.33 1997/09/21 21:41:32 gibbs Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -955,7 +955,7 @@ writeparam: got_data: /* data is ready */ - addr = bp->b_un.b_addr + mbx->skip; + addr = bp->b_data + mbx->skip; write_control(port, CBIT_DATA_READY_CLEAR); insb(port+IREG_DATA, addr, mbx->sz); diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 6ea7032..780b440 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id$ + * $Id: spkr.c,v 1.29 1997/02/22 09:37:11 peter Exp $ */ #include "speaker.h" @@ -502,7 +502,7 @@ spkrwrite(dev, uio, ioflag) int error; n = uio->uio_resid; - cp = spkr_inbuf->b_un.b_addr; + cp = spkr_inbuf->b_data; error = uiomove(cp, n, uio); if (!error) { cp[n] = '\0'; diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c index df94edf..95e89d0 100644 --- a/sys/i386/isa/diskslice_machdep.c +++ b/sys/i386/isa/diskslice_machdep.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.25 1997/04/19 14:14:17 bde Exp $ + * $Id: diskslice_machdep.c,v 1.26 1997/09/27 15:34:34 joerg Exp $ */ #include <stddef.h> @@ -207,7 +207,7 @@ reread_mbr: } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { @@ -398,7 +398,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); @@ -409,7 +409,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } for (dospart = 0, - dp = (struct dos_partition *)(bp->b_un.b_addr + DOSPARTOFF), + dp = (struct dos_partition *)(bp->b_data + DOSPARTOFF), slice = ssp->dss_nslices, sp = &ssp->dss_slices[slice]; dospart < NDOSPART; dospart++, dp++) { ext_sizes[dospart] = 0; diff --git a/sys/i386/isa/fd.c b/sys/i386/isa/fd.c index 2d3081f..d31c643 100644 --- a/sys/i386/isa/fd.c +++ b/sys/i386/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.104 1997/09/23 22:14:43 gibbs Exp $ + * $Id: fd.c,v 1.105 1997/10/19 13:12:02 joerg Exp $ * */ @@ -1326,7 +1326,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) read = bp->b_flags & B_READ; format = bp->b_flags & B_FORMAT; if(format) { - finfo = (struct fd_formb *)bp->b_un.b_addr; + finfo = (struct fd_formb *)bp->b_data; fd->skip = (char *)&(finfo->fd_formb_cylno(0)) - (char *)finfo; } @@ -1468,7 +1468,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) } fd->track = b_cylinder; - isa_dmastart(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmastart(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); sectrac = fd->ft->sectrac; sec = blknum % (sectrac * fd->ft->heads); @@ -1560,7 +1560,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) /* FALLTHROUGH */ case IOTIMEDOUT: - isa_dmadone(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmadone(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); if (fdc->status[0] & NE7_ST0_IC) { @@ -1801,7 +1801,7 @@ fdformat(dev, finfo, p) + finfo->head * fd->ft->sectrac) * fdblk / DEV_BSIZE; bp->b_bcount = sizeof(struct fd_idfield_data) * finfo->fd_formb_nsecs; - bp->b_un.b_addr = (caddr_t)finfo; + bp->b_data = (caddr_t)finfo; /* now do the format */ fdstrategy(bp); diff --git a/sys/i386/isa/labpc.c b/sys/i386/isa/labpc.c index d6c4f09..5add67f 100644 --- a/sys/i386/isa/labpc.c +++ b/sys/i386/isa/labpc.c @@ -773,7 +773,7 @@ start(struct ctlr *ctlr) return; } - ctlr->data = (u_char *)bp->b_un.b_addr; + ctlr->data = (u_char *)bp->b_data; ctlr->data_end = ctlr->data + bp->b_bcount; if (ctlr->err) @@ -866,7 +866,7 @@ da_strategy(struct buf *bp, struct ctlr *ctlr) } len = bp->b_bcount / 2; - data = (u_char *)bp->b_un.b_addr; + data = (u_char *)bp->b_data; for (i = 0; i < len; i++) { @@ -891,7 +891,7 @@ da_strategy(struct buf *bp, struct ctlr *ctlr) bp_done(bp, EIO); len = bp->b_bcount; - data = (u_char *)bp->b_un.b_addr; + data = (u_char *)bp->b_data; for (i = 0; i < len; i++) { @@ -936,7 +936,7 @@ digital_out_strategy(struct buf *bp, struct ctlr *ctlr) port = PORTX(ctlr, chan); len = bp->b_bcount; - data = (u_char *)bp->b_un.b_addr; + data = (u_char *)bp->b_data; for (i = 0; i < len; i++) { @@ -964,7 +964,7 @@ digital_in_strategy(struct buf *bp, struct ctlr *ctlr) port = PORTX(ctlr, chan); len = bp->b_bcount; - data = (u_char *)bp->b_un.b_addr; + data = (u_char *)bp->b_data; for (i = 0; i < len; i++) { diff --git a/sys/i386/isa/lpt.c b/sys/i386/isa/lpt.c index 6db958c..735cc3e 100644 --- a/sys/i386/isa/lpt.c +++ b/sys/i386/isa/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.61 1997/07/20 14:10:05 bde Exp $ + * $Id: lpt.c,v 1.62 1997/09/02 01:18:18 bde Exp $ */ /* @@ -718,7 +718,7 @@ lptwrite(dev_t dev, struct uio * uio, int ioflag) sc->sc_state &= ~INTERRUPTED; while ((n = min(BUFSIZE, uio->uio_resid)) != 0) { - sc->sc_cp = sc->sc_inbuf->b_un.b_addr ; + sc->sc_cp = sc->sc_inbuf->b_data ; uiomove(sc->sc_cp, n, uio); sc->sc_xfercnt = n ; while ((sc->sc_xfercnt > 0)&&(sc->sc_irq & LP_USE_IRQ)) { diff --git a/sys/i386/isa/matcd/matcd.c b/sys/i386/isa/matcd/matcd.c index b1356af..4c58561 100644 --- a/sys/i386/isa/matcd/matcd.c +++ b/sys/i386/isa/matcd/matcd.c @@ -337,7 +337,7 @@ static char MATCDVERSION[]="Version 1(26) 18-Oct-95"; static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank Durda IV"; /* The proceeding strings may not be changed*/ -/* $Id: matcd.c,v 1.29 1997/09/21 21:42:18 gibbs Exp $ */ +/* $Id: matcd.c,v 1.30 1997/11/07 08:52:48 phk Exp $ */ /*--------------------------------------------------------------------------- Include declarations @@ -1958,7 +1958,7 @@ nextblock: #ifdef DEBUGIO printf("matcd%d: Data Phase\n",ldrive); #endif /*DEBUGIO*/ - addr=bp->b_un.b_addr + mbx->skip; + addr=bp->b_data + mbx->skip; #ifdef DEBUGIO printf("matcd%d: Xfer Addr %x size %x", ldrive,(unsigned int)addr,mbx->sz); diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index 377f589..35439a5 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.94 1997/09/21 21:41:26 gibbs Exp $ + * $Id: mcd.c,v 1.95 1997/11/07 08:52:40 phk Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -1131,7 +1131,7 @@ retry_read: RDELAY_WAITREAD-mbx->count); got_it: /* data is ready */ - addr = bp->b_un.b_addr + mbx->skip; + addr = bp->b_data + mbx->skip; outb(port+mcd_ctl2,0x04); /* XXX */ for (i=0; i<mbx->sz; i++) diff --git a/sys/i386/isa/scd.c b/sys/i386/isa/scd.c index 72fd0ca..1d97b12 100644 --- a/sys/i386/isa/scd.c +++ b/sys/i386/isa/scd.c @@ -41,7 +41,7 @@ */ -/* $Id: scd.c,v 1.32 1997/07/20 14:10:10 bde Exp $ */ +/* $Id: scd.c,v 1.33 1997/09/21 21:41:32 gibbs Exp $ */ /* Please send any comments to micke@dynas.se */ @@ -955,7 +955,7 @@ writeparam: got_data: /* data is ready */ - addr = bp->b_un.b_addr + mbx->skip; + addr = bp->b_data + mbx->skip; write_control(port, CBIT_DATA_READY_CLEAR); insb(port+IREG_DATA, addr, mbx->sz); diff --git a/sys/i386/isa/spkr.c b/sys/i386/isa/spkr.c index 6ea7032..780b440 100644 --- a/sys/i386/isa/spkr.c +++ b/sys/i386/isa/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id$ + * $Id: spkr.c,v 1.29 1997/02/22 09:37:11 peter Exp $ */ #include "speaker.h" @@ -502,7 +502,7 @@ spkrwrite(dev, uio, ioflag) int error; n = uio->uio_resid; - cp = spkr_inbuf->b_un.b_addr; + cp = spkr_inbuf->b_data; error = uiomove(cp, n, uio); if (!error) { cp[n] = '\0'; diff --git a/sys/i386/isa/wcd.c b/sys/i386/isa/wcd.c index d23ca34..e04e1c7 100644 --- a/sys/i386/isa/wcd.c +++ b/sys/i386/isa/wcd.c @@ -13,7 +13,7 @@ * all derivative works or modified versions. * * From: Version 1.9, Mon Oct 9 20:27:42 MSK 1995 - * $Id: wcd.c,v 1.47 1997/11/05 21:32:00 sos Exp $ + * $Id: wcd.c,v 1.48 1997/11/07 08:52:43 phk Exp $ */ #include "wdc.h" @@ -660,7 +660,7 @@ static void wcd_start (struct wcd *t) atapi_request_callback (t->ata, t->unit, ATAPI_READ_BIG, 0, blkno>>24, blkno>>16, blkno>>8, blkno, 0, nblk>>8, nblk, 0, 0, - 0, 0, 0, 0, 0, (u_char*) bp->b_un.b_addr, bp->b_bcount, + 0, 0, 0, 0, 0, (u_char*) bp->b_data, bp->b_bcount, wcd_done, t, bp); } diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index 49c05da..c9fac79 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.143 1997/11/07 08:52:45 phk Exp $ + * $Id: wd.c,v 1.144 1997/11/07 09:20:34 phk Exp $ */ /* TODO: @@ -864,7 +864,7 @@ wdstart(int ctrlr) } else { if((du->dk_flags & DKFL_USEDMA) && wddma[du->dk_interface].wdd_dmaverify(du->dk_dmacookie, - (void *)((int)bp->b_un.b_addr + + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), du->dk_bc, bp->b_flags & B_READ)) { @@ -913,7 +913,7 @@ wdstart(int ctrlr) if ((du->dk_flags & (DKFL_DMA|DKFL_SINGLE)) == DKFL_DMA) { wddma[du->dk_interface].wdd_dmaprep(du->dk_dmacookie, - (void *)((int)bp->b_un.b_addr + + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), du->dk_bc, bp->b_flags & B_READ); @@ -927,7 +927,7 @@ wdstart(int ctrlr) #ifdef WDDEBUG printf("cylin %ld head %ld sector %ld addr %x sts %x\n", cylin, head, sector, - (int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE, + (int)bp->b_data + du->dk_skip * DEV_BSIZE, inb(du->dk_altport)); #endif } @@ -990,11 +990,11 @@ wdstart(int ctrlr) if (du->dk_flags & DKFL_32BIT) outsl(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE), + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), (count * DEV_BSIZE) / sizeof(long)); else outsw(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE), + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), (count * DEV_BSIZE) / sizeof(short)); du->dk_bc -= DEV_BSIZE * count; if (du->dk_dkunit >= 0) { @@ -1181,11 +1181,11 @@ oops: /* suck in data */ if( du->dk_flags & DKFL_32BIT) insl(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE), + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), chk / sizeof(long)); else insw(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE), + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), chk / sizeof(short)); du->dk_bc -= chk; diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index e95749b..a59d68f 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -20,7 +20,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.40 1997/07/20 14:10:18 bde Exp $ + * $Id: wt.c,v 1.41 1997/08/25 23:31:05 bde Exp $ * */ @@ -572,7 +572,7 @@ wtstrategy (struct buf *bp) t->flags &= ~TPEXCEP; s = splbio (); - if (wtstart (t, bp->b_flags, bp->b_un.b_addr, bp->b_bcount)) { + if (wtstart (t, bp->b_flags, bp->b_data, bp->b_bcount)) { wtwait (t, 0, (bp->b_flags & B_READ) ? "wtread" : "wtwrite"); bp->b_resid -= t->dmacount; } diff --git a/sys/isa/fd.c b/sys/isa/fd.c index 2d3081f..d31c643 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.104 1997/09/23 22:14:43 gibbs Exp $ + * $Id: fd.c,v 1.105 1997/10/19 13:12:02 joerg Exp $ * */ @@ -1326,7 +1326,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) read = bp->b_flags & B_READ; format = bp->b_flags & B_FORMAT; if(format) { - finfo = (struct fd_formb *)bp->b_un.b_addr; + finfo = (struct fd_formb *)bp->b_data; fd->skip = (char *)&(finfo->fd_formb_cylno(0)) - (char *)finfo; } @@ -1468,7 +1468,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) } fd->track = b_cylinder; - isa_dmastart(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmastart(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); sectrac = fd->ft->sectrac; sec = blknum % (sectrac * fd->ft->heads); @@ -1560,7 +1560,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) /* FALLTHROUGH */ case IOTIMEDOUT: - isa_dmadone(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmadone(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); if (fdc->status[0] & NE7_ST0_IC) { @@ -1801,7 +1801,7 @@ fdformat(dev, finfo, p) + finfo->head * fd->ft->sectrac) * fdblk / DEV_BSIZE; bp->b_bcount = sizeof(struct fd_idfield_data) * finfo->fd_formb_nsecs; - bp->b_un.b_addr = (caddr_t)finfo; + bp->b_data = (caddr_t)finfo; /* now do the format */ fdstrategy(bp); diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c index df94edf..95e89d0 100644 --- a/sys/kern/subr_diskmbr.c +++ b/sys/kern/subr_diskmbr.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.25 1997/04/19 14:14:17 bde Exp $ + * $Id: diskslice_machdep.c,v 1.26 1997/09/27 15:34:34 joerg Exp $ */ #include <stddef.h> @@ -207,7 +207,7 @@ reread_mbr: } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { @@ -398,7 +398,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); @@ -409,7 +409,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } for (dospart = 0, - dp = (struct dos_partition *)(bp->b_un.b_addr + DOSPARTOFF), + dp = (struct dos_partition *)(bp->b_data + DOSPARTOFF), slice = ssp->dss_nslices, sp = &ssp->dss_slices[slice]; dospart < NDOSPART; dospart++, dp++) { ext_sizes[dospart] = 0; diff --git a/sys/kern/subr_dkbad.c b/sys/kern/subr_dkbad.c index f2857c8..4686a17 100644 --- a/sys/kern/subr_dkbad.c +++ b/sys/kern/subr_dkbad.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_dkbad.c,v 1.6 1997/02/22 09:39:16 peter Exp $ + * $Id: subr_dkbad.c,v 1.7 1997/11/24 04:14:21 dyson Exp $ */ #include <sys/param.h> @@ -123,7 +123,7 @@ readbad144(dev, strat, lp, bdp) /* If successful, validate, otherwise try another. */ if (biowait(bp) == 0) { - db = (struct dkbad *)(bp->b_un.b_addr); + db = (struct dkbad *)(bp->b_data); if (db->bt_mbz == 0 && db->bt_flag == DKBAD_MAGIC) { msg = NULL; *bdp = *db; diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 8c4c9ca..2214fb8 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -18,7 +18,7 @@ * 5. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: vfs_bio.c,v 1.135 1997/11/24 06:18:27 dyson Exp $ + * $Id: vfs_bio.c,v 1.136 1997/12/01 19:04:00 dyson Exp $ */ /* @@ -2233,10 +2233,10 @@ DB_SHOW_COMMAND(buffer, db_show_buffer) "\17locked\16inval\15gathered\14error\13eintr\12done\11dirty" "\10delwri\7call\6cache\5busy\4bad\3async\2needcommit\1age"); db_printf("b_error = %d, b_bufsize = %ld, b_bcount = %ld, " - "b_resid = %ld\nb_dev = 0x%x, b_un.b_addr = %p, " + "b_resid = %ld\nb_dev = 0x%x, b_data = %p, " "b_blkno = %d, b_pblkno = %d\n", bp->b_error, bp->b_bufsize, bp->b_bcount, bp->b_resid, - bp->b_dev, bp->b_un.b_addr, bp->b_blkno, bp->b_pblkno); + bp->b_dev, bp->b_data, bp->b_blkno, bp->b_pblkno); if (bp->b_npages) { int i; db_printf("b_npages = %d, pages(OBJ, IDX, PA): ", bp->b_npages); diff --git a/sys/pc98/cbus/fdc.c b/sys/pc98/cbus/fdc.c index 99b3c03..9e68628 100644 --- a/sys/pc98/cbus/fdc.c +++ b/sys/pc98/cbus/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.24 1997/09/24 08:21:26 kato Exp $ + * $Id: fd.c,v 1.25 1997/10/21 09:48:38 kato Exp $ * */ @@ -1657,7 +1657,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) read = bp->b_flags & B_READ; format = bp->b_flags & B_FORMAT; if(format) { - finfo = (struct fd_formb *)bp->b_un.b_addr; + finfo = (struct fd_formb *)bp->b_data; fd->skip = (char *)&(finfo->fd_formb_cylno(0)) - (char *)finfo; } @@ -1848,7 +1848,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) #ifdef EPSON_NRDISK if (fdu != nrdu) { #endif /* EPSON_NRDISK */ - isa_dmastart(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmastart(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); sectrac = fd->ft->sectrac; sec = blknum % (sectrac * fd->ft->heads); @@ -1933,10 +1933,10 @@ fdstate(fdcu_t fdcu, fdc_p fdc) nrd_addrset(fdblk * nrdblkn); while (!nrd_check_ready()) DELAY(1); if (read) epson_insw(P_NRD_DATA, - bp->b_un.b_addr + fd->skip, + bp->b_data + fd->skip, fdblk / sizeof(short)); else epson_outsw(P_NRD_DATA, - bp->b_un.b_addr + fd->skip, + bp->b_data + fd->skip, (format ? bp->b_bcount : fdblk) / sizeof(short)); @@ -1977,7 +1977,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) #ifdef EPSON_NRDISK if (fdu != nrdu) { #endif /* EPSON_NRDISK */ - isa_dmadone(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmadone(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); #ifdef EPSON_NRDISK } @@ -2231,7 +2231,7 @@ fdformat(dev, finfo, p) + finfo->head * fd->ft->sectrac) * fdblk / DEV_BSIZE; bp->b_bcount = sizeof(struct fd_idfield_data) * finfo->fd_formb_nsecs; - bp->b_un.b_addr = (caddr_t)finfo; + bp->b_data = (caddr_t)finfo; /* now do the format */ fdstrategy(bp); diff --git a/sys/pc98/pc98/atcompat_diskslice.c b/sys/pc98/pc98/atcompat_diskslice.c index dcf4472..dfead1b 100644 --- a/sys/pc98/pc98/atcompat_diskslice.c +++ b/sys/pc98/pc98/atcompat_diskslice.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: atcompat_diskslice.c,v 1.6 1997/04/20 05:16:05 kato Exp $ + * $Id: atcompat_diskslice.c,v 1.7 1997/09/28 05:52:50 kato Exp $ */ /* @@ -220,7 +220,7 @@ reread_mbr: } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { @@ -416,7 +416,7 @@ atcompat_extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); @@ -427,7 +427,7 @@ atcompat_extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, } for (dospart = 0, - dp = (struct dos_partition *)(bp->b_un.b_addr + DOSPARTOFF), + dp = (struct dos_partition *)(bp->b_data + DOSPARTOFF), slice = ssp->dss_nslices, sp = &ssp->dss_slices[slice]; dospart < NDOSPART; dospart++, dp++) { ext_sizes[dospart] = 0; diff --git a/sys/pc98/pc98/diskslice_machdep.c b/sys/pc98/pc98/diskslice_machdep.c index c20b978..9c1f9a0 100644 --- a/sys/pc98/pc98/diskslice_machdep.c +++ b/sys/pc98/pc98/diskslice_machdep.c @@ -35,7 +35,7 @@ * * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: diskslice_machdep.c,v 1.9 1997/04/20 05:16:06 kato Exp $ + * $Id: diskslice_machdep.c,v 1.10 1997/09/28 05:52:51 kato Exp $ */ /* @@ -271,7 +271,7 @@ reread_mbr: } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { @@ -575,7 +575,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } /* Weakly verify it. */ - cp = bp->b_un.b_addr; + cp = bp->b_data; if (cp[0x1FE] != 0x55 || cp[0x1FF] != 0xAA) { sname = dsname(dname, dkunit(dev), WHOLE_DISK_SLICE, RAW_PART, partname); @@ -586,7 +586,7 @@ extended(dname, dev, strat, lp, ssp, ext_offset, ext_size, base_ext_offset, } for (dospart = 0, - dp = (struct dos_partition *)(bp->b_un.b_addr + DOSPARTOFF), + dp = (struct dos_partition *)(bp->b_data + DOSPARTOFF), slice = ssp->dss_nslices, sp = &ssp->dss_slices[slice]; dospart < NDOSPART; dospart++, dp++) { ext_sizes[dospart] = 0; diff --git a/sys/pc98/pc98/fd.c b/sys/pc98/pc98/fd.c index 99b3c03..9e68628 100644 --- a/sys/pc98/pc98/fd.c +++ b/sys/pc98/pc98/fd.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.24 1997/09/24 08:21:26 kato Exp $ + * $Id: fd.c,v 1.25 1997/10/21 09:48:38 kato Exp $ * */ @@ -1657,7 +1657,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) read = bp->b_flags & B_READ; format = bp->b_flags & B_FORMAT; if(format) { - finfo = (struct fd_formb *)bp->b_un.b_addr; + finfo = (struct fd_formb *)bp->b_data; fd->skip = (char *)&(finfo->fd_formb_cylno(0)) - (char *)finfo; } @@ -1848,7 +1848,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) #ifdef EPSON_NRDISK if (fdu != nrdu) { #endif /* EPSON_NRDISK */ - isa_dmastart(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmastart(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); sectrac = fd->ft->sectrac; sec = blknum % (sectrac * fd->ft->heads); @@ -1933,10 +1933,10 @@ fdstate(fdcu_t fdcu, fdc_p fdc) nrd_addrset(fdblk * nrdblkn); while (!nrd_check_ready()) DELAY(1); if (read) epson_insw(P_NRD_DATA, - bp->b_un.b_addr + fd->skip, + bp->b_data + fd->skip, fdblk / sizeof(short)); else epson_outsw(P_NRD_DATA, - bp->b_un.b_addr + fd->skip, + bp->b_data + fd->skip, (format ? bp->b_bcount : fdblk) / sizeof(short)); @@ -1977,7 +1977,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc) #ifdef EPSON_NRDISK if (fdu != nrdu) { #endif /* EPSON_NRDISK */ - isa_dmadone(bp->b_flags, bp->b_un.b_addr+fd->skip, + isa_dmadone(bp->b_flags, bp->b_data+fd->skip, format ? bp->b_bcount : fdblk, fdc->dmachan); #ifdef EPSON_NRDISK } @@ -2231,7 +2231,7 @@ fdformat(dev, finfo, p) + finfo->head * fd->ft->sectrac) * fdblk / DEV_BSIZE; bp->b_bcount = sizeof(struct fd_idfield_data) * finfo->fd_formb_nsecs; - bp->b_un.b_addr = (caddr_t)finfo; + bp->b_data = (caddr_t)finfo; /* now do the format */ fdstrategy(bp); diff --git a/sys/pc98/pc98/lpt.c b/sys/pc98/pc98/lpt.c index 8ff5717..6d574f8 100644 --- a/sys/pc98/pc98/lpt.c +++ b/sys/pc98/pc98/lpt.c @@ -46,7 +46,7 @@ * SUCH DAMAGE. * * from: unknown origin, 386BSD 0.1 - * $Id: lpt.c,v 1.13 1997/07/21 13:11:06 kato Exp $ + * $Id: lpt.c,v 1.14 1997/09/02 10:11:04 kato Exp $ */ /* @@ -758,7 +758,7 @@ lptwrite(dev_t dev, struct uio * uio, int ioflag) sc->sc_state &= ~INTERRUPTED; while ((n = min(BUFSIZE, uio->uio_resid)) != 0) { - sc->sc_cp = sc->sc_inbuf->b_un.b_addr ; + sc->sc_cp = sc->sc_inbuf->b_data ; uiomove(sc->sc_cp, n, uio); sc->sc_xfercnt = n ; while ((sc->sc_xfercnt > 0)&&(sc->sc_irq & LP_USE_IRQ)) { diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c index 40715de..07703e0 100644 --- a/sys/pc98/pc98/spkr.c +++ b/sys/pc98/pc98/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id$ + * $Id: spkr.c,v 1.8 1997/02/22 09:43:46 peter Exp $ */ /* @@ -535,7 +535,7 @@ spkrwrite(dev, uio, ioflag) int error; n = uio->uio_resid; - cp = spkr_inbuf->b_un.b_addr; + cp = spkr_inbuf->b_data; error = uiomove(cp, n, uio); if (!error) { cp[n] = '\0'; diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index ebf1f10..7153947 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.35 1997/11/04 12:58:48 kato Exp $ + * $Id: wd.c,v 1.36 1997/11/07 12:54:01 kato Exp $ */ /* TODO: @@ -963,7 +963,7 @@ wdstart(int ctrlr) } else { if((du->dk_flags & DKFL_USEDMA) && wddma[du->dk_interface].wdd_dmaverify(du->dk_dmacookie, - (void *)((int)bp->b_un.b_addr + + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), du->dk_bc, bp->b_flags & B_READ)) { @@ -1012,7 +1012,7 @@ wdstart(int ctrlr) if ((du->dk_flags & (DKFL_DMA|DKFL_SINGLE)) == DKFL_DMA) { wddma[du->dk_interface].wdd_dmaprep(du->dk_dmacookie, - (void *)((int)bp->b_un.b_addr + + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), du->dk_bc, bp->b_flags & B_READ); @@ -1026,7 +1026,7 @@ wdstart(int ctrlr) #ifdef WDDEBUG printf("cylin %ld head %ld sector %ld addr %x sts ", cylin, head, sector, - (int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE); + (int)bp->b_data + du->dk_skip * DEV_BSIZE); if (old_epson_note) printf("%x\n", epson_inb(du->dk_altport)); else @@ -1092,18 +1092,18 @@ wdstart(int ctrlr) if (!old_epson_note) { if (du->dk_flags & DKFL_32BIT) outsl(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), (count * DEV_BSIZE) / sizeof(long)); else outsw(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), (count * DEV_BSIZE) / sizeof(short)); } else epson_outsw(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE), + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), (count * DEV_BSIZE) / sizeof(short)); du->dk_bc -= DEV_BSIZE * count; @@ -1293,11 +1293,11 @@ oops: /* suck in data */ if( du->dk_flags & DKFL_32BIT) insl(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE), + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), chk / sizeof(long)); else insw(du->dk_port + wd_data, - (void *)((int)bp->b_un.b_addr + du->dk_skip * DEV_BSIZE), + (void *)((int)bp->b_data + du->dk_skip * DEV_BSIZE), chk / sizeof(short)); du->dk_bc -= chk; diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index bf21e9c..ac7bfb1 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $Id: cd.c,v 1.85 1997/09/07 15:06:06 joerg Exp $ + * $Id: cd.c,v 1.86 1997/09/21 22:02:59 gibbs Exp $ */ #include "opt_bounce.h" @@ -540,7 +540,7 @@ cdstart(unit, flags) if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd, sizeof(cmd), - (u_char *) bp->b_un.b_addr, + (u_char *) bp->b_data, bp->b_bcount, CDRETRIES, 30000, diff --git a/sys/scsi/od.c b/sys/scsi/od.c index 2fa229c..989483f 100644 --- a/sys/scsi/od.c +++ b/sys/scsi/od.c @@ -28,7 +28,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $Id: od.c,v 1.31 1997/09/02 20:06:32 bde Exp $ + * $Id: od.c,v 1.32 1997/09/21 22:03:01 gibbs Exp $ */ /* @@ -636,7 +636,7 @@ odstart(u_int32_t unit, u_int32_t flags) if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd, sizeof(cmd), - (u_char *) bp->b_un.b_addr, + (u_char *) bp->b_data, bp->b_bcount, OD_RETRIES, 100000, diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c index ccb6f1d..06565a4 100644 --- a/sys/scsi/pt.c +++ b/sys/scsi/pt.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pt.c,v 1.23 1997/09/02 20:06:32 bde Exp $ + * $Id: pt.c,v 1.24 1997/09/21 22:03:03 gibbs Exp $ */ #include "opt_bounce.h" @@ -180,7 +180,7 @@ ptstart(unit, flags) if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd, sizeof(cmd), - (u_char *) bp->b_un.b_addr, + (u_char *) bp->b_data, bp->b_bcount, 0, 10000, diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 8484a7d..ceafe78 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. *End copyright * - * $Id: scsi_ioctl.c,v 1.25 1997/03/23 06:33:48 bde Exp $ + * $Id: scsi_ioctl.c,v 1.26 1997/09/02 20:06:34 bde Exp $ * * */ @@ -215,7 +215,7 @@ scsistrategy(struct buf *bp) err = scsi_scsi_cmd(sc_link, (struct scsi_generic *)screq->cmd, screq->cmdlen, - (u_char *)bp->b_un.b_addr, + (u_char *)bp->b_data, screq->datalen, 0, /* user must do the retries *//* ignored */ screq->timeout, @@ -314,7 +314,7 @@ struct proc *p, struct scsi_link *sc_link) minphys, &auio); } else { /* if no data, no need to translate it.. */ - bp->b_un.b_addr = 0; + bp->b_data = 0; bp->b_dev = dev; bp->b_flags |= B_BUSY; diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c index 1900b63..1462769 100644 --- a/sys/scsi/sctarg.c +++ b/sys/scsi/sctarg.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sctarg.c,v 1.21 1997/09/02 20:06:36 bde Exp $ + * $Id: sctarg.c,v 1.22 1997/09/21 22:03:11 gibbs Exp $ */ #include "opt_bounce.h" @@ -212,7 +212,7 @@ sctargstart(unit, unused_flags) if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd, sizeof(cmd), - (u_char *) bp->b_un.b_addr, + (u_char *) bp->b_data, bp->b_bcount, 0, 100000, diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 6252275..b07cbbb 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -15,7 +15,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 1.113 1997/11/07 08:53:32 phk Exp $ + * $Id: sd.c,v 1.114 1997/11/23 11:30:42 bde Exp $ */ #include "opt_bounce.h" @@ -614,7 +614,7 @@ sdstart(u_int32_t unit, u_int32_t flags) if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd, sizeof(cmd), - (u_char *) bp->b_un.b_addr, + (u_char *) bp->b_data, bp->b_bcount, SD_RETRIES, 10000, diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 4bc0417..93f7c54 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: st.c,v 1.82 1997/09/21 22:03:19 gibbs Exp $ + * $Id: st.c,v 1.83 1997/11/23 11:56:18 bde Exp $ */ /* @@ -961,7 +961,7 @@ ststart(unit, flags) if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd, sizeof(cmd), - (u_char *) bp->b_un.b_addr, + (u_char *) bp->b_data, bp->b_bcount, 0, /* can't retry a read on a tape really */ 1000000, diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c index 1f299d3..bff5014 100644 --- a/sys/scsi/worm.c +++ b/sys/scsi/worm.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: worm.c,v 1.46 1997/09/21 22:03:22 gibbs Exp $ + * $Id: worm.c,v 1.47 1997/10/27 21:09:27 jmz Exp $ */ #include "opt_bounce.h" @@ -386,7 +386,7 @@ wormstart(unit, flags) if (scsi_scsi_cmd(sc_link, (struct scsi_generic *) &cmd, sizeof(cmd), - (u_char *) bp->b_un.b_addr, + (u_char *) bp->b_data, bp->b_bcount, 0, 100000, diff --git a/sys/sys/bio.h b/sys/sys/bio.h index 36b6b53..f98f120 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.9 (Berkeley) 3/30/95 - * $Id: buf.h,v 1.42 1997/09/21 22:08:58 gibbs Exp $ + * $Id: buf.h,v 1.43 1997/10/23 11:32:06 gibbs Exp $ */ #ifndef _SYS_BUF_H_ @@ -75,9 +75,7 @@ struct buf { long b_bcount; /* Valid bytes in buffer. */ long b_resid; /* Remaining I/O. */ dev_t b_dev; /* Device associated with buffer. */ - struct { - caddr_t b_addr; /* Memory, superblocks, indirect etc. */ - } b_un; + caddr_t b_data; /* Memory, superblocks, indirect etc. */ caddr_t b_kvabase; /* base kva for buffer */ int b_kvasize; /* size of kva for buffer */ daddr_t b_lblkno; /* Logical block number. */ @@ -107,9 +105,6 @@ struct buf { int b_npages; }; -/* Device driver compatibility definitions. */ -#define b_data b_un.b_addr /* b_un.b_addr is not changeable. */ - /* * These flags are kept in b_flags. */ diff --git a/sys/sys/buf.h b/sys/sys/buf.h index 36b6b53..f98f120 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.9 (Berkeley) 3/30/95 - * $Id: buf.h,v 1.42 1997/09/21 22:08:58 gibbs Exp $ + * $Id: buf.h,v 1.43 1997/10/23 11:32:06 gibbs Exp $ */ #ifndef _SYS_BUF_H_ @@ -75,9 +75,7 @@ struct buf { long b_bcount; /* Valid bytes in buffer. */ long b_resid; /* Remaining I/O. */ dev_t b_dev; /* Device associated with buffer. */ - struct { - caddr_t b_addr; /* Memory, superblocks, indirect etc. */ - } b_un; + caddr_t b_data; /* Memory, superblocks, indirect etc. */ caddr_t b_kvabase; /* base kva for buffer */ int b_kvasize; /* size of kva for buffer */ daddr_t b_lblkno; /* Logical block number. */ @@ -107,9 +105,6 @@ struct buf { int b_npages; }; -/* Device driver compatibility definitions. */ -#define b_data b_un.b_addr /* b_un.b_addr is not changeable. */ - /* * These flags are kept in b_flags. */ diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c index e692a37..77862de 100644 --- a/sys/ufs/lfs/lfs_segment.c +++ b/sys/ufs/lfs/lfs_segment.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_segment.c 8.10 (Berkeley) 6/10/95 - * $Id: lfs_segment.c,v 1.24 1997/08/31 07:32:37 phk Exp $ + * $Id: lfs_segment.c,v 1.25 1997/10/16 11:58:30 phk Exp $ */ #include <sys/param.h> @@ -730,7 +730,7 @@ lfs_updatemeta(sp) printf("lfs: negative bytes (segment %ld)\n", datosn(fs, daddr)); printf("lfs: bp = 0x%x, addr = 0x%x\n", - bp, bp->b_un.b_addr); + bp, bp->b_data); panic ("Negative Bytes"); } #endif diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index bb6e7a0..81c2fb2 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -39,7 +39,7 @@ * from: Utah $Hdr: swap_pager.c 1.4 91/04/30$ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 - * $Id: swap_pager.c,v 1.77 1997/09/01 02:28:32 bde Exp $ + * $Id: swap_pager.c,v 1.78 1997/09/01 03:17:13 bde Exp $ */ /* @@ -1003,7 +1003,7 @@ swap_pager_getpages(object, m, count, reqpage) bp->b_rcred = bp->b_wcred = bp->b_proc->p_ucred; crhold(bp->b_rcred); crhold(bp->b_wcred); - bp->b_un.b_addr = (caddr_t) kva; + bp->b_data = (caddr_t) kva; bp->b_blkno = reqaddr[0]; bp->b_bcount = PAGE_SIZE * count; bp->b_bufsize = PAGE_SIZE * count; diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index e9005a6..df5d5bf 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.74 1997/09/01 03:17:34 bde Exp $ + * $Id: vnode_pager.c,v 1.75 1997/10/06 02:38:30 dyson Exp $ */ /* @@ -495,7 +495,7 @@ vnode_pager_input_smlfs(object, m) crhold(bp->b_rcred); if (bp->b_wcred != NOCRED) crhold(bp->b_wcred); - bp->b_un.b_addr = (caddr_t) kva + i * bsize; + bp->b_data = (caddr_t) kva + i * bsize; bp->b_blkno = fileaddr; pbgetvp(dp, bp); bp->b_bcount = bsize; |