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@

8 files changed, 18 insertions, 18 deletions

diff --git a/sys/arch/arm64/stand/efiboot/conf.c b/sys/arch/arm64/stand/efiboot/conf.c
index f4d3e0dd3cb..2de9bccc576 100644
--- a/sys/arch/arm64/stand/efiboot/conf.c
+++ b/sys/arch/arm64/stand/efiboot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.30 2020/05/26 14:00:42 deraadt Exp $	*/
+/*	$OpenBSD: conf.c,v 1.31 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -46,7 +46,7 @@
 #include "efipxe.h"
 #include "softraid_arm64.h"
 
-const char version[] = "1.2";
+const char version[] = "1.3";
 int	debug = 0;
 
 struct fs_ops file_system[] = {
diff --git a/sys/arch/arm64/stand/efiboot/disk.h b/sys/arch/arm64/stand/efiboot/disk.h
index 8e5fd1d0541..6d6989e8683 100644
--- a/sys/arch/arm64/stand/efiboot/disk.h
+++ b/sys/arch/arm64/stand/efiboot/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.2 2019/01/31 14:35:06 patrick Exp $ */
+/* $OpenBSD: disk.h,v 1.3 2020/12/09 18:10:18 krw Exp $ */
 
 #ifndef _DISK_H
 #define _DISK_H
@@ -20,7 +20,7 @@ struct diskinfo {
 #define DISKINFO_FLAG_GOODLABEL		(1 << 0)
 
 	int (*diskio)(int, struct diskinfo *, u_int, int, void *);
-	int (*strategy)(void *, int, daddr32_t, size_t, void *, size_t *);
+	int (*strategy)(void *, int, daddr_t, size_t, void *, size_t *);
 
 	TAILQ_ENTRY(diskinfo) list;
 };
diff --git a/sys/arch/arm64/stand/efiboot/efidev.c b/sys/arch/arm64/stand/efiboot/efidev.c
index dbbbb1c313a..b79d6bac071 100644
--- a/sys/arch/arm64/stand/efiboot/efidev.c
+++ b/sys/arch/arm64/stand/efiboot/efidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.c,v 1.5 2019/07/29 22:33:26 yasuoka Exp $	*/
+/*	$OpenBSD: efidev.c,v 1.6 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2015 YASUOKA Masahiko <yasuoka@yasuoka.net>
@@ -521,7 +521,7 @@ efiopen(struct open_file *f, ...)
 }
 
 int
-efistrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+efistrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/arm64/stand/efiboot/efidev.h b/sys/arch/arm64/stand/efiboot/efidev.h
index e7e4e458adb..6f8ee047b90 100644
--- a/sys/arch/arm64/stand/efiboot/efidev.h
+++ b/sys/arch/arm64/stand/efiboot/efidev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efidev.h,v 1.2 2019/01/31 14:35:06 patrick Exp $	*/
+/*	$OpenBSD: efidev.h,v 1.3 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -31,6 +31,6 @@
 /* efidev.c */
 void		 efid_init(struct diskinfo *, void *handle);
 int		 efiopen(struct open_file *, ...);
-int		 efistrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int		 efistrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int		 eficlose(struct open_file *);
 int		 efiioctl(struct open_file *, u_long, void *);
diff --git a/sys/arch/arm64/stand/efiboot/efipxe.c b/sys/arch/arm64/stand/efiboot/efipxe.c
index 9acf452ab8b..f8f2384c3ba 100644
--- a/sys/arch/arm64/stand/efiboot/efipxe.c
+++ b/sys/arch/arm64/stand/efiboot/efipxe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.c,v 1.8 2020/05/18 12:14:33 patrick Exp $	*/
+/*	$OpenBSD: efipxe.c,v 1.9 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -366,7 +366,7 @@ tftpioctl(struct open_file *f, u_long cmd, void *data)
 }
 
 int
-tftpstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+tftpstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
 	size_t *rsize)
 {
 	return EOPNOTSUPP;
diff --git a/sys/arch/arm64/stand/efiboot/efipxe.h b/sys/arch/arm64/stand/efiboot/efipxe.h
index 70c91b6677f..fa491a9bea1 100644
--- a/sys/arch/arm64/stand/efiboot/efipxe.h
+++ b/sys/arch/arm64/stand/efiboot/efipxe.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: efipxe.h,v 1.2 2018/03/31 17:43:53 patrick Exp $	*/
+/*	$OpenBSD: efipxe.h,v 1.3 2020/12/09 18:10:18 krw Exp $	*/
 /*
  * Copyright (c) 2017 Patrick Wildt <patrick@blueri.se>
  *
@@ -30,4 +30,4 @@ int	 mtftp_readdir(struct open_file *, char *);
 int	 tftpopen(struct open_file *, ...);
 int	 tftpclose(struct open_file *);
 int	 tftpioctl(struct open_file *, u_long, void *);
-int	 tftpstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	 tftpstrategy(void *, int, daddr_t, size_t, void *, size_t *);
diff --git a/sys/arch/arm64/stand/efiboot/softraid_arm64.c b/sys/arch/arm64/stand/efiboot/softraid_arm64.c
index 4b36b835948..243543904fd 100644
--- a/sys/arch/arm64/stand/efiboot/softraid_arm64.c
+++ b/sys/arch/arm64/stand/efiboot/softraid_arm64.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_arm64.c,v 1.1 2019/01/31 14:35:06 patrick Exp $	*/
+/*	$OpenBSD: softraid_arm64.c,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -303,7 +303,7 @@ srprobe(void)
 }
 
 int
-sr_strategy(struct sr_boot_volume *bv, int rw, daddr32_t blk, size_t size,
+sr_strategy(struct sr_boot_volume *bv, int rw, daddr_t blk, size_t size,
     void *buf, size_t *rsize)
 {
 	struct diskinfo *sr_dip, *dip;
@@ -637,7 +637,7 @@ sropen(struct open_file *f, ...)
 }
 
 int
-srstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
+srstrategy(void *devdata, int rw, daddr_t blk, size_t size, void *buf,
     size_t *rsize)
 {
 	struct diskinfo *dip = (struct diskinfo *)devdata;
diff --git a/sys/arch/arm64/stand/efiboot/softraid_arm64.h b/sys/arch/arm64/stand/efiboot/softraid_arm64.h
index cb480341871..55cc00f46da 100644
--- a/sys/arch/arm64/stand/efiboot/softraid_arm64.h
+++ b/sys/arch/arm64/stand/efiboot/softraid_arm64.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: softraid_arm64.h,v 1.1 2019/01/31 14:35:06 patrick Exp $	*/
+/*	$OpenBSD: softraid_arm64.h,v 1.2 2020/12/09 18:10:18 krw Exp $	*/
 
 /*
  * Copyright (c) 2012 Joel Sing <jsing@openbsd.org>
@@ -22,10 +22,10 @@
 void	srprobe(void);
 
 const char *sr_getdisklabel(struct sr_boot_volume *, struct disklabel *);
-int	sr_strategy(struct sr_boot_volume *, int, daddr32_t, size_t,
+int	sr_strategy(struct sr_boot_volume *, int, daddr_t, size_t,
 	    void *, size_t *);
 int	sropen(struct open_file *, ...);
-int	srstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
+int	srstrategy(void *, int, daddr_t, size_t, void *, size_t *);
 int	srdiskio(int, struct diskinfo *, u_int, int, void *);
 int	srclose(struct open_file *);
 int	srioctl(struct open_file *, u_long, void *);