5 files changed, 13 insertions, 13 deletions

diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 2d3081fc66e1..d31c6438b9f4 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 377f5893212d..35439a58fdca 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 6f04c09546da..e82b4f493c96 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 72fd0ca066d6..1d97b12c73cb 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 6ea703277fd2..780b440f4534 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';