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

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/arch/socppc/stand/boot/libsa.h b/sys/arch/socppc/stand/boot/libsa.h
index eabb1700485..e283b7d71a7 100644
--- a/sys/arch/socppc/stand/boot/libsa.h
+++ b/sys/arch/socppc/stand/boot/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.1 2008/05/10 20:06:26 kettenis Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.2 2011/03/13 00:13:53 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2008 Mark Kettenis
@@ -37,6 +37,6 @@ void com_putc(dev_t, int);
 /*
  * wd
  */
-int wdstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int wdstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int wdopen(struct open_file *, ...);
 int wdclose(struct open_file *);
diff --git a/sys/arch/socppc/stand/boot/wd.c b/sys/arch/socppc/stand/boot/wd.c
index bb93e595d05..cabebd4dd5c 100644
--- a/sys/arch/socppc/stand/boot/wd.c
+++ b/sys/arch/socppc/stand/boot/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.4 2010/04/23 15:25:21 jsing Exp $	*/
+/*	$OpenBSD: wd.c,v 1.5 2011/03/13 00:13:53 deraadt Exp $	*/
 /*	$NetBSD: wd.c,v 1.5 2005/12/11 12:17:06 christos Exp $	*/
 
 /*-
@@ -281,13 +281,13 @@ int
 wdstrategy(f, rw, dblk, size, buf, rsize)
 	void *f;
 	int rw;
-	daddr_t dblk;
+	daddr32_t dblk;
 	size_t size;
 	void *buf;
 	size_t *rsize;
 {
 	int i, nsect;
-	daddr_t blkno;
+	daddr32_t blkno;
 	struct wd_softc *wd = f;
 
 	if (size == 0)
diff --git a/sys/arch/socppc/stand/boot/wdc.c b/sys/arch/socppc/stand/boot/wdc.c
index 28ac9ca8d8d..3a10c107a06 100644
--- a/sys/arch/socppc/stand/boot/wdc.c
+++ b/sys/arch/socppc/stand/boot/wdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdc.c,v 1.3 2009/09/07 21:16:57 dms Exp $	*/
+/*	$OpenBSD: wdc.c,v 1.4 2011/03/13 00:13:53 deraadt Exp $	*/
 /*	$NetBSD: wdc.c,v 1.7 2005/12/11 12:17:06 christos Exp $	*/
 
 /*-
@@ -334,7 +334,7 @@ int
 wdc_exec_read(wd, cmd, blkno, data)
 	struct wd_softc *wd;
 	u_int8_t cmd;
-	daddr_t blkno;
+	daddr32_t blkno;
 	void *data;
 {
 	int error;
diff --git a/sys/arch/socppc/stand/boot/wdvar.h b/sys/arch/socppc/stand/boot/wdvar.h
index e99319aff4e..aa7b997df71 100644
--- a/sys/arch/socppc/stand/boot/wdvar.h
+++ b/sys/arch/socppc/stand/boot/wdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wdvar.h,v 1.2 2009/09/07 21:16:57 dms Exp $	*/
+/*	$OpenBSD: wdvar.h,v 1.3 2011/03/13 00:13:53 deraadt Exp $	*/
 /*	$NetBSD: wdvar.h,v 1.6 2005/12/11 12:17:06 christos Exp $	*/
 
 /*-
@@ -131,7 +131,7 @@ struct wdc_command {
 int	wdc_init		(struct wd_softc*, u_int);
 int	wdccommand		(struct wd_softc*, struct wdc_command*);
 int	wdccommandext		(struct wd_softc*, struct wdc_command*);
-int	wdc_exec_read		(struct wd_softc*, u_int8_t, daddr_t, void*);
+int	wdc_exec_read		(struct wd_softc*, u_int8_t, daddr32_t, void*);
 int	wdc_exec_identify	(struct wd_softc*, void*);