Get rid of the obsolet BUS_BARRIER_xxx constants for bus_space_barrier(), only

provide and use BUS_SPACE_BARRIER_xxx.

11 files changed, 53 insertions, 64 deletions

diff --git a/sys/arch/alpha/alpha/dec_axppci_33.c b/sys/arch/alpha/alpha/dec_axppci_33.c
index a696883b951..470777ffdc7 100644
--- a/sys/arch/alpha/alpha/dec_axppci_33.c
+++ b/sys/arch/alpha/alpha/dec_axppci_33.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dec_axppci_33.c,v 1.20 2008/07/16 20:03:20 miod Exp $ */
+/* $OpenBSD: dec_axppci_33.c,v 1.21 2009/07/30 21:39:13 miod Exp $ */
 /* $NetBSD: dec_axppci_33.c,v 1.44 2000/05/22 20:13:32 thorpej Exp $ */
 
 /*
@@ -125,15 +125,15 @@ dec_axppci_33_init()
 		return;
 
 	bus_space_write_1(iot, nsio, NSIO_INDEX, NSIO_CFG0);
-	A33_NSIOBARRIER(BUS_BARRIER_READ | BUS_BARRIER_WRITE);
+	A33_NSIOBARRIER(BUS_SPACE_BARRIER_READ | BUS_SPACE_BARRIER_WRITE);
 	cfg0val = bus_space_read_1(iot, nsio, NSIO_DATA);
 
 	cfg0val |= NSIO_IDE_ENABLE;
 
 	bus_space_write_1(iot, nsio, NSIO_INDEX, NSIO_CFG0);
-	A33_NSIOBARRIER(BUS_BARRIER_WRITE);
+	A33_NSIOBARRIER(BUS_SPACE_BARRIER_WRITE);
 	bus_space_write_1(iot, nsio, NSIO_DATA, cfg0val);
-	A33_NSIOBARRIER(BUS_BARRIER_WRITE);
+	A33_NSIOBARRIER(BUS_SPACE_BARRIER_WRITE);
 	bus_space_write_1(iot, nsio, NSIO_DATA, cfg0val);
 
 	/* Leave nsio mapped to catch any accidental port space collisions  */
diff --git a/sys/arch/alpha/include/bus.h b/sys/arch/alpha/include/bus.h
index 5b9f4431b90..e20db6fb2ba 100644
--- a/sys/arch/alpha/include/bus.h
+++ b/sys/arch/alpha/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.26 2009/04/20 00:42:05 oga Exp $	*/
+/*	$OpenBSD: bus.h,v 1.27 2009/07/30 21:39:15 miod Exp $	*/
 /*	$NetBSD: bus.h,v 1.10 1996/12/02 22:19:32 cgd Exp $	*/
 
 /*
@@ -238,10 +238,8 @@ struct alpha_bus_space {
 #define	bus_space_barrier(t, h, o, l, f)				\
 	(*(t)->abs_barrier)((t)->abs_cookie, (h), (o), (l), (f))
 
-#define	BUS_BARRIER_READ	0x01
-#define	BUS_BARRIER_WRITE	0x02
-#define BUS_SPACE_BARRIER_READ	BUS_BARRIER_READ
-#define BUS_SPACE_BARRIER_WRITE	BUS_BARRIER_WRITE
+#define BUS_SPACE_BARRIER_READ	0x01
+#define BUS_SPACE_BARRIER_WRITE	0x02
 
 
 /*
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
index 89f84f9f152..7c3590184fb 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.6 2009/07/26 18:48:54 miod Exp $ */
+/* $OpenBSD: pci_bwx_bus_io_chipdep.c,v 1.7 2009/07/30 21:39:15 miod Exp $ */
 /* $NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $ */
 
 /*
@@ -381,9 +381,9 @@ __C(CHIP,_io_barrier)(v, h, o, l, f)
 	int f;
 {
 
-	if ((f & BUS_BARRIER_READ) != 0)
+	if ((f & BUS_SPACE_BARRIER_READ) != 0)
 		alpha_mb();
-	else if ((f & BUS_BARRIER_WRITE) != 0)
+	else if ((f & BUS_SPACE_BARRIER_WRITE) != 0)
 		alpha_wmb();
 }
 
@@ -458,7 +458,7 @@ __C(__C(CHIP,_io_read_multi_),BYTES)(v, h, o, a, c)			\
 									\
 	while (c-- > 0) {						\
 		__C(CHIP,_io_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_READ);					\
+		    BUS_SPACE_BARRIER_READ);				\
 		*a++ = __C(__C(CHIP,_io_read_),BYTES)(v, h, o);		\
 	}								\
 }
@@ -563,7 +563,7 @@ __C(__C(CHIP,_io_write_multi_),BYTES)(v, h, o, a, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_io_write_),BYTES)(v, h, o, *a++);		\
 		__C(CHIP,_io_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_io_write_multi_N(1,u_int8_t)
@@ -602,7 +602,7 @@ __C(__C(CHIP,_io_set_multi_),BYTES)(v, h, o, val, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_io_write_),BYTES)(v, h, o, val);		\
 		__C(CHIP,_io_barrier)(v, h, o, sizeof val,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_io_set_multi_N(1,u_int8_t)
@@ -659,7 +659,8 @@ __C(__C(CHIP,_io_read_raw_multi_),BYTES)(v, h, o, a, c)			\
 	int i;								\
 									\
 	while (c > 0) {							\
-		__C(CHIP,_io_barrier)(v, h, o, BYTES, BUS_BARRIER_READ); \
+		__C(CHIP,_io_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_READ);				\
 		temp = __C(__C(CHIP,_io_read_),BYTES)(v, h, o);		\
 		i = MIN(c, BYTES);					\
 		c -= i;							\
@@ -692,7 +693,8 @@ __C(__C(CHIP,_io_write_raw_multi_),BYTES)(v, h, o, a, c)		\
 				temp |= *(a + i);			\
 		}							\
 		__C(__C(CHIP,_io_write_),BYTES)(v, h, o, temp);		\
-		__C(CHIP,_io_barrier)(v, h, o, BYTES, BUS_BARRIER_WRITE); \
+		__C(CHIP,_io_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_WRITE);				\
 		i = MIN(c, BYTES); 					\
 		c -= i;							\
 		a += i;							\
diff --git a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
index b5c5c3e3dbb..9e57698f998 100644
--- a/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_bwx_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.7 2009/07/26 18:48:54 miod Exp $ */
+/* $OpenBSD: pci_bwx_bus_mem_chipdep.c,v 1.8 2009/07/30 21:39:15 miod Exp $ */
 /* $NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $ */
 
 /*
@@ -415,9 +415,9 @@ __C(CHIP,_mem_barrier)(v, h, o, l, f)
 	int f;
 {
 
-	if ((f & BUS_BARRIER_READ) != 0)
+	if ((f & BUS_SPACE_BARRIER_READ) != 0)
 		alpha_mb();
-	else if ((f & BUS_BARRIER_WRITE) != 0)
+	else if ((f & BUS_SPACE_BARRIER_WRITE) != 0)
 		alpha_wmb();
 }
 
@@ -494,7 +494,7 @@ __C(__C(CHIP,_mem_read_multi_),BYTES)(v, h, o, a, c)			\
 									\
 	while (c-- > 0) {						\
 		__C(CHIP,_mem_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_READ);					\
+		    BUS_SPACE_BARRIER_READ);				\
 		*a++ = __C(__C(CHIP,_mem_read_),BYTES)(v, h, o);	\
 	}								\
 }
@@ -599,7 +599,7 @@ __C(__C(CHIP,_mem_write_multi_),BYTES)(v, h, o, a, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_mem_write_),BYTES)(v, h, o, *a++);	\
 		__C(CHIP,_mem_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_mem_write_multi_N(1,u_int8_t)
@@ -638,7 +638,7 @@ __C(__C(CHIP,_mem_set_multi_),BYTES)(v, h, o, val, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_mem_write_),BYTES)(v, h, o, val);		\
 		__C(CHIP,_mem_barrier)(v, h, o, sizeof val,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_mem_set_multi_N(1,u_int8_t)
@@ -706,7 +706,8 @@ __C(__C(CHIP,_mem_read_raw_multi_),BYTES)(v, h, o, a, c)			\
 	int i;								\
 									\
 	while (c > 0) {							\
-		__C(CHIP,_mem_barrier)(v, h, o, BYTES, BUS_BARRIER_READ); \
+		__C(CHIP,_mem_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_READ);				\
 		temp = __C(__C(CHIP,_mem_read_),BYTES)(v, h, o);	\
 		i = MIN(c, BYTES);					\
 		c -= i;							\
@@ -739,7 +740,8 @@ __C(__C(CHIP,_mem_write_raw_multi_),BYTES)(v, h, o, a, c)		\
 				temp |= *(a + i);			\
 		}							\
 		__C(__C(CHIP,_mem_write_),BYTES)(v, h, o, temp);	\
-		__C(CHIP,_mem_barrier)(v, h, o, BYTES, BUS_BARRIER_WRITE); \
+		__C(CHIP,_mem_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_WRITE);				\
 		i = MIN(c, BYTES);					\
 		c -= i;							\
 		a += i;							\
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
index 3a41b3e98f6..d694c97af79 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_io_chipdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.6 2009/07/26 18:48:54 miod Exp $	*/
+/*	$OpenBSD: pci_swiz_bus_io_chipdep.c,v 1.7 2009/07/30 21:39:15 miod Exp $	*/
 /*	$NetBSD: pcs_bus_io_common.c,v 1.14 1996/12/02 22:19:35 cgd Exp $	*/
 
 /*
@@ -464,9 +464,9 @@ __C(CHIP,_io_barrier)(v, h, o, l, f)
 	int f;
 {
 
-	if ((f & BUS_BARRIER_READ) != 0)
+	if ((f & BUS_SPACE_BARRIER_READ) != 0)
 		alpha_mb();
-	else if ((f & BUS_BARRIER_WRITE) != 0)
+	else if ((f & BUS_SPACE_BARRIER_WRITE) != 0)
 		alpha_wmb();
 }
 
@@ -562,7 +562,7 @@ __C(__C(CHIP,_io_read_multi_),BYTES)(v, h, o, a, c)			\
 									\
 	while (c-- > 0) {						\
 		__C(CHIP,_io_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_READ);					\
+		    BUS_SPACE_BARRIER_READ);				\
 		*a++ = __C(__C(CHIP,_io_read_),BYTES)(v, h, o);		\
 	}								\
 }
@@ -672,7 +672,7 @@ __C(__C(CHIP,_io_write_multi_),BYTES)(v, h, o, a, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_io_write_),BYTES)(v, h, o, *a++);		\
 		__C(CHIP,_io_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_io_write_multi_N(1,u_int8_t)
@@ -711,7 +711,7 @@ __C(__C(CHIP,_io_set_multi_),BYTES)(v, h, o, val, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_io_write_),BYTES)(v, h, o, val);		\
 		__C(CHIP,_io_barrier)(v, h, o, sizeof val,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_io_set_multi_N(1,u_int8_t)
@@ -768,7 +768,8 @@ __C(__C(CHIP,_io_read_raw_multi_),BYTES)(v, h, o, a, c)			\
 	int i;								\
 									\
 	while (c > 0) {							\
-		__C(CHIP,_io_barrier)(v, h, o, BYTES, BUS_BARRIER_READ); \
+		__C(CHIP,_io_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_READ);				\
 		temp = __C(__C(CHIP,_io_read_),BYTES)(v, h, o);		\
 		i = MIN(c, BYTES);					\
 		c -= i;							\
@@ -801,7 +802,8 @@ __C(__C(CHIP,_io_write_raw_multi_),BYTES)(v, h, o, a, c)		\
 				temp |= *(a + i);			\
 		}							\
 		__C(__C(CHIP,_io_write_),BYTES)(v, h, o, temp);		\
-		__C(CHIP,_io_barrier)(v, h, o, BYTES, BUS_BARRIER_WRITE); \
+		__C(CHIP,_io_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_WRITE);				\
 		i = MIN(c, BYTES); 					\
 		c -= i;							\
 		a += i;							\
diff --git a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
index dfeee2283cc..b4fda0fd8c1 100644
--- a/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
+++ b/sys/arch/alpha/pci/pci_swiz_bus_mem_chipdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.5 2009/07/26 18:48:54 miod Exp $	*/
+/*	$OpenBSD: pci_swiz_bus_mem_chipdep.c,v 1.6 2009/07/30 21:39:15 miod Exp $	*/
 /*	$NetBSD: pcs_bus_mem_common.c,v 1.15 1996/12/02 22:19:36 cgd Exp $	*/
 
 /*
@@ -697,9 +697,9 @@ __C(CHIP,_mem_barrier)(v, h, o, l, f)
 	int f;
 {
 
-	if ((f & BUS_BARRIER_READ) != 0)
+	if ((f & BUS_SPACE_BARRIER_READ) != 0)
 		alpha_mb();
-	else if ((f & BUS_BARRIER_WRITE) != 0)
+	else if ((f & BUS_SPACE_BARRIER_WRITE) != 0)
 		alpha_wmb();
 }
 
@@ -809,7 +809,7 @@ __C(__C(CHIP,_mem_read_multi_),BYTES)(v, h, o, a, c)			\
 									\
 	while (c-- > 0) {						\
 		__C(CHIP,_mem_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_READ);					\
+		    BUS_SPACE_BARRIER_READ);				\
 		*a++ = __C(__C(CHIP,_mem_read_),BYTES)(v, h, o);	\
 	}								\
 }
@@ -936,7 +936,7 @@ __C(__C(CHIP,_mem_write_multi_),BYTES)(v, h, o, a, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_mem_write_),BYTES)(v, h, o, *a++);	\
 		__C(CHIP,_mem_barrier)(v, h, o, sizeof *a,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_mem_write_multi_N(1,u_int8_t)
@@ -975,7 +975,7 @@ __C(__C(CHIP,_mem_set_multi_),BYTES)(v, h, o, val, c)			\
 	while (c-- > 0) {						\
 		__C(__C(CHIP,_mem_write_),BYTES)(v, h, o, val);		\
 		__C(CHIP,_mem_barrier)(v, h, o, sizeof val,		\
-		    BUS_BARRIER_WRITE);					\
+		    BUS_SPACE_BARRIER_WRITE);				\
 	}								\
 }
 CHIP_mem_set_multi_N(1,u_int8_t)
@@ -1043,7 +1043,8 @@ __C(__C(CHIP,_mem_read_raw_multi_),BYTES)(v, h, o, a, c)			\
 	int i;								\
 									\
 	while (c > 0) {							\
-		__C(CHIP,_mem_barrier)(v, h, o, BYTES, BUS_BARRIER_READ); \
+		__C(CHIP,_mem_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_READ);				\
 		temp = __C(__C(CHIP,_mem_read_),BYTES)(v, h, o);	\
 		i = MIN(c, BYTES);					\
 		c -= i;							\
@@ -1076,7 +1077,8 @@ __C(__C(CHIP,_mem_write_raw_multi_),BYTES)(v, h, o, a, c)		\
 				temp |= *(a + i);			\
 		}							\
 		__C(__C(CHIP,_mem_write_),BYTES)(v, h, o, temp);	\
-		__C(CHIP,_mem_barrier)(v, h, o, BYTES, BUS_BARRIER_WRITE); \
+		__C(CHIP,_mem_barrier)(v, h, o, BYTES,			\
+		    BUS_SPACE_BARRIER_WRITE);				\
 		i = MIN(c, BYTES);					\
 		c -= i;							\
 		a += i;							\
diff --git a/sys/arch/amd64/include/bus.h b/sys/arch/amd64/include/bus.h
index 54fbdab0da1..6f97985ea22 100644
--- a/sys/arch/amd64/include/bus.h
+++ b/sys/arch/amd64/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.20 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.21 2009/07/30 21:39:15 miod Exp $	*/
 /*	$NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $	*/
 
 /*-
@@ -414,9 +414,6 @@ void	bus_space_copy_region_4(bus_space_tag_t, bus_space_handle_t,
  */
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
 #define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
-/* Compatibility defines */
-#define	BUS_BARRIER_READ	BUS_SPACE_BARRIER_READ
-#define	BUS_BARRIER_WRITE	BUS_SPACE_BARRIER_WRITE
 
 void	bus_space_barrier(bus_space_tag_t, bus_space_handle_t,
 	    bus_size_t, bus_size_t, int);
diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h
index 76fc3300db2..8ce28373ec1 100644
--- a/sys/arch/i386/include/bus.h
+++ b/sys/arch/i386/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.50 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.51 2009/07/30 21:39:15 miod Exp $	*/
 /*	$NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $	*/
 
 /*-
@@ -424,9 +424,7 @@ void	bus_space_copy_4(bus_space_tag_t, bus_space_handle_t, bus_size_t,
 	((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f)))
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
 #define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
-/* Compatibility defines */
-#define	BUS_BARRIER_READ	BUS_SPACE_BARRIER_READ
-#define	BUS_BARRIER_WRITE	BUS_SPACE_BARRIER_WRITE
+
 #define	BUS_SPACE_MAP_CACHEABLE		0x0001
 #define	BUS_SPACE_MAP_LINEAR		0x0002
 #define	BUS_SPACE_MAP_PREFETCHABLE	0x0008
diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h
index d6ff8a5a332..814e00a7ceb 100644
--- a/sys/arch/macppc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.16 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.17 2009/07/30 21:39:15 miod Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
@@ -450,10 +450,6 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
 	((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f)))  
 #define BUS_SPACE_BARRIER_READ  0x01		/* force read barrier */ 
 #define BUS_SPACE_BARRIER_WRITE 0x02		/* force write barrier */
-/* Compatibility defines */
-#define BUS_BARRIER_READ        BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE       BUS_SPACE_BARRIER_WRITE
-
 
 #define	BUS_DMA_WAITOK		0x000	/* safe to sleep (pseudo-flag) */
 #define	BUS_DMA_NOWAIT		0x001	/* not safe to sleep */
diff --git a/sys/arch/sgi/include/bus.h b/sys/arch/sgi/include/bus.h
index c6c2dda82ea..6d14065c540 100644
--- a/sys/arch/sgi/include/bus.h
+++ b/sys/arch/sgi/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.20 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.21 2009/07/30 21:39:15 miod Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB Sweden.  All rights reserved.
@@ -298,10 +298,6 @@ bus_space_copy_8(void *v, bus_space_handle_t h1, bus_size_t o1,
 #define BUS_SPACE_BARRIER_READ  0x01		/* force read barrier */
 #define BUS_SPACE_BARRIER_WRITE 0x02		/* force write barrier */
 
-/* Compatibility defines */
-#define BUS_BARRIER_READ	BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE	BUS_SPACE_BARRIER_WRITE
-
 #define	BUS_DMA_WAITOK		0x000
 #define	BUS_DMA_NOWAIT		0x001
 #define	BUS_DMA_ALLOCNOW	0x002
diff --git a/sys/arch/socppc/include/bus.h b/sys/arch/socppc/include/bus.h
index b0f3d61e449..2a21c6d5eed 100644
--- a/sys/arch/socppc/include/bus.h
+++ b/sys/arch/socppc/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.4 2009/07/26 18:48:55 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.5 2009/07/30 21:39:15 miod Exp $	*/
 
 /*
  * Copyright (c) 1997 Per Fogelstrom.  All rights reserved.
@@ -450,10 +450,6 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
 	((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f)))  
 #define BUS_SPACE_BARRIER_READ  0x01		/* force read barrier */ 
 #define BUS_SPACE_BARRIER_WRITE 0x02		/* force write barrier */
-/* Compatibility defines */
-#define BUS_BARRIER_READ        BUS_SPACE_BARRIER_READ
-#define BUS_BARRIER_WRITE       BUS_SPACE_BARRIER_WRITE
-
 
 #define	BUS_DMA_WAITOK		0x000	/* safe to sleep (pseudo-flag) */
 #define	BUS_DMA_NOWAIT		0x001	/* not safe to sleep */