From a1bfb618d996ea613b9d640d00950f5ffef739db Mon Sep 17 00:00:00 2001
From: phk <phk@FreeBSD.org>
Date: Tue, 2 Dec 1997 21:07:20 +0000
Subject: In all such uses of struct buf: 's/b_un.b_addr/b_data/g'

---
 sys/scsi/cd.c         | 4 ++--
 sys/scsi/od.c         | 4 ++--
 sys/scsi/pt.c         | 4 ++--
 sys/scsi/scsi_ioctl.c | 6 +++---
 sys/scsi/sctarg.c     | 4 ++--
 sys/scsi/sd.c         | 4 ++--
 sys/scsi/st.c         | 4 ++--
 sys/scsi/worm.c       | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'sys/scsi')

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,
-- 
cgit v1.1