In all such uses of struct buf: 's/b_un.b_addr/b_data/g'

11 files changed, 36 insertions, 36 deletions

diff --git a/sys/i386/isa/diskslice_machdep.c b/sys/i386/isa/diskslice_machdep.c
index df94edf73da4..95e89d06bc9c 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 2d3081fc66e1..d31c6438b9f4 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 d6c4f093f074..5add67f64446 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 6db958ca2819..735cc3e63fc2 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 b1356afd672a..4c585614645e 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 377f5893212d..35439a58fdca 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 72fd0ca066d6..1d97b12c73cb 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 6ea703277fd2..780b440f4534 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 d23ca3425d8e..e04e1c77ba7f 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 49c05dae2200..c9fac7974fd8 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 e95749bc00ae..a59d68f889f3 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;
 	}