4 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/hp300/stand/common/ct.c b/sys/arch/hp300/stand/common/ct.c
index c0c04c05b56..8db58fee3b7 100644
--- a/sys/arch/hp300/stand/common/ct.c
+++ b/sys/arch/hp300/stand/common/ct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ct.c,v 1.5 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: ct.c,v 1.6 2011/03/13 00:13:52 deraadt Exp $	*/
 /*	$NetBSD: ct.c,v 1.9 1996/10/14 07:29:57 thorpej Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ int	ctident(int, int);
 int	ctinit(int, int);
 int	ctopen(struct open_file *, int, int, int);
 int	ctpunit(int, int, int *);
-int	ctstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	ctstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 
 char ctio_buf[MAXBSIZE];
 
@@ -211,7 +211,7 @@ ctclose(struct open_file *f)
 }
 
 int
-ctstrategy(void *devdata, int func, daddr_t dblk, size_t size, void *v_buf,
+ctstrategy(void *devdata, int func, daddr32_t dblk, size_t size, void *v_buf,
     size_t *rsize)
 {
 	struct ct_softc *rs = devdata;
diff --git a/sys/arch/hp300/stand/common/hd.c b/sys/arch/hp300/stand/common/hd.c
index b1576ff95b4..3f46e70b241 100644
--- a/sys/arch/hp300/stand/common/hd.c
+++ b/sys/arch/hp300/stand/common/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.6 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: hd.c,v 1.7 2011/03/13 00:13:52 deraadt Exp $	*/
 /*	$NetBSD: rd.c,v 1.11 1996/12/21 21:34:40 thorpej Exp $	*/
 
 /*
@@ -110,7 +110,7 @@ int	hdident(int, int);
 int	hdinit(int, int);
 int	hdopen(struct open_file *, int, int, int);
 void	hdreset(int, int);
-int	hdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	hdstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 
 int
 hdinit(int ctlr, int unit)
@@ -287,14 +287,14 @@ hdclose(struct open_file *f)
 }
 
 int
-hdstrategy(void *devdata, int func, daddr_t dblk, size_t size, void *v_buf,
+hdstrategy(void *devdata, int func, daddr32_t dblk, size_t size, void *v_buf,
     size_t *rsize)
 {
 	char *buf = v_buf;
 	struct hd_softc *rs = devdata;
 	int ctlr = rs->sc_ctlr;
 	int unit = rs->sc_unit;
-	daddr_t blk;
+	daddr32_t blk;
 	char stat;
 
 	if (size == 0)
diff --git a/sys/arch/hp300/stand/common/scsi.c b/sys/arch/hp300/stand/common/scsi.c
index ee6b0cddf8a..bd9384aa6b1 100644
--- a/sys/arch/hp300/stand/common/scsi.c
+++ b/sys/arch/hp300/stand/common/scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scsi.c,v 1.6 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: scsi.c,v 1.7 2011/03/13 00:13:52 deraadt Exp $	*/
 /*	$NetBSD: scsi.c,v 1.7 1997/01/30 10:32:57 thorpej Exp $	*/
 
 /*
@@ -391,7 +391,7 @@ scsi_read_capacity(int ctlr, int slave, u_char *buf, u_int len)
 }
 
 int
-scsi_tt_read(int ctlr, int slave, u_char *buf, u_int len, daddr_t blk,
+scsi_tt_read(int ctlr, int slave, u_char *buf, u_int len, daddr32_t blk,
     u_int nblk)
 {
 	struct scsi_softc *hs = &scsi_softc[ctlr];
@@ -410,7 +410,7 @@ scsi_tt_read(int ctlr, int slave, u_char *buf, u_int len, daddr_t blk,
 }
 
 int
-scsi_tt_write(int ctlr, int slave, u_char *buf, u_int len, daddr_t blk,
+scsi_tt_write(int ctlr, int slave, u_char *buf, u_int len, daddr32_t blk,
     u_int nblk)
 {
 	struct scsi_softc *hs = &scsi_softc[ctlr];
diff --git a/sys/arch/hp300/stand/common/sd.c b/sys/arch/hp300/stand/common/sd.c
index f73f8b4b758..fb69a9f52d0 100644
--- a/sys/arch/hp300/stand/common/sd.c
+++ b/sys/arch/hp300/stand/common/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.6 2006/08/17 06:31:10 miod Exp $	*/
+/*	$OpenBSD: sd.c,v 1.7 2011/03/13 00:13:52 deraadt Exp $	*/
 /*	$NetBSD: sd.c,v 1.9 1996/12/21 21:34:41 thorpej Exp $	*/
 
 /*
@@ -75,7 +75,7 @@ int	sdgetinfo(struct sd_softc *);
 int	sdinit(int, int);
 int	sdopen(struct open_file *, int, int, int);
 void	sdreset(int, int);
-int	sdstrategy(struct sd_softc *, int, daddr_t, size_t, void *, size_t *);
+int	sdstrategy(struct sd_softc *, int, daddr32_t, size_t, void *, size_t *);
 
 int
 sdinit(int ctlr, int unit)
@@ -215,14 +215,14 @@ sdclose(struct open_file *f)
 }
 
 int
-sdstrategy(struct sd_softc *ss, int func, daddr_t dblk, size_t size,
+sdstrategy(struct sd_softc *ss, int func, daddr32_t dblk, size_t size,
     void *v_buf, size_t *rsize)
 {
 	char *buf = v_buf;
 	int ctlr = ss->sc_ctlr;
 	int unit = ss->sc_unit;
 	u_int nblk = size >> ss->sc_blkshift;
-	daddr_t blk;
+	daddr32_t blk;
 	char stat;
 
 	if (size == 0)