Change daddr_t to daddr32_t. The bootblocks on our architectures only

do 32-bit block spanning.  If later on we get some that can/should do
64-bit, that can be done now using daddr64_t (but of course, we are taking
this step to finalize the daddr_t 64-bit conversion).
ok miod krw

10 files changed, 33 insertions, 33 deletions

diff --git a/sys/arch/vax/boot/boot/conf.c b/sys/arch/vax/boot/boot/conf.c
index 544d19ae36c..ec6a3777ddb 100644
--- a/sys/arch/vax/boot/boot/conf.c
+++ b/sys/arch/vax/boot/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.4 2008/08/18 23:20:44 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.5 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: conf.c,v 1.10 2000/06/15 19:53:23 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -47,7 +47,7 @@
 
 #include "vaxstand.h"
 
-static int nostrategy(void *, int, daddr_t, size_t, void *, size_t *);
+static int nostrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 
 struct	devsw devsw[]={
 	SADEV("hp",hpstrategy, hpopen, nullsys, noioctl),
@@ -99,7 +99,7 @@ struct fs_ops file_system[] = {
 int nfsys = (sizeof(file_system) / sizeof(struct fs_ops));
 
 int
-nostrategy(void *f, int func, daddr_t dblk,
+nostrategy(void *f, int func, daddr32_t dblk,
     size_t size, void *buf, size_t *rsize)
 {
 	*rsize = size;
diff --git a/sys/arch/vax/boot/boot/ctu.c b/sys/arch/vax/boot/boot/ctu.c
index a10824dcf85..70654e2e905 100644
--- a/sys/arch/vax/boot/boot/ctu.c
+++ b/sys/arch/vax/boot/boot/ctu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ctu.c,v 1.4 2003/08/15 23:16:30 deraadt Exp $ */
+/*	$OpenBSD: ctu.c,v 1.5 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: ctu.c,v 1.3 2000/05/20 13:30:03 ragge Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -80,7 +80,7 @@ ctuopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
 }
 
 int
-ctustrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize)
+ctustrategy(void *f, int func, daddr32_t dblk, size_t size, void *buf, size_t *rsize)
 {
 	struct rsp *rsp = (struct rsp *)tu_sc.sc_rsp;
 
diff --git a/sys/arch/vax/boot/boot/hp.c b/sys/arch/vax/boot/boot/hp.c
index a45e4ae3687..c7f084a6f99 100644
--- a/sys/arch/vax/boot/boot/hp.c
+++ b/sys/arch/vax/boot/boot/hp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hp.c,v 1.2 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: hp.c,v 1.3 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: hp.c,v 1.5 2000/07/19 00:58:25 matt Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -111,7 +111,7 @@ hpopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
 }
 
 int
-hpstrategy(void *f, int func, daddr_t dblk,
+hpstrategy(void *f, int func, daddr32_t dblk,
     size_t size, void *buf, size_t *rsize)
 {
 	unsigned int pfnum, mapnr, nsize, bn, cn, sn, tn;
diff --git a/sys/arch/vax/boot/boot/mfm.c b/sys/arch/vax/boot/boot/mfm.c
index b2af22aa847..5a3eb017a1f 100644
--- a/sys/arch/vax/boot/boot/mfm.c
+++ b/sys/arch/vax/boot/boot/mfm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mfm.c,v 1.4 2003/08/15 23:16:30 deraadt Exp $	*/
+/*	$OpenBSD: mfm.c,v 1.5 2011/03/13 00:13:53 deraadt Exp $	*/
 /*	$NetBSD: mfm.c,v 1.4 2001/07/26 22:55:13 wiz Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -91,8 +91,8 @@ static int mfm_rxprepare(void);
 static int mfm_command(int cmd);
 static int mfm_rxselect(int unit);
 static int mfm_rdselect(int unit);
-static int mfm_rxstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize);
-static int mfm_rdstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize);
+static int mfm_rxstrategy(void *f, int func, daddr32_t dblk, size_t size, void *buf, size_t *rsize);
+static int mfm_rdstrategy(void *f, int func, daddr32_t dblk, size_t size, void *buf, size_t *rsize);
 /*
  * we have to wait 0.7 usec between two accesses to any of the
  * dkc-registers, on a VS2000 with 1 MIPS, this is roughly one
@@ -452,7 +452,7 @@ mfmopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
 }
 
 int
-mfm_rxstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize)
+mfm_rxstrategy(void *f, int func, daddr32_t dblk, size_t size, void *buf, size_t *rsize)
 {
 	struct mfm_softc *msc = f;
 	struct disklabel *lp;
@@ -538,7 +538,7 @@ mfm_rxstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *
 }
 
 int
-mfm_rdstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize)
+mfm_rdstrategy(void *f, int func, daddr32_t dblk, size_t size, void *buf, size_t *rsize)
 {
 	struct mfm_softc *msc = f;
 	struct disklabel *lp;
@@ -630,7 +630,7 @@ mfm_rdstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *
 }
 
 int
-mfmstrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize)
+mfmstrategy(void *f, int func, daddr32_t dblk, size_t size, void *buf, size_t *rsize)
 {
 	struct mfm_softc *msc = f;
 	int	res = -1;
diff --git a/sys/arch/vax/boot/boot/ra.c b/sys/arch/vax/boot/boot/ra.c
index 0bb3f748b21..c7242cf4f07 100644
--- a/sys/arch/vax/boot/boot/ra.c
+++ b/sys/arch/vax/boot/boot/ra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ra.c,v 1.3 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: ra.c,v 1.4 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: ra.c,v 1.11 2002/06/04 15:13:55 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -258,7 +258,7 @@ igen:	uda.uda_cmd.mscp_opcode = cmd;
 }
 
 int
-rastrategy(void *f, int func, daddr_t dblk,
+rastrategy(void *f, int func, daddr32_t dblk,
     size_t size, void *buf, size_t *rsize)
 {
 	u_int	pfnum, mapnr, nsize;
diff --git a/sys/arch/vax/boot/boot/rom.c b/sys/arch/vax/boot/boot/rom.c
index f6fb3a7b271..31ebeb7b314 100644
--- a/sys/arch/vax/boot/boot/rom.c
+++ b/sys/arch/vax/boot/boot/rom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rom.c,v 1.4 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: rom.c,v 1.5 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: rom.c,v 1.3 2000/07/19 00:58:25 matt Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -93,7 +93,7 @@ int
 romstrategy (f, func, dblk, size, buf, rsize)
 	void *f;
 	int func;
-	daddr_t dblk;
+	daddr32_t dblk;
 	size_t size;
 	void *buf;
 	size_t *rsize;
diff --git a/sys/arch/vax/boot/boot/tmscp.c b/sys/arch/vax/boot/boot/tmscp.c
index ff466c8c15b..4c72cad1711 100644
--- a/sys/arch/vax/boot/boot/tmscp.c
+++ b/sys/arch/vax/boot/boot/tmscp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tmscp.c,v 1.3 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: tmscp.c,v 1.4 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: tmscp.c,v 1.3 1999/06/30 18:19:26 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -160,7 +160,7 @@ command(cmd, arg)
 tmscpstrategy(ra, func, dblk, size, buf, rsize)
 	struct ra_softc *ra;
 	int func;
-	daddr_t	dblk;
+	daddr32_t	dblk;
 	char *buf;
 	u_int size, *rsize;
 {
diff --git a/sys/arch/vax/boot/boot/vaxstand.h b/sys/arch/vax/boot/boot/vaxstand.h
index 8d48a376189..867d7ba9ebf 100644
--- a/sys/arch/vax/boot/boot/vaxstand.h
+++ b/sys/arch/vax/boot/boot/vaxstand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vaxstand.h,v 1.1 2002/06/11 09:36:23 hugh Exp $ */
+/*	$OpenBSD: vaxstand.h,v 1.2 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: vaxstand.h,v 1.5 2000/06/15 19:53:23 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -38,7 +38,7 @@ extern int csrbase, nexaddr;
 /* devsw type definitions, used in bootxx and conf */
 #define SADEV(name,strategy,open,close,ioctl) \
 	{ (char *)name, \
-	 (int(*)(void *, int ,daddr_t , size_t, void *, size_t *))strategy, \
+	 (int(*)(void *, int, daddr32_t, size_t, void *, size_t *))strategy, \
 	 (int(*)(struct open_file *, ...))open, \
 	 (int(*)(struct open_file *))close, \
 	 (int(*)(struct open_file *,u_long, void *))ioctl}
@@ -58,19 +58,19 @@ int net_devinit(struct open_file *f, struct netif_driver *drv, u_char *eaddr);
 
 /* device calls */
 int	raopen(struct open_file *, int, int, int, int),
-	    rastrategy(void *, int, daddr_t, size_t, void *, size_t *);
+	    rastrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	hpopen(struct open_file *, int, int, int, int),
-	    hpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+	    hpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	ctuopen(struct open_file *, int, int, int, int),
-	    ctustrategy(void *, int, daddr_t, size_t, void *, size_t *);
+	    ctustrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	tmscpopen(struct open_file *, int, int, int, int),
-	    tmscpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+	    tmscpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	romopen(struct open_file *, int, int, int, int),
-	    romstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+	    romstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	mfmopen(struct open_file *, int, int, int, int),
-	    mfmstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+	    mfmstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	sdopen(struct open_file *),
-	    sdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+	    sdstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	leopen(struct open_file *, int, int, int, int),
 	    leclose(struct open_file *);
 int	qeopen(struct open_file *, int, int, int, int),
diff --git a/sys/arch/vax/boot/common/vaxstand.h b/sys/arch/vax/boot/common/vaxstand.h
index 86cdb8bffdc..b11d898b0b3 100644
--- a/sys/arch/vax/boot/common/vaxstand.h
+++ b/sys/arch/vax/boot/common/vaxstand.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vaxstand.h,v 1.1 2000/04/27 02:26:26 bjc Exp $ */
+/*	$OpenBSD: vaxstand.h,v 1.2 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: vaxstand.h,v 1.1 1999/03/06 16:36:05 ragge Exp $ */
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -46,7 +46,7 @@ extern dev_t bootdev;
 /* devsw type definitions, used in bootxx and conf */
 #define SADEV(name,strategy,open,close,ioctl) \
         { (char *)name, \
-         (int(*)(void *, int ,daddr_t , size_t, void *, size_t *))strategy, \
+         (int(*)(void *, int, daddr32_t, size_t, void *, size_t *))strategy, \
          (int(*)(struct open_file *, ...))open, \
          (int(*)(struct open_file *))close, \
          (int(*)(struct open_file *,u_long, void *))ioctl}
diff --git a/sys/arch/vax/boot/xxboot/bootxx.c b/sys/arch/vax/boot/xxboot/bootxx.c
index 5bcf131282b..debf2c0ee4f 100644
--- a/sys/arch/vax/boot/xxboot/bootxx.c
+++ b/sys/arch/vax/boot/xxboot/bootxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootxx.c,v 1.10 2003/08/15 23:16:30 deraadt Exp $ */
+/*	$OpenBSD: bootxx.c,v 1.11 2011/03/13 00:13:53 deraadt Exp $ */
 /* $NetBSD: bootxx.c,v 1.16 2002/03/29 05:45:08 matt Exp $ */
 
 /*-
@@ -208,7 +208,7 @@ struct rom_softc {
        int unit;
 } rom_softc;
 
-int    romstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int    romstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int romopen(struct open_file *, int, int, int, int);
 struct devsw   devsw[] = {
        SADEV("rom", romstrategy, romopen, nullsys, noioctl),
@@ -273,7 +273,7 @@ int
 romstrategy(sc, func, dblk, size, buf, rsize)
 	void    *sc;
 	int     func;
-	daddr_t dblk;
+	daddr32_t dblk;
 	size_t	size;
 	void    *buf;
 	size_t	*rsize;