Use daddr_t and not daddr32_t in boot media.

At a minimum, amd64/i386 should now boot from 4TB GPT formatted disks.

More daddr32_t terminations with extreme prejudice to follow.

Tested by various, in snaps for a few days.

ok deraadt@

4 files changed, 9 insertions, 9 deletions

diff --git a/sys/arch/loongson/stand/boot/conf.c b/sys/arch/loongson/stand/boot/conf.c
index b231f521581..7a3b39a27ea 100644
--- a/sys/arch/loongson/stand/boot/conf.c
+++ b/sys/arch/loongson/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.15 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.16 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -40,7 +40,7 @@
 #include <lib/libsa/ufs2.h>
 #include <lib/libsa/cd9660.h>
 
-const char version[] = "1.2";
+const char version[] = "1.3";
 #if 0	/* network code not compiled in */
 int	debug = 0;
 #endif
diff --git a/sys/arch/loongson/stand/boot/dev.c b/sys/arch/loongson/stand/boot/dev.c
index ce4e4804358..5ae45e8a10c 100644
--- a/sys/arch/loongson/stand/boot/dev.c
+++ b/sys/arch/loongson/stand/boot/dev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev.c,v 1.10 2020/05/27 14:45:56 visa Exp $	*/
+/*	$OpenBSD: dev.c,v 1.11 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -66,7 +66,7 @@ struct pmon_iodata {
 int	pmon_getdisklabel(struct pmon_iodata *pi);
 
 int
-pmon_iostrategy(void *f, int rw, daddr32_t dblk, size_t size, void *buf,
+pmon_iostrategy(void *f, int rw, daddr_t dblk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct pmon_iodata *pi = (struct pmon_iodata *)f;
diff --git a/sys/arch/loongson/stand/boot/libsa.h b/sys/arch/loongson/stand/boot/libsa.h
index 2dea425026d..d375daffc54 100644
--- a/sys/arch/loongson/stand/boot/libsa.h
+++ b/sys/arch/loongson/stand/boot/libsa.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: libsa.h,v 1.6 2019/04/10 04:17:35 deraadt Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.7 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -41,14 +41,14 @@ void	pmon_cnputc(dev_t, int);
 /*
  * PMON I/O
  */
-int	pmon_iostrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	pmon_iostrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	pmon_ioopen(struct open_file *, ...);
 int	pmon_ioclose(struct open_file *);
 
 /*
  * INITRD I/O
  */
-int	rd_iostrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	rd_iostrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	rd_ioopen(struct open_file *, ...);
 int	rd_ioclose(struct open_file *);
 int	rd_isvalid(void);
diff --git a/sys/arch/loongson/stand/boot/rd.c b/sys/arch/loongson/stand/boot/rd.c
index c5cd107aa42..e82e5337c26 100644
--- a/sys/arch/loongson/stand/boot/rd.c
+++ b/sys/arch/loongson/stand/boot/rd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rd.c,v 1.4 2013/03/24 19:20:35 deraadt Exp $	*/
+/*	$OpenBSD: rd.c,v 1.5 2020/12/09 18:10:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2010 Miodrag Vallat.
@@ -28,7 +28,7 @@ static	off_t rdoffs;
  */
 
 int
-rd_iostrategy(void *f, int rw, daddr32_t dblk, size_t size, void *buf,
+rd_iostrategy(void *f, int rw, daddr_t dblk, size_t size, void *buf,
     size_t *rsize)
 {
 	/* never invoked directly */