>Number:         3961
>Category:       port-i386
>Synopsis:       bus.h defines BUS_BARRIER_xxx rather than BUS_SPACE_BARRIER_xxx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    gnats-admin (GNATS administrator)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Aug  9 18:35:02 1997
>Last-Modified:
>Originator:     Rafal Boni
>Organization:
...me organized?? Ha!

>Release:        -current SUP'd half an hour ago
>Environment:

System: NetBSD doppelganger 1.2E NetBSD 1.2E (DOPPELGANGER) #1: Sun Jun 1 23:14:09 EDT 1997 rafal@doppelganger:/home/doppelganger/src/netbsd/src/sys/arch/i386/compile/DOPPELGANGER i386


>Description:
	bus.h defines BUS_BARRIER_xxx rather than BUS_SPACE_BARRIER_xxx
	
>How-To-Repeat:
	visual-diff the alpha and i386 bus.h files

>Fix:

--- /tmp/bus.h	Thu Jul 10 07:17:51 1997
+++ bus.h	Sat Aug  9 21:28:11 1997
@@ -746,8 +746,14 @@
  */
 #define	bus_space_barrier(t, h, o, l, f)	\
 	((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f)))
-#define	BUS_BARRIER_READ	0x01		/* force read barrier */
-#define	BUS_BARRIER_WRITE	0x02		/* force write barrier */
+#define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
+#define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
+
+#ifdef __BUS_SPACE_COMPAT_OLDDEFS
+/* compatibility definitions; deprecated */
+#define	BUS_BARRIER_READ	BUS_SPACE_BARRIER_READ
+#define	BUS_BARRIER_WRITE	BUS_SPACE_BARRIER_WRITE
+#endif
 
 /*
  * Flags used in various bus DMA methods.
>Audit-Trail:
>Unformatted: