Make sure the BUS_SPACE_BARRIER_xxx constants are all non-zero and can be

or'ed together, even on platforms where bus_space_barrier() ignores the
barrier argument yet.

6 files changed, 18 insertions, 18 deletions

diff --git a/sys/arch/aviion/include/bus.h b/sys/arch/aviion/include/bus.h
index d786a62a892..afe9cf8de6a 100644
--- a/sys/arch/aviion/include/bus.h
+++ b/sys/arch/aviion/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.1 2006/05/09 18:18:49 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.2 2009/07/30 21:39:52 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -54,8 +54,8 @@ struct aviion_bus_space_tag {
 
 typedef const struct aviion_bus_space_tag *bus_space_tag_t;
 
-#define	BUS_SPACE_BARRIER_READ	0
-#define	BUS_SPACE_BARRIER_WRITE	1
+#define	BUS_SPACE_BARRIER_READ	0x01
+#define	BUS_SPACE_BARRIER_WRITE	0x02
 
 #define	BUS_SPACE_MAP_CACHEABLE	0x01
 #define	BUS_SPACE_MAP_LINEAR	0x02
diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h
index 4989eaf7639..9502f88c7d3 100644
--- a/sys/arch/hppa/include/bus.h
+++ b/sys/arch/hppa/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.27 2009/05/31 17:42:11 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.28 2009/07/30 21:39:54 miod Exp $	*/
 
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
@@ -283,8 +283,8 @@ extern const struct hppa_bus_space_tag hppa_bustag;
 #define	bus_space_copy_8(t, h1, o1, h2, o2, c) \
 	(((t)->hbt_cp_8)((t)->hbt_cookie, (h1), (o1), (h2), (o2), (c)))
 
-#define	BUS_SPACE_BARRIER_READ	0
-#define	BUS_SPACE_BARRIER_WRITE	1
+#define	BUS_SPACE_BARRIER_READ	0x01
+#define	BUS_SPACE_BARRIER_WRITE	0x02
 
 #define	bus_space_barrier(t,h,o,l,op) \
 	((t)->hbt_barrier((t)->hbt_cookie, (h), (o), (l), (op)))
diff --git a/sys/arch/hppa64/include/bus.h b/sys/arch/hppa64/include/bus.h
index 5ac5e3f0de9..f2bc61ae1a2 100644
--- a/sys/arch/hppa64/include/bus.h
+++ b/sys/arch/hppa64/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.4 2009/05/31 17:42:13 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.5 2009/07/30 21:39:54 miod Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -166,8 +166,8 @@ typedef struct hppa64_bus_space_tag *bus_space_tag_t;
 #define	bus_space_free(t,h,c) \
 	(((t)->hbt_free)((t)->hbt_cookie,(h),(c)))
 
-#define	BUS_SPACE_BARRIER_READ	0
-#define	BUS_SPACE_BARRIER_WRITE	1
+#define	BUS_SPACE_BARRIER_READ	0x01
+#define	BUS_SPACE_BARRIER_WRITE	0x02
 
 #define	bus_space_barrier(t,h,o,l,op) \
 	((t)->hbt_barrier((t)->hbt_cookie, (h), (o), (l), (op)))
diff --git a/sys/arch/mvme68k/include/bus.h b/sys/arch/mvme68k/include/bus.h
index ffe84c7fa8e..9d898749c4b 100644
--- a/sys/arch/mvme68k/include/bus.h
+++ b/sys/arch/mvme68k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.5 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.6 2009/07/30 21:39:54 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -54,8 +54,8 @@ struct mvme68k_bus_space_tag {
 
 typedef const struct mvme68k_bus_space_tag *bus_space_tag_t;
 
-#define	BUS_SPACE_BARRIER_READ	0
-#define	BUS_SPACE_BARRIER_WRITE	1
+#define	BUS_SPACE_BARRIER_READ	0x01
+#define	BUS_SPACE_BARRIER_WRITE	0x02
 
 #define	BUS_SPACE_MAP_CACHEABLE		0x01
 #define	BUS_SPACE_MAP_LINEAR		0x02
diff --git a/sys/arch/mvme88k/include/bus.h b/sys/arch/mvme88k/include/bus.h
index a2d32e70ce7..a6b96bc4223 100644
--- a/sys/arch/mvme88k/include/bus.h
+++ b/sys/arch/mvme88k/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.8 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.9 2009/07/30 21:39:54 miod Exp $	*/
 /*
  * Copyright (c) 2004, Miodrag Vallat.
  *
@@ -54,8 +54,8 @@ struct mvme88k_bus_space_tag {
 
 typedef const struct mvme88k_bus_space_tag *bus_space_tag_t;
 
-#define	BUS_SPACE_BARRIER_READ	0
-#define	BUS_SPACE_BARRIER_WRITE	1
+#define	BUS_SPACE_BARRIER_READ	0x01
+#define	BUS_SPACE_BARRIER_WRITE	0x02
 
 #define	BUS_SPACE_MAP_CACHEABLE		0x01
 #define	BUS_SPACE_MAP_LINEAR		0x02
diff --git a/sys/arch/sparc/include/bus.h b/sys/arch/sparc/include/bus.h
index 5632d700755..f65f3fe3872 100644
--- a/sys/arch/sparc/include/bus.h
+++ b/sys/arch/sparc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.8 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.9 2009/07/30 21:39:54 miod Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  *
@@ -76,8 +76,8 @@ static int bus_space_unmap(bus_space_tag_t, bus_space_handle_t,
 #define	BUS_SPACE_MAP_LINEAR		0x02
 #define	BUS_SPACE_MAP_PREFETCHABLE	0x04
 
-#define	BUS_SPACE_BARRIER_READ	0
-#define	BUS_SPACE_BARRIER_WRITE	1
+#define	BUS_SPACE_BARRIER_READ	0x01
+#define	BUS_SPACE_BARRIER_WRITE	0x02
 
 static void bus_space_barrier(bus_space_tag_t, bus_space_handle_t,
     bus_addr_t, bus_size_t, int);