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

9 files changed, 24 insertions, 24 deletions

diff --git a/sys/arch/mvme68k/stand/bootst/dev_tape.c b/sys/arch/mvme68k/stand/bootst/dev_tape.c
index b2edf7b5747..9ea5166c83a 100644
--- a/sys/arch/mvme68k/stand/bootst/dev_tape.c
+++ b/sys/arch/mvme68k/stand/bootst/dev_tape.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_tape.c,v 1.3 2002/03/14 03:15:56 millert Exp $	*/
+/*	$OpenBSD: dev_tape.c,v 1.4 2011/03/13 00:13:53 deraadt Exp $	*/
 /*	$NetBSD: dev_tape.c,v 1.2 1995/10/17 22:58:20 gwr Exp $	*/
 
 /*
@@ -127,7 +127,7 @@ int
 tape_strategy(devdata, flag, dblk, size, buf, rsize)
 	void	*devdata;
 	int	flag;
-	daddr_t	dblk;
+	daddr32_t	dblk;
 	u_int	size;
 	char	*buf;
 	u_int	*rsize;
diff --git a/sys/arch/mvme68k/stand/bootst/dev_tape.h b/sys/arch/mvme68k/stand/bootst/dev_tape.h
index 9404db80701..6c3fc658be8 100644
--- a/sys/arch/mvme68k/stand/bootst/dev_tape.h
+++ b/sys/arch/mvme68k/stand/bootst/dev_tape.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: dev_tape.h,v 1.3 2002/03/14 01:26:38 millert Exp $	*/
+/*	$OpenBSD: dev_tape.h,v 1.4 2011/03/13 00:13:53 deraadt Exp $	*/
 
 
 int	tape_open(struct open_file *, ...);
 int	tape_close(struct open_file *);
-int	tape_strategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	tape_strategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int	tape_ioctl();
 
diff --git a/sys/arch/mvme68k/stand/bootst/rawfs.c b/sys/arch/mvme68k/stand/bootst/rawfs.c
index b119b419ab4..0243f66ff33 100644
--- a/sys/arch/mvme68k/stand/bootst/rawfs.c
+++ b/sys/arch/mvme68k/stand/bootst/rawfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rawfs.c,v 1.4 2006/01/16 18:03:54 deraadt Exp $	*/
+/*	$OpenBSD: rawfs.c,v 1.5 2011/03/13 00:13:53 deraadt Exp $	*/
 /*	$NetBSD: rawfs.c,v 1.1 1995/10/17 22:58:27 gwr Exp $	*/
 
 /*
@@ -51,7 +51,7 @@ extern int debug;
  * In-core open file.
  */
 struct file {
-	daddr_t		fs_nextblk;	/* block number to read next */
+	daddr32_t	fs_nextblk;	/* block number to read next */
 	int		fs_len;		/* amount left in f_buf */
 	char *		fs_ptr;		/* read pointer into f_buf */
 	char		fs_buf[RAWFS_BSIZE];
diff --git a/sys/arch/mvme68k/stand/bootxx/bootxx.c b/sys/arch/mvme68k/stand/bootxx/bootxx.c
index 57a963b4291..2050e7710fb 100644
--- a/sys/arch/mvme68k/stand/bootxx/bootxx.c
+++ b/sys/arch/mvme68k/stand/bootxx/bootxx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootxx.c,v 1.7 2003/08/20 00:24:43 deraadt Exp $ */
+/*	$OpenBSD: bootxx.c,v 1.8 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: bootxx.c,v 1.5 1995/10/13 21:44:57 gwr Exp $ */
 
 /*
@@ -67,7 +67,7 @@
  */
 int     	block_size = 512;	/* default */
 int     	block_count = MAXBLOCKNUM;	/* length of table */
-daddr_t 	block_table[MAXBLOCKNUM] = { 0 };
+daddr32_t 	block_table[MAXBLOCKNUM] = { 0 };
 
 extern		char *version;
 
diff --git a/sys/arch/mvme68k/stand/installboot/installboot.c b/sys/arch/mvme68k/stand/installboot/installboot.c
index fadceec218c..de66a3885dc 100644
--- a/sys/arch/mvme68k/stand/installboot/installboot.c
+++ b/sys/arch/mvme68k/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: installboot.c,v 1.14 2010/11/20 13:10:41 deraadt Exp $ */
+/*	$OpenBSD: installboot.c,v 1.15 2011/03/13 00:13:53 deraadt Exp $ */
 /*	$NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
 
 /*
@@ -65,13 +65,13 @@ struct nlist nl[] = {
 
 int *block_size_p;		/* block size var. in prototype image */
 int *block_count_p;		/* block count var. in prototype image */
-daddr_t	*block_table;	/* block number array in prototype image */
+daddr32_t	*block_table;	/* block number array in prototype image */
 int	maxblocknum;		/* size of this array */
 
 
 char		*loadprotoblocks(char *, long *);
 int		loadblocknums(char *, int);
-static void	devread(int, void *, daddr_t, size_t, char *);
+static void	devread(int, void *, daddr32_t, size_t, char *);
 static void	usage(void);
 int 		main(int, char *[]);
 static void     vid_to_disklabel(char *, char *);
@@ -244,7 +244,7 @@ loadprotoblocks(fname, size)
 	off = N_DATOFF(eh) - N_DATADDR(eh) - (eh.a_entry - N_TXTADDR(eh));
 	block_size_p  =   (int *) (bp + nl[X_BLOCK_SIZE ].n_value + off);
 	block_count_p =   (int *) (bp + nl[X_BLOCK_COUNT].n_value + off);
-	block_table = (daddr_t *) (bp + nl[X_BLOCK_TABLE].n_value + off);
+	block_table = (daddr32_t *) (bp + nl[X_BLOCK_TABLE].n_value + off);
 	maxblocknum = *block_count_p;
 
 	if (verbose) {
@@ -268,7 +268,7 @@ loadprotoblocks(fname, size)
 }
 
 static void
-devread(int fd, void *buf, daddr_t blk, size_t size, char *msg)
+devread(int fd, void *buf, daddr32_t blk, size_t size, char *msg)
 {
 	if (lseek(fd, dbtob(blk), SEEK_SET) != dbtob(blk))
 		err(1, "%s: devread: lseek", msg);
@@ -287,7 +287,7 @@ loadblocknums(char *boot, int devfd)
 	struct	statfs	statfsbuf;
 	struct fs	*fs;
 	char		*buf;
-	daddr_t		blk, *ap;
+	daddr32_t		blk, *ap;
 	struct ufs1_dinode	*ip;
 	int		ndb;
 
@@ -369,7 +369,7 @@ loadblocknums(char *boot, int devfd)
 	 */
 	blk = fsbtodb(fs, ip->di_ib[0]);
 	devread(devfd, buf, blk, fs->fs_bsize, "indirect block");
-	ap = (daddr_t *)buf;
+	ap = (daddr32_t *)buf;
 	for (; i < NINDIR(fs) && *ap && ndb; i++, ap++, ndb--) {
 		blk = fsbtodb(fs, *ap);
 		if (verbose)
diff --git a/sys/arch/mvme68k/stand/libsa/bugdev.c b/sys/arch/mvme68k/stand/libsa/bugdev.c
index a9c96b59569..03200d54e41 100644
--- a/sys/arch/mvme68k/stand/libsa/bugdev.c
+++ b/sys/arch/mvme68k/stand/libsa/bugdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bugdev.c,v 1.6 2010/04/23 15:25:20 jsing Exp $ */
+/*	$OpenBSD: bugdev.c,v 1.7 2011/03/13 00:13:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
@@ -97,12 +97,12 @@ devopen(struct open_file *f, const char *fname, char **file)
 #define BUG_SCALE (512/BUG_BLOCK_SIZE)
 
 int
-bugscstrategy(void *devdata, int func, daddr_t dblk, size_t size, void *buf,
+bugscstrategy(void *devdata, int func, daddr32_t dblk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct mvmeprom_dskio dio;
 	register struct bugsc_softc *pp = (struct bugsc_softc *)devdata;
-	daddr_t	blk = dblk + pp->poff;
+	daddr32_t	blk = dblk + pp->poff;
 
 	twiddle();
 
diff --git a/sys/arch/mvme68k/stand/libsa/libsa.h b/sys/arch/mvme68k/stand/libsa/libsa.h
index 3d355a73c1d..99473844a35 100644
--- a/sys/arch/mvme68k/stand/libsa/libsa.h
+++ b/sys/arch/mvme68k/stand/libsa/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.6 2003/08/20 00:26:00 deraadt Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.7 2011/03/13 00:13:53 deraadt Exp $	*/
 
 /*
  * libsa prototypes 
@@ -10,7 +10,7 @@
 int bugscopen(struct open_file *);
 int bugscclose(struct open_file *);
 int bugscioctl(struct open_file *, u_long, void *);
-int bugscstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int bugscstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 
 /* exec_mvme.c */
 void exec_mvme(char *, int);
diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.c b/sys/arch/mvme68k/stand/netboot/dev_net.c
index 77ce339a9d0..27ddf254540 100644
--- a/sys/arch/mvme68k/stand/netboot/dev_net.c
+++ b/sys/arch/mvme68k/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_net.c,v 1.8 2003/08/20 00:26:00 deraadt Exp $ */
+/*	$OpenBSD: dev_net.c,v 1.9 2011/03/13 00:13:53 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -202,7 +202,7 @@ net_ioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-net_strategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
+net_strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	return EIO;
diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.h b/sys/arch/mvme68k/stand/netboot/dev_net.h
index 3fac461175a..fd374dd6bd1 100644
--- a/sys/arch/mvme68k/stand/netboot/dev_net.h
+++ b/sys/arch/mvme68k/stand/netboot/dev_net.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: dev_net.h,v 1.4 2003/08/20 00:26:00 deraadt Exp $ */
+/*	$OpenBSD: dev_net.h,v 1.5 2011/03/13 00:13:53 deraadt Exp $ */
 
 int	net_open(struct open_file *, char *);
 int	net_close(struct open_file *);
 int	net_ioctl(struct open_file *, u_long, void *);
-int	net_strategy(void *, int, daddr_t, size_t, void *, size_t *);
+int	net_strategy(void *, int, daddr32_t, size_t, void *, size_t *);
 
 void	machdep_common_ether(u_char *);