remove the _BUS_DMA_PRIVATE define from amd64 and i386.

a define needed to get to ``private'' functions that needs to be defined
5 or more times isn't much use and may cause namespace issues anyway.
Other archs will probably follow.

Discussed in portugal.  "Hell yes" weingart@, ok kettenis@, no
objections miod@

12 files changed, 12 insertions, 28 deletions

diff --git a/sys/arch/amd64/amd64/bus_dma.c b/sys/arch/amd64/amd64/bus_dma.c
index 6f52ee5d9c5..20d951a08c0 100644
--- a/sys/arch/amd64/amd64/bus_dma.c
+++ b/sys/arch/amd64/amd64/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.15 2009/03/07 15:34:34 miod Exp $	*/
+/*	$OpenBSD: bus_dma.c,v 1.16 2009/03/10 15:03:16 oga Exp $	*/
 /*	$NetBSD: bus_dma.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $	*/
 
 /*-
@@ -95,7 +95,6 @@
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <dev/isa/isareg.h>
diff --git a/sys/arch/amd64/amd64/bus_space.c b/sys/arch/amd64/amd64/bus_space.c
index bfc306c8b63..6a8f17a611e 100644
--- a/sys/arch/amd64/amd64/bus_space.c
+++ b/sys/arch/amd64/amd64/bus_space.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_space.c,v 1.11 2008/12/03 15:46:06 oga Exp $	*/
+/*	$OpenBSD: bus_space.c,v 1.12 2009/03/10 15:03:16 oga Exp $	*/
 /*	$NetBSD: bus_space.c,v 1.2 2003/03/14 18:47:53 christos Exp $	*/
 
 /*-
@@ -38,7 +38,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <dev/isa/isareg.h>
diff --git a/sys/arch/amd64/include/bus.h b/sys/arch/amd64/include/bus.h
index e2fa9ec1fbf..8217a265614 100644
--- a/sys/arch/amd64/include/bus.h
+++ b/sys/arch/amd64/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.14 2009/02/05 01:15:20 oga Exp $	*/
+/*	$OpenBSD: bus.h,v 1.15 2009/03/10 15:03:16 oga Exp $	*/
 /*	$NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $	*/
 
 /*-
@@ -571,7 +571,6 @@ struct bus_dmamap {
 	bus_dma_segment_t dm_segs[1];	/* segments; variable length */
 };
 
-#ifdef _BUS_DMA_PRIVATE
 int	_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
 	    bus_size_t, int, bus_dmamap_t *);
 void	_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
@@ -612,8 +611,5 @@ int	_bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
  */
  
 paddr_t bus_space_mmap(bus_space_tag_t, bus_addr_t, off_t, int, int);
-            
-
-#endif /* _BUS_DMA_PRIVATE */
 
 #endif /* _X86_BUS_H_ */
diff --git a/sys/arch/amd64/isa/isa_machdep.c b/sys/arch/amd64/isa/isa_machdep.c
index 2861959eb62..99c25c181a5 100644
--- a/sys/arch/amd64/isa/isa_machdep.c
+++ b/sys/arch/amd64/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.c,v 1.19 2008/12/11 17:07:14 oga Exp $	*/
+/*	$OpenBSD: isa_machdep.c,v 1.20 2009/03/10 15:03:17 oga Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $	*/
 
 #define ISA_DMA_STATS
@@ -85,7 +85,6 @@
 #include <machine/mpbiosvar.h>
 #endif
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <machine/intr.h>
diff --git a/sys/arch/amd64/pci/iommu.c b/sys/arch/amd64/pci/iommu.c
index 1fc6f1828a5..c2082727647 100644
--- a/sys/arch/amd64/pci/iommu.c
+++ b/sys/arch/amd64/pci/iommu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iommu.c,v 1.23 2008/12/03 15:46:06 oga Exp $	*/
+/*	$OpenBSD: iommu.c,v 1.24 2009/03/10 15:03:17 oga Exp $	*/
 
 /*
  * Copyright (c) 2005 Jason L. Wright (jason@thought.net)
@@ -38,7 +38,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <machine/pio.h>
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index a11c8cd2ebe..5df71ab40c4 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.21 2009/01/27 15:33:59 oga Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.22 2009/03/10 15:03:17 oga Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $	*/
 
 /*-
@@ -83,7 +83,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <machine/pio.h>
diff --git a/sys/arch/i386/eisa/eisa_machdep.c b/sys/arch/i386/eisa/eisa_machdep.c
index ebe6c98f6c6..8eabdf267a0 100644
--- a/sys/arch/i386/eisa/eisa_machdep.c
+++ b/sys/arch/i386/eisa/eisa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.c,v 1.12 2008/12/03 15:46:06 oga Exp $	*/
+/*	$OpenBSD: eisa_machdep.c,v 1.13 2009/03/10 15:03:17 oga Exp $	*/
 /*	$NetBSD: eisa_machdep.c,v 1.10.22.2 2000/06/25 19:36:58 sommerfeld Exp $	*/
 
 /*-
@@ -72,7 +72,6 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 #include <machine/i8259.h>
 
diff --git a/sys/arch/i386/i386/bus_dma.c b/sys/arch/i386/i386/bus_dma.c
index a09c87bc248..890bfc0aee6 100644
--- a/sys/arch/i386/i386/bus_dma.c
+++ b/sys/arch/i386/i386/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.4 2009/03/07 15:34:34 miod Exp $	*/
+/*	$OpenBSD: bus_dma.c,v 1.5 2009/03/10 15:03:17 oga Exp $	*/
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -71,7 +71,6 @@
 #include <sys/mbuf.h>
 #include <sys/proc.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <dev/isa/isareg.h>
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 695c7ff4465..576ef356738 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.447 2009/02/16 17:24:21 krw Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.448 2009/03/10 15:03:17 oga Exp $	*/
 /*	$NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $	*/
 
 /*-
@@ -105,7 +105,6 @@
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_swap.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <machine/cpu.h>
diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h
index eb89149d0dc..4dbbf37069b 100644
--- a/sys/arch/i386/include/bus.h
+++ b/sys/arch/i386/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.46 2009/02/05 01:13:21 oga Exp $	*/
+/*	$OpenBSD: bus.h,v 1.47 2009/03/10 15:03:17 oga Exp $	*/
 /*	$NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $	*/
 
 /*-
@@ -578,7 +578,6 @@ struct bus_dmamap {
 	bus_dma_segment_t dm_segs[1];	/* segments; variable length */
 };
 
-#ifdef _BUS_DMA_PRIVATE
 int	_bus_dmamap_create(bus_dma_tag_t, bus_size_t, int, bus_size_t,
 	    bus_size_t, int, bus_dmamap_t *);
 void	_bus_dmamap_destroy(bus_dma_tag_t, bus_dmamap_t);
@@ -610,6 +609,5 @@ int	_bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
 	    bus_size_t alignment, bus_size_t boundary,
 	    bus_dma_segment_t *segs, int nsegs, int *rsegs, int flags,
 	    paddr_t low, paddr_t high);
-#endif /* _BUS_DMA_PRIVATE */
 
 #endif /* _I386_BUS_H_ */
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 65e728bfb98..45ac6a62375 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.c,v 1.66 2008/12/11 17:07:14 oga Exp $	*/
+/*	$OpenBSD: isa_machdep.c,v 1.67 2009/03/10 15:03:17 oga Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $	*/
 
 /*-
@@ -83,7 +83,6 @@
 #include <machine/mpbiosvar.h>
 #endif
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 
 #include <machine/intr.h>
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index ebe9a4f9ad7..f37a299fe33 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.44 2009/01/27 15:33:59 oga Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.45 2009/03/10 15:03:17 oga Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $	*/
 
 /*-
@@ -82,7 +82,6 @@
 
 #include <uvm/uvm_extern.h>
 
-#define _BUS_DMA_PRIVATE
 #include <machine/bus.h>
 #include <machine/pio.h>
 #include <machine/i8259.h>