Make bus_addr_t and bus_size_t u_long types, instead of either uint32_t or

uint64_t, depending upon the platform; this makes the declaration of these
types consistent accross all our supported platform, and we do not intend
to support a platform where bus_addr_t could be larger than the size of the
cpu register. Requested by deraadt@ during s2k11

7 files changed, 27 insertions, 27 deletions

diff --git a/sys/arch/aviion/include/bus.h b/sys/arch/aviion/include/bus.h
index 87439d7b0d7..b95b396e839 100644
--- a/sys/arch/aviion/include/bus.h
+++ b/sys/arch/aviion/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.4 2011/03/23 16:54:34 pirofti Exp $	*/
+/*	$OpenBSD: bus.h,v 1.5 2011/09/27 20:47:30 miod Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB Sweden.  All rights reserved.
@@ -42,12 +42,12 @@
  * bus_space implementation
  */
 
-typedef uint32_t bus_addr_t;
-typedef uint32_t bus_size_t;
+typedef u_long bus_addr_t;
+typedef u_long bus_size_t;
 
 struct aviion_bus_space_tag;
 typedef const struct aviion_bus_space_tag *bus_space_tag_t;
-typedef uint32_t bus_space_handle_t;
+typedef u_long bus_space_handle_t;
 
 struct aviion_bus_space_tag {
 	int		(*_space_map)(bus_space_tag_t, bus_addr_t,
diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h
index 3d9c043594c..1b616a7aecc 100644
--- a/sys/arch/macppc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.18 2010/04/04 12:49:30 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.19 2011/09/27 20:47:30 miod Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
@@ -47,9 +47,9 @@
 /*
  * Bus access types.
  */
-typedef u_long    bus_addr_t;
-typedef u_int32_t bus_size_t;
-typedef u_int32_t bus_space_handle_t;
+typedef u_long bus_addr_t;
+typedef u_long bus_size_t;
+typedef u_long bus_space_handle_t;
 typedef struct ppc_bus_space *bus_space_tag_t;
 
 struct ppc_bus_space {
diff --git a/sys/arch/mvme68k/include/bus.h b/sys/arch/mvme68k/include/bus.h
index 9e2d3e44229..d561c8a2c15 100644
--- a/sys/arch/mvme68k/include/bus.h
+++ b/sys/arch/mvme68k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.7 2011/03/23 16:54:36 pirofti Exp $	*/
+/*	$OpenBSD: bus.h,v 1.8 2011/09/27 20:47:30 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -38,10 +38,10 @@
 
 #include <sys/types.h>
 
-typedef	u_int32_t	bus_addr_t;
-typedef	u_int32_t	bus_size_t;
+typedef	u_long	bus_addr_t;
+typedef	u_long	bus_size_t;
 
-typedef	u_int32_t	bus_space_handle_t;
+typedef	u_long	bus_space_handle_t;
 
 struct mvme68k_bus_space_tag {
 	int	(*bs_map)(bus_addr_t, bus_size_t, int, bus_space_handle_t *);
diff --git a/sys/arch/mvme88k/include/bus.h b/sys/arch/mvme88k/include/bus.h
index 3ed50988340..4e807ab639b 100644
--- a/sys/arch/mvme88k/include/bus.h
+++ b/sys/arch/mvme88k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.10 2011/03/23 16:54:36 pirofti Exp $	*/
+/*	$OpenBSD: bus.h,v 1.11 2011/09/27 20:47:30 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -38,10 +38,10 @@
 
 #include <machine/asm_macro.h>
 
-typedef	u_int32_t	bus_addr_t;
-typedef	u_int32_t	bus_size_t;
+typedef	u_long	bus_addr_t;
+typedef	u_long	bus_size_t;
 
-typedef	u_int32_t	bus_space_handle_t;
+typedef	u_long	bus_space_handle_t;
 
 struct mvme88k_bus_space_tag {
 	int	(*bs_map)(bus_addr_t, bus_size_t, int, bus_space_handle_t *);
diff --git a/sys/arch/socppc/include/bus.h b/sys/arch/socppc/include/bus.h
index 89628f2c7af..0261dde0693 100644
--- a/sys/arch/socppc/include/bus.h
+++ b/sys/arch/socppc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.6 2010/04/04 12:49:30 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.7 2011/09/27 20:47:30 miod Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
@@ -47,9 +47,9 @@
 /*
  * Bus access types.
  */
-typedef u_long    bus_addr_t;
-typedef u_int32_t bus_size_t;
-typedef u_int32_t bus_space_handle_t;
+typedef u_long bus_addr_t;
+typedef u_long bus_size_t;
+typedef u_long bus_space_handle_t;
 typedef struct ppc_bus_space *bus_space_tag_t;
 
 struct ppc_bus_space {
diff --git a/sys/arch/sparc/include/bus.h b/sys/arch/sparc/include/bus.h
index bd3999c5697..ec723213110 100644
--- a/sys/arch/sparc/include/bus.h
+++ b/sys/arch/sparc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.12 2011/04/07 15:30:16 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.13 2011/09/27 20:47:30 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  *
@@ -45,7 +45,7 @@
 
 #include <machine/pmap.h>
 
-typedef	u_int32_t	bus_space_handle_t;
+typedef	u_long	bus_space_handle_t;
 
 /*
  * bus_space_tag_t are pointer to *modified* rom_reg structures.
@@ -60,8 +60,8 @@ typedef	struct rom_reg 	*bus_space_tag_t;
 
 #define	IS_TAG_LITTLE_ENDIAN(t)		((t)->rr_iospace & TAG_LITTLE_ENDIAN)
 
-typedef	u_int32_t	bus_addr_t;
-typedef	u_int32_t	bus_size_t;
+typedef	u_long	bus_addr_t;
+typedef	u_long	bus_size_t;
 
 /* 
  * General bus_space function set
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h
index 34d8a60db73..451cf51a519 100644
--- a/sys/arch/sparc64/include/bus.h
+++ b/sys/arch/sparc64/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.26 2011/03/23 16:54:37 pirofti Exp $	*/
+/*	$OpenBSD: bus.h,v 1.27 2011/09/27 20:47:30 miod Exp $	*/
 /*	$NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $	*/
 
 /*-
@@ -139,8 +139,8 @@ enum bus_type {
  * Bus address and size types
  */
 typedef const struct sparc_bus_space_tag	*bus_space_tag_t;
-typedef u_int64_t	bus_addr_t;
-typedef u_int64_t	bus_size_t;
+typedef u_long	bus_addr_t;
+typedef u_long	bus_size_t;
 
 
 typedef struct _bus_space_handle {