final removal of daddr64_t. daddr_t has been 64 bit for a long enough

test period; i think 3 years ago the last bugs fell out.
ok otto beck others

6 files changed, 27 insertions, 27 deletions

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index ff64bcbb520..cce3860a9b2 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.207 2011/07/06 04:49:36 matthew Exp $	*/
+/*	$OpenBSD: cd.c,v 1.208 2013/06/11 16:42:17 deraadt Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -106,7 +106,7 @@ struct cd_softc {
 	struct scsi_link *sc_link;	/* contains our targ, lun, etc. */
 	struct cd_parms {
 		u_int32_t secsize;
-		daddr64_t disksize;	/* total number sectors */
+		daddr_t disksize;	/* total number sectors */
 	} params;
 	struct bufq	sc_bufq;
 	struct scsi_xshandler sc_xsh;
@@ -1631,7 +1631,7 @@ cd_get_parms(struct cd_softc *sc, int flags)
 	return (0);
 }
 
-daddr64_t
+daddr_t
 cdsize(dev_t dev)
 {
 
@@ -1640,7 +1640,7 @@ cdsize(dev_t dev)
 }
 
 int
-cddump(dev_t dev, daddr64_t secno, caddr_t va, size_t size)
+cddump(dev_t dev, daddr_t secno, caddr_t va, size_t size)
 {
 	/* Not implemented. */
 	return ENXIO;
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c
index 110443fdb3f..0f14c8174ad 100644
--- a/sys/scsi/scsi_base.c
+++ b/sys/scsi/scsi_base.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi_base.c,v 1.201 2012/07/01 19:32:55 miod Exp $	*/
+/*	$OpenBSD: scsi_base.c,v 1.202 2013/06/11 16:42:17 deraadt Exp $	*/
 /*	$NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $	*/
 
 /*
@@ -763,7 +763,7 @@ scsi_xs_put(struct scsi_xfer *xs)
 /*
  * Find out from the device what its capacity is.
  */
-daddr64_t
+daddr_t
 scsi_size(struct scsi_link *sc_link, int flags, u_int32_t *blksize)
 {
 	struct scsi_read_cap_data_16 *rdcap16;
@@ -771,7 +771,7 @@ scsi_size(struct scsi_link *sc_link, int flags, u_int32_t *blksize)
 	struct scsi_read_cap_data *rdcap;
 	struct scsi_read_capacity *cmd10;
 	struct scsi_xfer *xs;
-	daddr64_t max_addr;
+	daddr_t max_addr;
 	int error;
 
 	if (blksize != NULL)
diff --git a/sys/scsi/scsiconf.h b/sys/scsi/scsiconf.h
index 859ab2b2be0..e0a302bb9d7 100644
--- a/sys/scsi/scsiconf.h
+++ b/sys/scsi/scsiconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsiconf.h,v 1.152 2013/03/28 16:55:27 deraadt Exp $	*/
+/*	$OpenBSD: scsiconf.h,v 1.153 2013/06/11 16:42:17 deraadt Exp $	*/
 /*	$NetBSD: scsiconf.h,v 1.35 1997/04/02 02:29:38 mycroft Exp $	*/
 
 /*
@@ -472,7 +472,7 @@ const void *scsi_inqmatch(struct scsi_inquiry_data *, const void *, int,
     workq_add_task(NULL, (_fl), (_f), (_a1), (_a2))
 
 void	scsi_init(void);
-daddr64_t scsi_size(struct scsi_link *, int, u_int32_t *);
+daddr_t scsi_size(struct scsi_link *, int, u_int32_t *);
 int	scsi_test_unit_ready(struct scsi_link *, int, int);
 int	scsi_inquire(struct scsi_link *, struct scsi_inquiry_data *, int);
 int	scsi_inquire_vpd(struct scsi_link *, void *, u_int, u_int8_t, int);
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index e7b8ed619f1..d144aa71758 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.245 2012/12/19 19:52:11 kettenis Exp $	*/
+/*	$OpenBSD: sd.c,v 1.246 2013/06/11 16:42:17 deraadt Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -104,10 +104,10 @@ void	viscpy(u_char *, u_char *, int);
 int	sd_ioctl_inquiry(struct sd_softc *, struct dk_inquiry *);
 int	sd_ioctl_cache(struct sd_softc *, long, struct dk_cache *);
 
-void	sd_cmd_rw6(struct scsi_xfer *, int, daddr64_t, u_int);
-void	sd_cmd_rw10(struct scsi_xfer *, int, daddr64_t, u_int);
-void	sd_cmd_rw12(struct scsi_xfer *, int, daddr64_t, u_int);
-void	sd_cmd_rw16(struct scsi_xfer *, int, daddr64_t, u_int);
+void	sd_cmd_rw6(struct scsi_xfer *, int, daddr_t, u_int);
+void	sd_cmd_rw10(struct scsi_xfer *, int, daddr_t, u_int);
+void	sd_cmd_rw12(struct scsi_xfer *, int, daddr_t, u_int);
+void	sd_cmd_rw16(struct scsi_xfer *, int, daddr_t, u_int);
 
 void	sd_buf_done(struct scsi_xfer *);
 
@@ -571,7 +571,7 @@ sdstrategy(struct buf *bp)
 }
 
 void
-sd_cmd_rw6(struct scsi_xfer *xs, int read, daddr64_t secno, u_int nsecs)
+sd_cmd_rw6(struct scsi_xfer *xs, int read, daddr_t secno, u_int nsecs)
 {
 	struct scsi_rw *cmd = (struct scsi_rw *)xs->cmd;
 
@@ -583,7 +583,7 @@ sd_cmd_rw6(struct scsi_xfer *xs, int read, daddr64_t secno, u_int nsecs)
 }
 
 void
-sd_cmd_rw10(struct scsi_xfer *xs, int read, daddr64_t secno, u_int nsecs)
+sd_cmd_rw10(struct scsi_xfer *xs, int read, daddr_t secno, u_int nsecs)
 {
 	struct scsi_rw_big *cmd = (struct scsi_rw_big *)xs->cmd;
 
@@ -595,7 +595,7 @@ sd_cmd_rw10(struct scsi_xfer *xs, int read, daddr64_t secno, u_int nsecs)
 }
 
 void
-sd_cmd_rw12(struct scsi_xfer *xs, int read, daddr64_t secno, u_int nsecs)
+sd_cmd_rw12(struct scsi_xfer *xs, int read, daddr_t secno, u_int nsecs)
 {
 	struct scsi_rw_12 *cmd = (struct scsi_rw_12 *)xs->cmd;
 
@@ -607,7 +607,7 @@ sd_cmd_rw12(struct scsi_xfer *xs, int read, daddr64_t secno, u_int nsecs)
 }
 
 void
-sd_cmd_rw16(struct scsi_xfer *xs, int read, daddr64_t secno, u_int nsecs)
+sd_cmd_rw16(struct scsi_xfer *xs, int read, daddr_t secno, u_int nsecs)
 {
 	struct scsi_rw_16 *cmd = (struct scsi_rw_16 *)xs->cmd;
 
@@ -637,7 +637,7 @@ sdstart(struct scsi_xfer *xs)
 	struct scsi_link *link = xs->sc_link;
 	struct sd_softc *sc = link->device_softc;
 	struct buf *bp;
-	daddr64_t secno;
+	daddr_t secno;
 	int nsecs;
 	int read;
 	struct partition *p;
@@ -1192,7 +1192,7 @@ sd_interpret_sense(struct scsi_xfer *xs)
 	return (retval);
 }
 
-daddr64_t
+daddr_t
 sdsize(dev_t dev)
 {
 	struct sd_softc *sc;
@@ -1237,14 +1237,14 @@ static int sddoingadump;
  * at offset 'dumplo' into the partition.
  */
 int
-sddump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size)
+sddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
 {
 	struct sd_softc *sc;	/* disk unit to do the I/O */
 	struct disklabel *lp;	/* disk's disklabel */
 	int	unit, part;
 	int	sectorsize;	/* size of a disk sector */
-	daddr64_t	nsects;		/* number of sectors in partition */
-	daddr64_t	sectoff;	/* sector offset of partition */
+	daddr_t	nsects;		/* number of sectors in partition */
+	daddr_t	sectoff;	/* sector offset of partition */
 	int	totwrt;		/* total number of sectors left to write */
 	int	nwrt;		/* current number of sectors to write */
 	struct scsi_xfer *xs;	/* ... convenience */
diff --git a/sys/scsi/sdvar.h b/sys/scsi/sdvar.h
index 220190965ad..a69d8923051 100644
--- a/sys/scsi/sdvar.h
+++ b/sys/scsi/sdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdvar.h,v 1.40 2012/12/19 19:52:11 kettenis Exp $	*/
+/*	$OpenBSD: sdvar.h,v 1.41 2013/06/11 16:42:17 deraadt Exp $	*/
 /*	$NetBSD: sdvar.h,v 1.7 1998/08/17 00:49:03 mycroft Exp $	*/
 
 /*-
@@ -65,7 +65,7 @@ struct sd_softc {
 		u_long	cyls;		/* number of cylinders */
 		u_long	sectors;	/* number of sectors/track */
 		u_long	secsize;	/* number of bytes/sector */
-		daddr64_t	disksize;	/* total number sectors */
+		daddr_t	disksize;	/* total number sectors */
 		u_int32_t	unmap_sectors;	/* maximum sectors/unmap */
 		u_int32_t	unmap_descs;	/* maximum descriptors/unmap */
 	} params;
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 804d147797a..1b12834525f 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.122 2013/06/06 14:00:44 krw Exp $	*/
+/*	$OpenBSD: st.c,v 1.123 2013/06/11 16:42:17 deraadt Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -2177,7 +2177,7 @@ done:
 }
 
 int
-stdump(dev_t dev, daddr64_t blkno, caddr_t va, size_t size)
+stdump(dev_t dev, daddr_t blkno, caddr_t va, size_t size)
 {
 
 	/* Not implemented. */