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, 11 insertions, 11 deletions

diff --git a/sys/arch/amd64/stand/libsa/biosdev.c b/sys/arch/amd64/stand/libsa/biosdev.c
index 2a111a9c918..c44c84da20b 100644
--- a/sys/arch/amd64/stand/libsa/biosdev.c
+++ b/sys/arch/amd64/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.11 2011/03/11 21:08:25 krw Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.12 2011/03/13 00:13:52 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -243,7 +243,7 @@ EDD_rw(int rw, int dev, u_int64_t daddr, u_int32_t nblk, void *buf)
  * Read given sector, handling retry/errors/etc.
  */
 int
-biosd_io(int rw, bios_diskinfo_t *bd, daddr_t off, int nsect, void *buf)
+biosd_io(int rw, bios_diskinfo_t *bd, daddr32_t off, int nsect, void *buf)
 {
 	int dev = bd->bios_number;
 	int j, error;
@@ -436,7 +436,7 @@ bios_getdisklabel(bios_diskinfo_t *bd, struct disklabel *label)
 		printf("loading disklabel @ %u\n", off);
 #endif
 	/* read disklabel */
-	error = biosd_io(F_READ, bd, (daddr_t)start, 1, buf);
+	error = biosd_io(F_READ, bd, (daddr32_t)start, 1, buf);
 
 	if(error)
 		return("failed to read disklabel");
@@ -645,7 +645,7 @@ biosdisk_errno(u_int error)
 }
 
 int
-biosstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
+biosstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/amd64/stand/libsa/biosdev.h b/sys/arch/amd64/stand/libsa/biosdev.h
index 4f2287d7948..765ba0d0e59 100644
--- a/sys/arch/amd64/stand/libsa/biosdev.h
+++ b/sys/arch/amd64/stand/libsa/biosdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.h,v 1.2 2007/04/28 19:23:10 deraadt Exp $	*/
+/*	$OpenBSD: biosdev.h,v 1.3 2011/03/13 00:13:52 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -44,12 +44,12 @@ struct open_file;
 
 /* biosdev.c */
 extern const char *biosdevs[];
-int biosstrategy(void *, int, daddr_t, size_t, void *, size_t *);
+int biosstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
 int biosopen(struct open_file *, ...);
 int biosclose(struct open_file *);
 int biosioctl(struct open_file *, u_long, void *);
 int bios_getdiskinfo(int, bios_diskinfo_t *);
-int biosd_io(int, bios_diskinfo_t *, daddr_t, int, void *);
+int biosd_io(int, bios_diskinfo_t *, daddr32_t, int, void *);
 const char * bios_getdisklabel(bios_diskinfo_t *, struct disklabel *);
 
 /* diskprobe.c */
diff --git a/sys/arch/amd64/stand/libsa/pxe_net.c b/sys/arch/amd64/stand/libsa/pxe_net.c
index 0dacee7e554..1a398d61bc3 100644
--- a/sys/arch/amd64/stand/libsa/pxe_net.c
+++ b/sys/arch/amd64/stand/libsa/pxe_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.c,v 1.2 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: pxe_net.c,v 1.3 2011/03/13 00:13:52 deraadt Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.4 2003/03/12 13:15:08 drochner Exp $	*/
 
 /*-
@@ -144,7 +144,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/amd64/stand/libsa/pxe_net.h b/sys/arch/amd64/stand/libsa/pxe_net.h
index 6749d6bd7f2..49efe81560d 100644
--- a/sys/arch/amd64/stand/libsa/pxe_net.h
+++ b/sys/arch/amd64/stand/libsa/pxe_net.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxe_net.h,v 1.2 2008/06/26 05:42:09 ray Exp $	*/
+/*	$OpenBSD: pxe_net.h,v 1.3 2011/03/13 00:13:52 deraadt Exp $	*/
 /*	$NetBSD$	*/
 
 /*-
@@ -34,4 +34,4 @@
 int	net_open(struct open_file *, ...);
 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 *);