tech-kern archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: bus_space(9) header files
On Tue, May 24, 2011 at 11:26:26AM -0500, David Young wrote:
> On Wed, Apr 07, 2010 at 10:52:25AM -0500, David Young wrote:
> > On Wed, Apr 07, 2010 at 10:34:09AM +0000, Andrew Doran wrote:
> > > On Mon, Apr 05, 2010 at 09:02:53PM -0500, David Young wrote:
> > > > What if I re-work the bus_space(9) header files along these lines:
> > > >
> > > > 1 Each architecture provides <machine/bus_defs.h> with
> > > > the typedefs (bus_space_tag_t, bus_space_handle_t, et cetera)
> > > >
> > > > 2 Each architecture provides <machine/bus_funcs.h> with
> > > > any and all macro and/or inline implementations of
> > > >
> > > > 3 <machine/bus.h> goes away, because its content is splits between
> > > > bus_defs.h and bus_funcs.h.
> > > >
> > > > 4 sys/bus.h turns to this:
> > > >
> > > > #include <machine/bus_defs.h>
> > > > #include <sys/bus_proto.h>
> > > > #include <machine/bus_funcs.h>
> > > >
> > > > /* MI function declarations */
> > > >
> > > > Now, is there any reliable way to declare routines that may or may not
> > > > be macros or "static inline"?
> > >
> > > Do you see a reason not to include contents of bus_proto.h in bus.h?
> >
> > In machine/bus.h or sys/bus.h?
> >
> > I think that it should be #included in only sys/bus.h. It has to be
> > #included after the typedefs are defined, and before the macros/inlines
> > are defined.
>
> I have started to work on this again.
Here are a couple of patches that put #1 through #4, above, into
practice on every architecture that attaches a PCI bus:
ftp://elmendorf.ojctech.com/users/netbsd-7fd7e433/sys-bus-split.patch
ftp://elmendorf.ojctech.com/users/netbsd-7fd7e433/sys-bus.patch
I hope that I can get some help with testing, and with splitting
machine/bus.h on the rest of the architectures.
The first patch replaces machine/bus.h with machine/bus_defs.h and
machine/bus_funcs.h. Many static inline functions that used to be in
machine/bus.h have moved to an MD .c file, where they are not any longer
static or inline.
The second patch is simple but repetitive: it changes a zillion
instances of #include <machine/bus.h> to #include <sys/bus.h>.
I made some BUS_* constants in sparc64 and in powerpc consistent with
the constants in sys/bus.h. Please note the BUS_DMA_DONTCACHE change
that I made to powerpc.
So far I have only changed the set lists for sparc64. Many more changes
in distrib/sets/lists/ will be necessary.
Dave
--
David Young OJC Technologies
dyoung%ojctech.com@localhost Urbana, IL * (217) 344-0444 x24
Index: sys/arch/arc/arc/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/bus_space.c,v
retrieving revision 1.10
diff -u -p -r1.10 bus_space.c
--- sys/arch/arc/arc/bus_space.c 28 Apr 2008 20:23:13 -0000 1.10
+++ sys/arch/arc/arc/bus_space.c 25 May 2011 22:28:40 -0000
@@ -41,7 +41,274 @@ __KERNEL_RCSID(0, "$NetBSD: bus_space.c,
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
+
+/*
+ * uintN_t bus_space_read_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset);
+ *
+ * Read a 1, 2, 4, or 8 byte quantity from bus space
+ * described by tag/handle/offset.
+ */
+
+#define bus_space_read(BYTES,BITS) \
+__CONCAT3(uint,BITS,_t) \
+__CONCAT(bus_space_read_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, bus_size_t offset) \
+{ \
+ return (*(volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES)))); \
+}
+
+bus_space_read(1,8)
+bus_space_read(2,16)
+bus_space_read(4,32)
+bus_space_read(8,64)
+
+/*
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * uintN_t *addr, size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle/offset and copy into buffer provided.
+ */
+
+#define bus_space_read_multi(BYTES,BITS) \
+void \
+__CONCAT(bus_space_read_multi_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, bus_size_t offset, \
+ __CONCAT3(uint,BITS,_t) *datap, bus_size_t count) \
+{ \
+ volatile __CONCAT3(uint,BITS,_t) *p = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES))); \
+ \
+ for (; count > 0; --count) \
+ *datap++ = *p; \
+}
+
+bus_space_read_multi(1,8)
+bus_space_read_multi(2,16)
+bus_space_read_multi(4,32)
+bus_space_read_multi(8,64)
+
+/*
+ * void bus_space_read_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * uintN_t *addr, size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle and starting at `offset' and copy into
+ * buffer provided.
+ */
+
+#define bus_space_read_region(BYTES,BITS) \
+void \
+__CONCAT(bus_space_read_region_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, bus_size_t offset, \
+ __CONCAT3(uint,BITS,_t) *datap, bus_size_t count) \
+{ \
+ int stride = 1 << __CONCAT(bst->bs_stride_,BYTES); \
+ volatile __CONCAT3(uint,BITS,_t) *p = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES))); \
+ \
+ for (; count > 0; --count) { \
+ *datap++ = *p; \
+ p += stride; \
+ } \
+}
+
+bus_space_read_region(1,8)
+bus_space_read_region(2,16)
+bus_space_read_region(4,32)
+bus_space_read_region(8,64)
+
+/*
+ * void bus_space_write_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * uintN_t value);
+ *
+ * Write the 1, 2, 4, or 8 byte value `value' to bus space
+ * described by tag/handle/offset.
+ */
+
+#define bus_space_write(BYTES,BITS) \
+void \
+__CONCAT(bus_space_write_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, \
+ bus_size_t offset, __CONCAT3(uint,BITS,_t) data) \
+{ \
+ *(volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES))) = data; \
+}
+
+bus_space_write(1,8)
+bus_space_write(2,16)
+bus_space_write(4,32)
+bus_space_write(8,64)
+
+/*
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const uintN_t *addr, size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
+ * provided to bus space described by tag/handle/offset.
+ */
+
+#define bus_space_write_multi(BYTES,BITS) \
+void \
+__CONCAT(bus_space_write_multi_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, bus_size_t offset, \
+ const __CONCAT3(uint,BITS,_t) *datap, bus_size_t count) \
+{ \
+ volatile __CONCAT3(uint,BITS,_t) *p = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES))); \
+ \
+ for (; count > 0; --count) \
+ *p = *datap++; \
+}
+
+bus_space_write_multi(1,8)
+bus_space_write_multi(2,16)
+bus_space_write_multi(4,32)
+bus_space_write_multi(8,64)
+
+/*
+ * void bus_space_write_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const uintN_t *addr, size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
+ * to bus space described by tag/handle starting at `offset'.
+ */
+
+#define bus_space_write_region(BYTES,BITS) \
+void \
+__CONCAT(bus_space_write_region_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, bus_size_t offset, \
+ const __CONCAT3(uint,BITS,_t) *datap, bus_size_t count) \
+{ \
+ int stride = 1 << __CONCAT(bst->bs_stride_,BYTES); \
+ volatile __CONCAT3(uint,BITS,_t) *p = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES))); \
+ \
+ for (; count > 0; --count) { \
+ *p = *datap++; \
+ p += stride; \
+ } \
+}
+
+bus_space_write_region(1,8)
+bus_space_write_region(2,16)
+bus_space_write_region(4,32)
+bus_space_write_region(8,64)
+
+/*
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, uintN_t val,
+ * size_t count);
+ *
+ * Write the 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle/offset `count' times.
+ */
+
+#define bus_space_set_multi(BYTES,BITS)
\
+void \
+__CONCAT(bus_space_set_multi_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, bus_size_t offset, \
+ const __CONCAT3(uint,BITS,_t) data, bus_size_t count) \
+{ \
+ volatile __CONCAT3(uint,BITS,_t) *p = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES))); \
+ \
+ for (; count > 0; --count) \
+ *p = data; \
+}
+
+bus_space_set_multi(1,8)
+bus_space_set_multi(2,16)
+bus_space_set_multi(4,32)
+bus_space_set_multi(8,64)
+
+/*
+ * void bus_space_set_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, uintN_t val,
+ * size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle starting at `offset'.
+ */
+
+#define bus_space_set_region(BYTES,BITS) \
+void \
+__CONCAT(bus_space_set_region_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t bsh, bus_size_t offset, \
+ __CONCAT3(uint,BITS,_t) data, bus_size_t count) \
+{ \
+ int stride = 1 << __CONCAT(bst->bs_stride_,BYTES); \
+ volatile __CONCAT3(uint,BITS,_t) *p = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (bsh + (offset << __CONCAT(bst->bs_stride_,BYTES))); \
+ \
+ for (; count > 0; --count) { \
+ *p = data; \
+ p += stride; \
+ } \
+}
+
+bus_space_set_region(1,8)
+bus_space_set_region(2,16)
+bus_space_set_region(4,32)
+bus_space_set_region(8,64)
+
+/*
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh1, bus_size_t off1,
+ * bus_space_handle_t bsh2, bus_size_t off2,
+ * size_t count);
+ *
+ * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
+ * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
+ */
+
+#define bus_space_copy_region(BYTES,BITS) \
+void \
+__CONCAT(bus_space_copy_region_,BYTES)(bus_space_tag_t bst, \
+ bus_space_handle_t srcbsh, bus_size_t srcoffset, \
+ bus_space_handle_t dstbsh, bus_size_t dstoffset, bus_size_t count) \
+{ \
+ int stride = 1 << __CONCAT(bst->bs_stride_,BYTES); \
+ volatile __CONCAT3(uint,BITS,_t) *srcp = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (srcbsh + (srcoffset << __CONCAT(bst->bs_stride_,BYTES))); \
+ volatile __CONCAT3(uint,BITS,_t) *dstp = \
+ (volatile __CONCAT3(uint,BITS,_t) *) \
+ (dstbsh + (dstoffset << __CONCAT(bst->bs_stride_,BYTES))); \
+ bus_size_t offset; \
+ \
+ if (srcp >= dstp) { \
+ /* src after dest: copy forward */ \
+ for (offset = 0; count > 0; --count, offset += stride) \
+ dstp[offset] = srcp[offset]; \
+ } else { \
+ /* dest after src: copy backward */ \
+ offset = (count << __CONCAT(bst->bs_stride_,BYTES)) \
+ - stride; \
+ for (; count > 0; --count, offset -= stride) \
+ dstp[offset] = srcp[offset]; \
+ } \
+}
+
+bus_space_copy_region(1,8)
+bus_space_copy_region(2,16)
+bus_space_copy_region(4,32)
+bus_space_copy_region(8,64)
void
arc_bus_space_init(bus_space_tag_t bst, const char *name, paddr_t paddr,
Index: sys/arch/cobalt/cobalt/bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/cobalt/bus.c,v
retrieving revision 1.40
diff -u -p -r1.40 bus.c
--- sys/arch/cobalt/cobalt/bus.c 3 May 2011 09:15:20 -0000 1.40
+++ sys/arch/cobalt/cobalt/bus.c 25 May 2011 22:28:45 -0000
@@ -50,6 +50,12 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.40
#include <mips/cache.h>
+/*
+ * Utility macros; do not use outside this file.
+ */
+#define __PB_TYPENAME_PREFIX(BITS) ___CONCAT(uint,BITS)
+#define __PB_TYPENAME(BITS)
___CONCAT(__PB_TYPENAME_PREFIX(BITS),_t)
+
static int _bus_dmamap_load_buffer(bus_dmamap_t, void *, bus_size_t,
struct vmspace *, int, vaddr_t *, int *, int);
@@ -69,6 +75,288 @@ struct cobalt_bus_dma_tag cobalt_default
_bus_dmamem_mmap,
};
+/*
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * uintN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle/offset and copy into buffer provided.
+ */
+
+#define __COBALT_bus_space_read_multi(BYTES,BITS)
\
+void __CONCAT(bus_space_read_multi_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, bus_size_t);
\
+ \
+void \
+__CONCAT(bus_space_read_multi_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ *a++ = __CONCAT(bus_space_read_,BYTES)(t, h, o); \
+}
+
+__COBALT_bus_space_read_multi(1,8)
+__COBALT_bus_space_read_multi(2,16)
+__COBALT_bus_space_read_multi(4,32)
+
+#if 0 /* Cause a link error for bus_space_read_multi_8 */
+#define bus_space_read_multi_8 !!! bus_space_read_multi_8
unimplemented !!!
+#endif
+
+#undef __COBALT_bus_space_read_multi
+
+/*
+ * void bus_space_read_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * uintN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle and starting at `offset' and copy into
+ * buffer provided.
+ */
+
+#define __COBALT_bus_space_read_region(BYTES,BITS) \
+void __CONCAT(bus_space_read_region_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, bus_size_t);
\
+ \
+void \
+__CONCAT(bus_space_read_region_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ *a++ = __CONCAT(bus_space_read_,BYTES)(t, h, o); \
+ o += BYTES; \
+ } \
+}
+
+__COBALT_bus_space_read_region(1,8)
+__COBALT_bus_space_read_region(2,16)
+__COBALT_bus_space_read_region(4,32)
+
+#if 0 /* Cause a link error for bus_space_read_region_8 */
+#define bus_space_read_region_8 !!! bus_space_read_region_8
unimplemented !!!
+#endif
+
+#undef __COBALT_bus_space_read_region
+
+/*
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const uintN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
+ * provided to bus space described by tag/handle/offset.
+ */
+
+#define __COBALT_bus_space_write_multi(BYTES,BITS) \
+void __CONCAT(bus_space_write_multi_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ const __PB_TYPENAME(BITS) *, bus_size_t);
\
+ \
+void \
+__CONCAT(bus_space_write_multi_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ const __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, *a++); \
+}
+
+__COBALT_bus_space_write_multi(1,8)
+__COBALT_bus_space_write_multi(2,16)
+__COBALT_bus_space_write_multi(4,32)
+
+#if 0 /* Cause a link error for bus_space_write_8 */
+#define bus_space_write_multi_8(t, h, o, a, c)
\
+ !!! bus_space_write_multi_8 unimplimented !!!
+#endif
+
+#undef __COBALT_bus_space_write_multi
+
+/*
+ * void bus_space_write_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const uintN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
+ * to bus space described by tag/handle starting at `offset'.
+ */
+
+#define __COBALT_bus_space_write_region(BYTES,BITS) \
+void __CONCAT(bus_space_write_region_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ const __PB_TYPENAME(BITS) *, bus_size_t);
\
+ \
+void \
+__CONCAT(bus_space_write_region_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ const __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, *a++); \
+ o += BYTES; \
+ } \
+}
+
+__COBALT_bus_space_write_region(1,8)
+__COBALT_bus_space_write_region(2,16)
+__COBALT_bus_space_write_region(4,32)
+
+#if 0 /* Cause a link error for bus_space_write_region_8 */
+#define bus_space_write_region_8
\
+ !!! bus_space_write_region_8 unimplemented !!!
+#endif
+
+#undef __COBALT_bus_space_write_region
+
+/*
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, uintN_t val,
+ * bus_size_t count);
+ *
+ * Write the 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle/offset `count' times.
+ */
+
+#define __COBALT_bus_space_set_multi(BYTES,BITS)
\
+void __CONCAT(bus_space_set_multi_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS), bus_size_t);
\
+ \
+void \
+__CONCAT(bus_space_set_multi_,BYTES)(t, h, o, v, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) v; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, v); \
+}
+
+__COBALT_bus_space_set_multi(1,8)
+__COBALT_bus_space_set_multi(2,16)
+__COBALT_bus_space_set_multi(4,32)
+
+#if 0 /* Cause a link error for bus_space_set_multi_8 */
+#define bus_space_set_multi_8
\
+ !!! bus_space_set_multi_8 unimplemented !!!
+#endif
+
+#undef __COBALT_bus_space_set_multi
+
+/*
+ * void bus_space_set_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, uintN_t val,
+ * bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle starting at `offset'.
+ */
+
+#define __COBALT_bus_space_set_region(BYTES,BITS)
\
+void __CONCAT(bus_space_set_region_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS), bus_size_t);
\
+ \
+void \
+__CONCAT(bus_space_set_region_,BYTES)(t, h, o, v, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) v; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, v); \
+ o += BYTES; \
+ } \
+}
+
+__COBALT_bus_space_set_region(1,8)
+__COBALT_bus_space_set_region(2,16)
+__COBALT_bus_space_set_region(4,32)
+
+#if 0 /* Cause a link error for bus_space_set_region_8 */
+#define bus_space_set_region_8
\
+ !!! bus_space_set_region_8 unimplemented !!!
+#endif
+
+#undef __COBALT_bus_space_set_region
+
+/*
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh1, bus_size_t off1,
+ * bus_space_handle_t bsh2, bus_size_t off2,
+ * bus_size_t count);
+ *
+ * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
+ * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
+ */
+
+#define __COBALT_copy_region(BYTES)
\
+void __CONCAT(bus_space_copy_region_,BYTES) \
+ (bus_space_tag_t, \
+ bus_space_handle_t bsh1, bus_size_t off1, \
+ bus_space_handle_t bsh2, bus_size_t off2, \
+ bus_size_t count); \
+ \
+void \
+__CONCAT(bus_space_copy_region_,BYTES)(t, h1, o1, h2, o2, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h1, h2; \
+ bus_size_t o1, o2, c; \
+{ \
+ bus_size_t o; \
+ \
+ if ((h1 + o1) >= (h2 + o2)) { \
+ /* src after dest: copy forward */ \
+ for (o = 0; c != 0; c--, o += BYTES) \
+ __CONCAT(bus_space_write_,BYTES)(t, h2, o2 + o, \
+ __CONCAT(bus_space_read_,BYTES)(t, h1, o1 + o)); \
+ } else { \
+ /* dest after src: copy backwards */ \
+ for (o = (c - 1) * BYTES; c != 0; c--, o -= BYTES) \
+ __CONCAT(bus_space_write_,BYTES)(t, h2, o2 + o, \
+ __CONCAT(bus_space_read_,BYTES)(t, h1, o1 + o)); \
+ } \
+}
+
+__COBALT_copy_region(1)
+__COBALT_copy_region(2)
+__COBALT_copy_region(4)
+
+#if 0 /* Cause a link error for bus_space_copy_region_8 */
+#define bus_space_copy_region_8
\
+ !!! bus_space_copy_region_8 unimplemented !!!
+#endif
+
+#undef __COBALT_copy_region
+
int
bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size, int flags,
bus_space_handle_t *bshp)
Index: sys/arch/mips/rmi/rmixl_obiovar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_obiovar.h,v
retrieving revision 1.3
diff -u -p -r1.3 rmixl_obiovar.h
--- sys/arch/mips/rmi/rmixl_obiovar.h 20 Feb 2011 07:48:37 -0000 1.3
+++ sys/arch/mips/rmi/rmixl_obiovar.h 25 May 2011 22:28:52 -0000
@@ -32,8 +32,8 @@
#ifndef _MIPS_RMI_RMIXL_OBIOVAR_H_
#define _MIPS_RMI_RMIXL_OBIOVAR_H_
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
-#include <mips/bus_dma.h>
#include <mips/pci_machdep.h>
struct obio_attach_args {
Index: sys/arch/mips/rmi/rmixl_usbivar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_usbivar.h,v
retrieving revision 1.3
diff -u -p -r1.3 rmixl_usbivar.h
--- sys/arch/mips/rmi/rmixl_usbivar.h 29 Apr 2011 21:54:14 -0000 1.3
+++ sys/arch/mips/rmi/rmixl_usbivar.h 25 May 2011 22:28:52 -0000
@@ -33,7 +33,6 @@
#define _MIPS_RMI_RMIXL_USBIVAR_H_
#include <sys/bus.h>
-#include <mips/bus_dma.h>
struct rmixl_usbi_attach_args {
bus_space_tag_t usbi_eb_bst;
Index: sys/arch/powerpc/oea/ofwoea_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/oea/ofwoea_machdep.c,v
retrieving revision 1.20
diff -u -p -r1.20 ofwoea_machdep.c
--- sys/arch/powerpc/oea/ofwoea_machdep.c 14 Mar 2010 10:03:49 -0000
1.20
+++ sys/arch/powerpc/oea/ofwoea_machdep.c 25 May 2011 22:28:53 -0000
@@ -53,10 +53,9 @@ __KERNEL_RCSID(0, "$NetBSD: ofwoea_machd
#include <machine/trap.h>
#include <machine/vmparam.h>
#include <machine/autoconf.h>
-#include <powerpc/bus.h>
+#include <sys/bus.h>
#include <powerpc/oea/bat.h>
#include <powerpc/oea/cpufeat.h>
-#include <powerpc/ofw_bus.h>
#include <powerpc/ofw_cons.h>
#include <powerpc/spr.h>
#include <arch/powerpc/pic/picvar.h>
Index: sys/arch/powerpc/powerpc/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/bus_dma.c,v
retrieving revision 1.38
diff -u -p -r1.38 bus_dma.c
--- sys/arch/powerpc/powerpc/bus_dma.c 18 Jan 2011 01:02:55 -0000 1.38
+++ sys/arch/powerpc/powerpc/bus_dma.c 25 May 2011 22:28:53 -0000
@@ -619,13 +619,13 @@ _bus_dmamem_map(bus_dma_tag_t t, bus_dma
* If we are mapping nocache, flush the page from
* cache before we map it.
*/
- if (flags & BUS_DMA_NOCACHE)
+ if (flags & BUS_DMA_DONTCACHE)
dcbf(addr, PAGE_SIZE,
curcpu()->ci_ci.dcache_line_size);
pmap_kenter_pa(va, addr,
VM_PROT_READ | VM_PROT_WRITE,
PMAP_WIRED |
- ((flags & BUS_DMA_NOCACHE) ? PMAP_MD_NOCACHE : 0));
+ ((flags & BUS_DMA_DONTCACHE) ? PMAP_MD_NOCACHE :
0));
}
}
Index: sys/arch/sgimips/sgimips/bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/sgimips/bus.c,v
retrieving revision 1.62
diff -u -p -r1.62 bus.c
--- sys/arch/sgimips/sgimips/bus.c 20 Feb 2011 07:59:51 -0000 1.62
+++ sys/arch/sgimips/sgimips/bus.c 25 May 2011 22:28:54 -0000
@@ -1215,3 +1215,379 @@ bus_space_mmap(bus_space_tag_t space, bu
return mips_btop((MIPS_KSEG1_TO_PHYS(addr) + off));
#endif
}
+
+/*
+ * Utility macros; do not use outside this file.
+ */
+#define __PB_TYPENAME_PREFIX(BITS) ___CONCAT(u_int,BITS)
+#define __PB_TYPENAME(BITS)
___CONCAT(__PB_TYPENAME_PREFIX(BITS),_t)
+
+/*
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle/offset and copy into buffer provided.
+ */
+
+#define __SGIMIPS_bus_space_read_multi(BYTES,BITS) \
+void __CONCAT(bus_space_read_multi_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_read_multi_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ *a++ = __CONCAT(bus_space_read_,BYTES)(t, h, o); \
+}
+
+__SGIMIPS_bus_space_read_multi(1,8)
+__SGIMIPS_bus_space_read_multi(2,16)
+__SGIMIPS_bus_space_read_multi(4,32)
+
+#undef __SGIMIPS_bus_space_read_multi
+
+#define __SGIMIPS_bus_space_read_multi_stream(BYTES,BITS) \
+void __CONCAT(bus_space_read_multi_stream_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_read_multi_stream_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ *a++ = __CONCAT(bus_space_read_stream_,BYTES)(t, h, o); \
+}
+
+
+__SGIMIPS_bus_space_read_multi_stream(2,16)
+__SGIMIPS_bus_space_read_multi_stream(4,32)
+
+#undef __SGIMIPS_bus_space_read_multi_stream
+
+/*
+ * void bus_space_read_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle and starting at `offset' and copy into
+ * buffer provided.
+ */
+
+#define __SGIMIPS_bus_space_read_region(BYTES,BITS) \
+void __CONCAT(bus_space_read_region_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_read_region_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ *a++ = __CONCAT(bus_space_read_,BYTES)(t, h, o); \
+ o += BYTES; \
+ } \
+}
+
+__SGIMIPS_bus_space_read_region(1,8)
+__SGIMIPS_bus_space_read_region(2,16)
+__SGIMIPS_bus_space_read_region(4,32)
+
+#undef __SGIMIPS_bus_space_read_region
+
+/*
+ * void bus_space_read_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle and starting at `offset' and copy into
+ * buffer provided. No byte order translation is done.
+ */
+
+#define __SGIMIPS_bus_space_read_region_stream(BYTES,BITS) \
+void __CONCAT(bus_space_read_region_stream_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_read_region_stream_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ *a++ = __CONCAT(bus_space_read_stream_,BYTES)(t, h, o); \
+ o += BYTES; \
+ } \
+}
+
+__SGIMIPS_bus_space_read_region_stream(2,16)
+__SGIMIPS_bus_space_read_region_stream(4,32)
+
+#undef __SGIMIPS_bus_space_read_region_stream
+
+/*
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const u_intN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
+ * provided to bus space described by tag/handle/offset.
+ */
+
+#define __SGIMIPS_bus_space_write_multi(BYTES,BITS) \
+void __CONCAT(bus_space_write_multi_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ const __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_write_multi_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ const __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, *a++); \
+}
+
+__SGIMIPS_bus_space_write_multi(1,8)
+__SGIMIPS_bus_space_write_multi(2,16)
+__SGIMIPS_bus_space_write_multi(4,32)
+
+#undef __SGIMIPS_bus_space_write_multi
+
+#define __SGIMIPS_bus_space_write_multi_stream(BYTES,BITS) \
+void __CONCAT(bus_space_write_multi_stream_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ const __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_write_multi_stream_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ const __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ __CONCAT(bus_space_write_stream_,BYTES)(t, h, o, *a++); \
+}
+
+__SGIMIPS_bus_space_write_multi_stream(2,16)
+__SGIMIPS_bus_space_write_multi_stream(4,32)
+
+#undef __SGIMIPS_bus_space_write_multi_stream
+
+/*
+ * void bus_space_write_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const u_intN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
+ * to bus space described by tag/handle starting at `offset'.
+ */
+
+#define __SGIMIPS_bus_space_write_region(BYTES,BITS) \
+void __CONCAT(bus_space_write_region_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ const __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_write_region_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ const __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, *a++); \
+ o += BYTES; \
+ } \
+}
+
+__SGIMIPS_bus_space_write_region(1,8)
+__SGIMIPS_bus_space_write_region(2,16)
+__SGIMIPS_bus_space_write_region(4,32)
+
+#undef __SGIMIPS_bus_space_write_region
+
+/*
+ * void bus_space_write_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const u_intN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
+ * to bus space described by tag/handle starting at `offset', but without
+ * byte-order translation
+ */
+
+#define __SGIMIPS_bus_space_write_region_stream(BYTES,BITS) \
+void __CONCAT(bus_space_write_region_stream_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ const __PB_TYPENAME(BITS) *, bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_write_region_stream_,BYTES)(t, h, o, a, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ const __PB_TYPENAME(BITS) *a; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ __CONCAT(bus_space_write_stream_,BYTES)(t, h, o, *a++); \
+ o += BYTES; \
+ } \
+}
+
+__SGIMIPS_bus_space_write_region_stream(2,16)
+__SGIMIPS_bus_space_write_region_stream(4,32)
+
+#undef __SGIMIPS_bus_space_write_region_stream
+
+/*
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
+ * bus_size_t count);
+ *
+ * Write the 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle/offset `count' times.
+ */
+
+#define __SGIMIPS_bus_space_set_multi(BYTES,BITS) \
+void __CONCAT(bus_space_set_multi_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS), bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_set_multi_,BYTES)(t, h, o, v, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) v; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, v); \
+}
+
+__SGIMIPS_bus_space_set_multi(1,8)
+__SGIMIPS_bus_space_set_multi(2,16)
+__SGIMIPS_bus_space_set_multi(4,32)
+
+#undef __SGIMIPS_bus_space_set_multi
+
+/*
+ * void bus_space_set_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
+ * bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle starting at `offset'.
+ */
+
+#define __SGIMIPS_bus_space_set_region(BYTES,BITS) \
+void __CONCAT(bus_space_set_region_,BYTES) \
+ (bus_space_tag_t, bus_space_handle_t, bus_size_t, \
+ __PB_TYPENAME(BITS), bus_size_t); \
+ \
+void \
+__CONCAT(bus_space_set_region_,BYTES)(t, h, o, v, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h; \
+ bus_size_t o; \
+ __PB_TYPENAME(BITS) v; \
+ bus_size_t c; \
+{ \
+ \
+ while (c--) { \
+ __CONCAT(bus_space_write_,BYTES)(t, h, o, v); \
+ o += BYTES; \
+ } \
+}
+
+__SGIMIPS_bus_space_set_region(1,8)
+__SGIMIPS_bus_space_set_region(2,16)
+__SGIMIPS_bus_space_set_region(4,32)
+
+#undef __SGIMIPS_bus_space_set_region
+
+/*
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh1, bus_size_t off1,
+ * bus_space_handle_t bsh2, bus_size_t off2,
+ * bus_size_t count);
+ *
+ * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
+ * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
+ */
+
+#define __SGIMIPS_copy_region(BYTES)
\
+void __CONCAT(bus_space_copy_region_,BYTES) \
+ (bus_space_tag_t, \
+ bus_space_handle_t bsh1, bus_size_t off1, \
+ bus_space_handle_t bsh2, bus_size_t off2, \
+ bus_size_t count); \
+ \
+void \
+__CONCAT(bus_space_copy_region_,BYTES)(t, h1, o1, h2, o2, c) \
+ bus_space_tag_t t; \
+ bus_space_handle_t h1, h2; \
+ bus_size_t o1, o2, c; \
+{ \
+ bus_size_t o; \
+ \
+ if ((h1 + o1) >= (h2 + o2)) { \
+ /* src after dest: copy forward */ \
+ for (o = 0; c != 0; c--, o += BYTES) \
+ __CONCAT(bus_space_write_,BYTES)(t, h2, o2 + o, \
+ __CONCAT(bus_space_read_,BYTES)(t, h1, o1 + o)); \
+ } else { \
+ /* dest after src: copy backwards */ \
+ for (o = (c - 1) * BYTES; c != 0; c--, o -= BYTES) \
+ __CONCAT(bus_space_write_,BYTES)(t, h2, o2 + o, \
+ __CONCAT(bus_space_read_,BYTES)(t, h1, o1 + o)); \
+ } \
+}
+
+__SGIMIPS_copy_region(1)
+__SGIMIPS_copy_region(2)
+__SGIMIPS_copy_region(4)
+
+#undef __SGIMIPS_copy_region
+
+#undef __PB_TYPENAME_PREFIX
+#undef __PB_TYPENAME
+
Index: sys/arch/sparc/sparc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/machdep.c,v
retrieving revision 1.309
diff -u -p -r1.309 machdep.c
--- sys/arch/sparc/sparc/machdep.c 16 May 2011 18:08:04 -0000 1.309
+++ sys/arch/sparc/sparc/machdep.c 25 May 2011 22:28:55 -0000
@@ -1861,6 +1861,881 @@ static void *sparc_mainbus_intr_establis
static void sparc_bus_barrier(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_size_t, int);
+int
+bus_space_map(t, a, s, f, hp)
+ bus_space_tag_t t;
+ bus_addr_t a;
+ bus_size_t s;
+ int f;
+ bus_space_handle_t *hp;
+{
+ return (*t->sparc_bus_map)(t, a, s, f, (vaddr_t)0, hp);
+}
+
+int
+bus_space_map2(t, a, s, f, v, hp)
+ bus_space_tag_t t;
+ bus_addr_t a;
+ bus_size_t s;
+ int f;
+ vaddr_t v;
+ bus_space_handle_t *hp;
+{
+ return (*t->sparc_bus_map)(t, a, s, f, v, hp);
+}
+
+void
+bus_space_unmap(t, h, s)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t s;
+{
+ (*t->sparc_bus_unmap)(t, h, s);
+}
+
+int
+bus_space_subregion(t, h, o, s, hp)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ bus_size_t s;
+ bus_space_handle_t *hp;
+{
+ return (*t->sparc_bus_subregion)(t, h, o, s, hp);
+}
+
+paddr_t
+bus_space_mmap(t, a, o, p, f)
+ bus_space_tag_t t;
+ bus_addr_t a;
+ off_t o;
+ int p;
+ int f;
+{
+ return (*t->sparc_bus_mmap)(t, a, o, p, f);
+}
+
+void *
+bus_intr_establish(t, p, l, h, a)
+ bus_space_tag_t t;
+ int p;
+ int l;
+ int (*h)(void *);
+ void *a;
+{
+ return (*t->sparc_intr_establish)(t, p, l, h, a, NULL);
+}
+
+void *
+bus_intr_establish2(t, p, l, h, a, v)
+ bus_space_tag_t t;
+ int p;
+ int l;
+ int (*h)(void *);
+ void *a;
+ void (*v)(void);
+{
+ return (*t->sparc_intr_establish)(t, p, l, h, a, v);
+}
+
+void
+bus_space_barrier(t, h, o, s, f)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ bus_size_t s;
+ int f;
+{
+ (*t->sparc_bus_barrier)(t, h, o, s, f);
+}
+
+void
+bus_space_write_multi_stream_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint16_t *a;
+{
+ while (c-- > 0)
+ bus_space_write_2_real(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_stream_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint32_t *a;
+{
+ while (c-- > 0)
+ bus_space_write_4_real(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_stream_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint64_t *a;
+{
+ while (c-- > 0)
+ bus_space_write_8_real(t, h, o, *a++);
+}
+
+
+/*
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, u_intN_t val,
+ * bus_size_t count);
+ *
+ * Write the 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle/offset `count' times.
+ */
+void
+bus_space_set_multi_1(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint8_t v;
+{
+ while (c-- > 0)
+ bus_space_write_1(t, h, o, v);
+}
+
+void
+bus_space_set_multi_2(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint16_t v;
+{
+ while (c-- > 0)
+ bus_space_write_2(t, h, o, v);
+}
+
+void
+bus_space_set_multi_4(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint32_t v;
+{
+ while (c-- > 0)
+ bus_space_write_4(t, h, o, v);
+}
+
+void
+bus_space_set_multi_8(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint64_t v;
+{
+ while (c-- > 0)
+ bus_space_write_8(t, h, o, v);
+}
+
+
+/*
+ * void bus_space_read_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_read_region_1(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint8_t *a;
+{
+ for (; c; a++, c--, o++)
+ *a = bus_space_read_1(t, h, o);
+}
+
+void
+bus_space_read_region_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint16_t *a;
+{
+ for (; c; a++, c--, o+=2)
+ *a = bus_space_read_2(t, h, o);
+}
+
+void
+bus_space_read_region_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint32_t *a;
+{
+ for (; c; a++, c--, o+=4)
+ *a = bus_space_read_4(t, h, o);
+}
+
+void
+bus_space_read_region_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint64_t *a;
+{
+ for (; c; a++, c--, o+=8)
+ *a = bus_space_read_8(t, h, o);
+}
+
+/*
+ * void bus_space_write_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_write_region_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint16_t *a;
+{
+ for (; c; a++, c--, o+=2)
+ bus_space_write_2(t, h, o, *a);
+}
+
+void
+bus_space_write_region_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint32_t *a;
+{
+ for (; c; a++, c--, o+=4)
+ bus_space_write_4(t, h, o, *a);
+}
+
+void
+bus_space_write_region_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint64_t *a;
+{
+ for (; c; a++, c--, o+=8)
+ bus_space_write_8(t, h, o, *a);
+}
+
+
+/*
+ * void bus_space_set_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_set_region_1(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint8_t v;
+{
+ for (; c; c--, o++)
+ bus_space_write_1(t, h, o, v);
+}
+
+void
+bus_space_set_region_2(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint16_t v;
+{
+ for (; c; c--, o+=2)
+ bus_space_write_2(t, h, o, v);
+}
+
+void
+bus_space_set_region_4(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint32_t v;
+{
+ for (; c; c--, o+=4)
+ bus_space_write_4(t, h, o, v);
+}
+
+void
+bus_space_set_region_8(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint64_t v;
+{
+ for (; c; c--, o+=8)
+ bus_space_write_8(t, h, o, v);
+}
+
+
+/*
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh1, bus_size_t off1,
+ * bus_space_handle_t bsh2, bus_size_t off2,
+ * bus_size_t count);
+ *
+ * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
+ * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
+ */
+void
+bus_space_copy_region_1(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1++, o2++)
+ bus_space_write_1(t, h1, o1, bus_space_read_1(t, h2, o2));
+}
+
+void
+bus_space_copy_region_2(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1+=2, o2+=2)
+ bus_space_write_2(t, h1, o1, bus_space_read_2(t, h2, o2));
+}
+
+void
+bus_space_copy_region_4(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1+=4, o2+=4)
+ bus_space_write_4(t, h1, o1, bus_space_read_4(t, h2, o2));
+}
+
+void
+bus_space_copy_region_8(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1+=8, o2+=8)
+ bus_space_write_8(t, h1, o1, bus_space_read_8(t, h2, o2));
+}
+
+/*
+ * void bus_space_read_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_read_region_stream_1(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint8_t *a;
+{
+ for (; c; a++, c--, o++)
+ *a = bus_space_read_stream_1(t, h, o);
+}
+void
+bus_space_read_region_stream_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint16_t *a;
+{
+ for (; c; a++, c--, o+=2)
+ *a = bus_space_read_stream_2(t, h, o);
+ }
+void
+bus_space_read_region_stream_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint32_t *a;
+{
+ for (; c; a++, c--, o+=4)
+ *a = bus_space_read_stream_4(t, h, o);
+}
+void
+bus_space_read_region_stream_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint64_t *a;
+{
+ for (; c; a++, c--, o+=8)
+ *a = bus_space_read_stream_8(t, h, o);
+}
+
+/*
+ * void bus_space_write_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_write_region_stream_1(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint8_t *a;
+{
+ for (; c; a++, c--, o++)
+ bus_space_write_stream_1(t, h, o, *a);
+}
+
+void
+bus_space_write_region_stream_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint16_t *a;
+{
+ for (; c; a++, c--, o+=2)
+ bus_space_write_stream_2(t, h, o, *a);
+}
+
+void
+bus_space_write_region_stream_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint32_t *a;
+{
+ for (; c; a++, c--, o+=4)
+ bus_space_write_stream_4(t, h, o, *a);
+}
+
+void
+bus_space_write_region_stream_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint64_t *a;
+{
+ for (; c; a++, c--, o+=8)
+ bus_space_write_stream_8(t, h, o, *a);
+}
+
+
+/*
+ * void bus_space_set_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_set_region_stream_1(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint8_t v;
+{
+ for (; c; c--, o++)
+ bus_space_write_stream_1(t, h, o, v);
+}
+
+void
+bus_space_set_region_stream_2(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint16_t v;
+{
+ for (; c; c--, o+=2)
+ bus_space_write_stream_2(t, h, o, v);
+}
+
+void
+bus_space_set_region_stream_4(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint32_t v;
+{
+ for (; c; c--, o+=4)
+ bus_space_write_stream_4(t, h, o, v);
+}
+
+void
+bus_space_set_region_stream_8(t, h, o, v, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint64_t v;
+{
+ for (; c; c--, o+=8)
+ bus_space_write_stream_8(t, h, o, v);
+}
+
+/*
+ * void bus_space_copy_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh1, bus_size_t off1,
+ * bus_space_handle_t bsh2, bus_size_t off2,
+ * bus_size_t count);
+ *
+ * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
+ * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
+ */
+
+void
+bus_space_copy_region_stream_1(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1++, o2++)
+ bus_space_write_stream_1(t, h1, o1, bus_space_read_stream_1(t, h2,
o2));
+}
+
+void
+bus_space_copy_region_stream_2(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1+=2, o2+=2)
+ bus_space_write_stream_2(t, h1, o1, bus_space_read_stream_2(t, h2,
o2));
+}
+
+void
+bus_space_copy_region_stream_4(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1+=4, o2+=4)
+ bus_space_write_stream_4(t, h1, o1, bus_space_read_stream_4(t, h2,
o2));
+}
+
+void
+bus_space_copy_region_stream_8(t, h1, o1, h2, o2, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h1, h2;
+ bus_size_t o1, o2;
+ bus_size_t c;
+{
+ for (; c; c--, o1+=8, o2+=8)
+ bus_space_write_stream_8(t, h1, o1, bus_space_read_8(t, h2, o2));
+}
+
+void
+bus_space_write_1(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint8_t v;
+{
+ (*t->sparc_write_1)(t, h, o, v);
+}
+
+void
+bus_space_write_2(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint16_t v;
+{
+ (*t->sparc_write_2)(t, h, o, v);
+}
+
+void
+bus_space_write_4(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint32_t v;
+{
+ (*t->sparc_write_4)(t, h, o, v);
+}
+
+void
+bus_space_write_8(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint64_t v;
+{
+ (*t->sparc_write_8)(t, h, o, v);
+}
+
+#if __SLIM_SPARC_BUS_SPACE
+
+void
+bus_space_write_1(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint8_t v;
+{
+ __insn_barrier();
+ bus_space_write_1_real(t, h, o, v);
+}
+
+void
+bus_space_write_2(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint16_t v;
+{
+ __insn_barrier();
+ bus_space_write_2_real(t, h, o, v);
+}
+
+void
+bus_space_write_4(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint32_t v;
+{
+ __insn_barrier();
+ bus_space_write_4_real(t, h, o, v);
+}
+
+void
+bus_space_write_8(t, h, o, v)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+ uint64_t v;
+{
+ __insn_barrier();
+ bus_space_write_8_real(t, h, o, v);
+}
+
+#endif /* __SLIM_SPARC_BUS_SPACE */
+
+uint8_t
+bus_space_read_1(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ return (*t->sparc_read_1)(t, h, o);
+}
+
+uint16_t
+bus_space_read_2(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ return (*t->sparc_read_2)(t, h, o);
+}
+
+uint32_t
+bus_space_read_4(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ return (*t->sparc_read_4)(t, h, o);
+}
+
+uint64_t
+bus_space_read_8(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ return (*t->sparc_read_8)(t, h, o);
+}
+
+#if __SLIM_SPARC_BUS_SPACE
+uint8_t
+bus_space_read_1(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ __insn_barrier();
+ return bus_space_read_1_real(t, h, o);
+}
+
+uint16_t
+bus_space_read_2(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ __insn_barrier();
+ return bus_space_read_2_real(t, h, o);
+}
+
+uint32_t
+bus_space_read_4(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ __insn_barrier();
+ return bus_space_read_4_real(t, h, o);
+}
+
+uint64_t
+bus_space_read_8(t, h, o)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o;
+{
+ __insn_barrier();
+ return bus_space_read_8_real(t, h, o);
+}
+
+#endif /* __SLIM_SPARC_BUS_SPACE */
+
+void
+bus_space_read_multi_1(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint8_t *a;
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_1(t, h, o);
+}
+
+void
+bus_space_read_multi_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint16_t *a;
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_2(t, h, o);
+}
+
+void
+bus_space_read_multi_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint32_t *a;
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_4(t, h, o);
+}
+
+void
+bus_space_read_multi_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint64_t *a;
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_8(t, h, o);
+}
+
+/*
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * u_intN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle/offset and copy into buffer provided.
+ */
+void
+bus_space_read_multi_stream_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint16_t *a;
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_2_real(t, h, o);
+}
+
+void
+bus_space_read_multi_stream_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint32_t *a;
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_4_real(t, h, o);
+}
+
+void
+bus_space_read_multi_stream_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ uint64_t *a;
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_8_real(t, h, o);
+}
+
+/*
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const u_intN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
+ * provided to bus space described by tag/handle/offset.
+ */
+void
+bus_space_write_multi_1(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint8_t *a;
+{
+ while (c-- > 0)
+ bus_space_write_1(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_2(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint16_t *a;
+{
+ while (c-- > 0)
+ bus_space_write_2(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_4(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint32_t *a;
+{
+ while (c-- > 0)
+ bus_space_write_4(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_8(t, h, o, a, c)
+ bus_space_tag_t t;
+ bus_space_handle_t h;
+ bus_size_t o, c;
+ const uint64_t *a;
+{
+ while (c-- > 0)
+ bus_space_write_8(t, h, o, *a++);
+}
+
/*
* Allocate a new bus tag and have it inherit the methods of the
* given parent.
Index: sys/arch/sparc64/sparc64/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/machdep.c,v
retrieving revision 1.256
diff -u -p -r1.256 machdep.c
--- sys/arch/sparc64/sparc64/machdep.c 4 Mar 2011 22:25:29 -0000 1.256
+++ sys/arch/sparc64/sparc64/machdep.c 25 May 2011 22:28:56 -0000
@@ -1578,6 +1578,634 @@ static void sparc_bus_free(bus_space_tag
struct extent *io_space = NULL;
+void
+bus_space_barrier(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, bus_size_t s, int f)
+{
+ /*
+ * We have a bit of a problem with the bus_space_barrier()
+ * interface. It defines a read barrier and a write barrier
+ * which really don't map to the 7 different types of memory
+ * barriers in the SPARC v9 instruction set.
+ */
+ if (f == BUS_SPACE_BARRIER_READ)
+ /* A load followed by a load to the same location? */
+ __asm volatile("membar #Lookaside");
+ else if (f == BUS_SPACE_BARRIER_WRITE)
+ /* A store followed by a store? */
+ __asm volatile("membar #StoreStore");
+ else
+ /* A store followed by a load? */
+ __asm volatile("membar #StoreLoad|#MemIssue|#Lookaside");
+}
+
+int
+bus_space_alloc(bus_space_tag_t t, bus_addr_t rs, bus_addr_t re, bus_size_t s,
+ bus_size_t a, bus_size_t b, int f, bus_addr_t *ap,
+ bus_space_handle_t *hp)
+{
+ _BS_CALL(t, sparc_bus_alloc)(t, rs, re, s, a, b, f, ap, hp);
+}
+
+void
+bus_space_free(bus_space_tag_t t, bus_space_handle_t h, bus_size_t s)
+{
+ _BS_CALL(t, sparc_bus_free)(t, h, s);
+}
+
+int
+bus_space_map(bus_space_tag_t t, bus_addr_t a, bus_size_t s, int f,
+ bus_space_handle_t *hp)
+{
+ _BS_CALL(t, sparc_bus_map)(t, a, s, f, 0, hp);
+}
+
+void
+bus_space_unmap(bus_space_tag_t t, bus_space_handle_t h, bus_size_t s)
+{
+ _BS_VOID_CALL(t, sparc_bus_unmap)(t, h, s);
+}
+
+int
+bus_space_subregion(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ bus_size_t s, bus_space_handle_t *hp)
+{
+ _BS_CALL(t, sparc_bus_subregion)(t, h, o, s, hp);
+}
+
+paddr_t
+bus_space_mmap(bus_space_tag_t t, bus_addr_t a, off_t o, int p, int f)
+{
+ _BS_CALL(t, sparc_bus_mmap)(t, a, o, p, f);
+}
+
+/*
+ * void bus_space_read_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * uintN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle/offset and copy into buffer provided.
+ */
+void
+bus_space_read_multi_1(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint8_t * a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_1(t, h, o);
+}
+
+void
+bus_space_read_multi_2(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint16_t * a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_2(t, h, o);
+}
+
+void
+bus_space_read_multi_4(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint32_t * a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_4(t, h, o);
+}
+
+void
+bus_space_read_multi_8(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint64_t * a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_8(t, h, o);
+}
+
+/*
+ * void bus_space_write_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const uintN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
+ * provided to bus space described by tag/handle/offset.
+ */
+void
+bus_space_write_multi_1(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint8_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_1(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_2(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint16_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_2(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_4(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint32_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_4(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_8(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint64_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_8(t, h, o, *a++);
+}
+
+/*
+ * void bus_space_set_multi_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, uintN_t val,
+ * bus_size_t count);
+ *
+ * Write the 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle/offset `count' times.
+ */
+void
+bus_space_set_multi_stream_1(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint8_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_1(t, h, o, v);
+}
+
+void
+bus_space_set_multi_stream_2(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint16_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_2(t, h, o, v);
+}
+
+void
+bus_space_set_multi_stream_4(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint32_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_4(t, h, o, v);
+}
+
+void
+bus_space_set_multi_stream_8(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint64_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_8(t, h, o, v);
+}
+
+/*
+ * void bus_space_copy_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh1, bus_size_t off1,
+ * bus_space_handle_t bsh2, bus_size_t off2,
+ * bus_size_t count);
+ *
+ * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
+ * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
+ */
+void
+bus_space_copy_region_stream_1(bus_space_tag_t t, bus_space_handle_t h1,
+ bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1++, o2++)
+ bus_space_write_stream_1(t, h1, o1, bus_space_read_stream_1(t, h2,
o2));
+}
+
+void
+bus_space_copy_region_stream_2(bus_space_tag_t t, bus_space_handle_t h1,
+ bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1+=2, o2+=2)
+ bus_space_write_stream_2(t, h1, o1, bus_space_read_stream_2(t, h2,
o2));
+}
+
+void
+bus_space_copy_region_stream_4(bus_space_tag_t t, bus_space_handle_t h1,
+ bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1+=4, o2+=4)
+ bus_space_write_stream_4(t, h1, o1, bus_space_read_stream_4(t, h2,
o2));
+}
+
+void
+bus_space_copy_region_stream_8(bus_space_tag_t t, bus_space_handle_t h1,
+ bus_size_t o1, bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1+=8, o2+=8)
+ bus_space_write_stream_8(t, h1, o1, bus_space_read_8(t, h2, o2));
+}
+
+/*
+ * void bus_space_set_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * uintN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_set_region_stream_1(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint8_t v, bus_size_t c)
+{
+ for (; c; c--, o++)
+ bus_space_write_stream_1(t, h, o, v);
+}
+
+void
+bus_space_set_region_stream_2(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint16_t v, bus_size_t c)
+{
+ for (; c; c--, o+=2)
+ bus_space_write_stream_2(t, h, o, v);
+}
+
+void
+bus_space_set_region_stream_4(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint32_t v, bus_size_t c)
+{
+ for (; c; c--, o+=4)
+ bus_space_write_stream_4(t, h, o, v);
+}
+
+void
+bus_space_set_region_stream_8(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint64_t v, bus_size_t c)
+{
+ for (; c; c--, o+=8)
+ bus_space_write_stream_8(t, h, o, v);
+}
+
+
+/*
+ * void bus_space_read_multi_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * uintN_t *addr, bus_size_t count);
+ *
+ * Read `count' 1, 2, 4, or 8 byte quantities from bus space
+ * described by tag/handle/offset and copy into buffer provided.
+ */
+void
+bus_space_read_multi_stream_1(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ uint8_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_stream_1(t, h, o);
+}
+
+void
+bus_space_read_multi_stream_2(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ uint16_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_stream_2(t, h, o);
+}
+
+void
+bus_space_read_multi_stream_4(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ uint32_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_stream_4(t, h, o);
+}
+
+void
+bus_space_read_multi_stream_8(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ uint64_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ *a++ = bus_space_read_stream_8(t, h, o);
+}
+
+/*
+ * void bus_space_read_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * uintN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_read_region_stream_1(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint8_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o++)
+ *a = bus_space_read_stream_1(t, h, o);
+}
+void
+bus_space_read_region_stream_2(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint16_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=2)
+ *a = bus_space_read_stream_2(t, h, o);
+ }
+void
+bus_space_read_region_stream_4(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint32_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=4)
+ *a = bus_space_read_stream_4(t, h, o);
+}
+void
+bus_space_read_region_stream_8(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, uint64_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=8)
+ *a = bus_space_read_stream_8(t, h, o);
+}
+
+/*
+ * void bus_space_write_multi_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset,
+ * const uintN_t *addr, bus_size_t count);
+ *
+ * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
+ * provided to bus space described by tag/handle/offset.
+ */
+void
+bus_space_write_multi_stream_1(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint8_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_1(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_stream_2(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint16_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_2(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_stream_4(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint32_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_4(t, h, o, *a++);
+}
+
+void
+bus_space_write_multi_stream_8(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o,
+ const uint64_t *a, bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_stream_8(t, h, o, *a++);
+}
+
+/*
+ * void bus_space_copy_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh1, bus_size_t off1,
+ * bus_space_handle_t bsh2, bus_size_t off2,
+ * bus_size_t count);
+ *
+ * Copy `count' 1, 2, 4, or 8 byte values from bus space starting
+ * at tag/bsh1/off1 to bus space starting at tag/bsh2/off2.
+ */
+void
+bus_space_copy_region_1(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t
o1,
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1++, o2++)
+ bus_space_write_1(t, h1, o1, bus_space_read_1(t, h2, o2));
+}
+
+void
+bus_space_copy_region_2(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t
o1,
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1+=2, o2+=2)
+ bus_space_write_2(t, h1, o1, bus_space_read_2(t, h2, o2));
+}
+
+void
+bus_space_copy_region_4(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t
o1,
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1+=4, o2+=4)
+ bus_space_write_4(t, h1, o1, bus_space_read_4(t, h2, o2));
+}
+
+void
+bus_space_copy_region_8(bus_space_tag_t t, bus_space_handle_t h1, bus_size_t
o1,
+ bus_space_handle_t h2, bus_size_t o2, bus_size_t c)
+{
+ for (; c; c--, o1+=8, o2+=8)
+ bus_space_write_8(t, h1, o1, bus_space_read_8(t, h2, o2));
+}
+
+/*
+ * void bus_space_set_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * uintN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_set_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint8_t v, bus_size_t c)
+{
+ for (; c; c--, o++)
+ bus_space_write_1(t, h, o, v);
+}
+
+void
+bus_space_set_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint16_t v, bus_size_t c)
+{
+ for (; c; c--, o+=2)
+ bus_space_write_2(t, h, o, v);
+}
+
+void
+bus_space_set_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint32_t v, bus_size_t c)
+{
+ for (; c; c--, o+=4)
+ bus_space_write_4(t, h, o, v);
+}
+
+void
+bus_space_set_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint64_t v, bus_size_t c)
+{
+ for (; c; c--, o+=8)
+ bus_space_write_8(t, h, o, v);
+}
+
+
+/*
+ * void bus_space_set_multi_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t offset, uintN_t val,
+ * bus_size_t count);
+ *
+ * Write the 1, 2, 4, or 8 byte value `val' to bus space described
+ * by tag/handle/offset `count' times.
+ */
+void
+bus_space_set_multi_1(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint8_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_1(t, h, o, v);
+}
+
+void
+bus_space_set_multi_2(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint16_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_2(t, h, o, v);
+}
+
+void
+bus_space_set_multi_4(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint32_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_4(t, h, o, v);
+}
+
+void
+bus_space_set_multi_8(bus_space_tag_t t,
+ bus_space_handle_t h, bus_size_t o, uint64_t v,
+ bus_size_t c)
+{
+ while (c-- > 0)
+ bus_space_write_8(t, h, o, v);
+}
+
+/*
+ * void bus_space_write_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * uintN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_write_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint8_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o++)
+ bus_space_write_1(t, h, o, *a);
+}
+
+void
+bus_space_write_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint16_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=2)
+ bus_space_write_2(t, h, o, *a);
+}
+
+void
+bus_space_write_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint32_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=4)
+ bus_space_write_4(t, h, o, *a);
+}
+
+void
+bus_space_write_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ const uint64_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=8)
+ bus_space_write_8(t, h, o, *a);
+}
+
+
+/*
+ * void bus_space_read_region_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * uintN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_read_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ uint8_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o++)
+ *a = bus_space_read_1(t, h, o);
+}
+void
+bus_space_read_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ uint16_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=2)
+ *a = bus_space_read_2(t, h, o);
+ }
+void
+bus_space_read_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ uint32_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=4)
+ *a = bus_space_read_4(t, h, o);
+}
+void
+bus_space_read_region_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
+ uint64_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=8)
+ *a = bus_space_read_8(t, h, o);
+}
+
+/*
+ * void bus_space_write_region_stream_N(bus_space_tag_t tag,
+ * bus_space_handle_t bsh, bus_size_t off,
+ * uintN_t *addr, bus_size_t count);
+ *
+ */
+void
+bus_space_write_region_stream_1(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint8_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o++)
+ bus_space_write_stream_1(t, h, o, *a);
+}
+
+void
+bus_space_write_region_stream_2(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint16_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=2)
+ bus_space_write_stream_2(t, h, o, *a);
+}
+
+void
+bus_space_write_region_stream_4(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint32_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=4)
+ bus_space_write_stream_4(t, h, o, *a);
+}
+
+void
+bus_space_write_region_stream_8(bus_space_tag_t t, bus_space_handle_t h,
+ bus_size_t o, const uint64_t *a, bus_size_t c)
+{
+ for (; c; a++, c--, o+=8)
+ bus_space_write_stream_8(t, h, o, *a);
+}
+
/*
* Allocate a new bus tag and have it inherit the methods of the
* given parent.
Index: sys/arch/x86/x86/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/bus_space.c,v
retrieving revision 1.33
diff -u -p -r1.33 bus_space.c
--- sys/arch/x86/x86/bus_space.c 11 Feb 2011 23:08:38 -0000 1.33
+++ sys/arch/x86/x86/bus_space.c 25 May 2011 22:28:57 -0000
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_space.c,
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/extent.h>
+#include <sys/kmem.h>
#include <uvm/uvm_extern.h>
@@ -156,42 +157,58 @@ int
bus_space_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size,
int flags, bus_space_handle_t *bshp)
{
+ bus_space_reservation_t bsr;
int error;
- struct extent *ex;
- /*
- * Pick the appropriate extent map.
- */
- if (x86_bus_space_is_io(t)) {
- if (flags & BUS_SPACE_MAP_LINEAR)
- return (EOPNOTSUPP);
- ex = ioport_ex;
- } else if (x86_bus_space_is_mem(t))
- ex = iomem_ex;
- else
- panic("x86_memio_map: bad bus space tag");
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_MAP) != 0) {
+ return (*t->bst_ov->ov_space_map)(t->bst_ctx, t, bpa, size,
+ flags, bshp);
+ }
+ if (t->bst_super != NULL)
+ return bus_space_map(t->bst_super, bpa, size, flags, bshp);
+
+ error = bus_space_reserve(t, bpa, size, flags, &bsr);
+ if (error != 0)
+ return error;
+
+ error = bus_space_reservation_map(t, &bsr, flags, bshp);
+ if (error != 0)
+ bus_space_release(t, &bsr);
- /*
- * Before we go any further, let's make sure that this
- * region is available.
- */
- error = extent_alloc_region(ex, bpa, size,
- EX_NOWAIT | (ioport_malloc_safe ? EX_MALLOCOK : 0));
- if (error)
- return (error);
+ return error;
+}
+
+int
+bus_space_reservation_map(bus_space_tag_t t, bus_space_reservation_t *bsr,
+ int flags, bus_space_handle_t *bshp)
+{
+ bus_addr_t bpa;
+ bus_size_t size;
+
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_RESERVATION_MAP) != 0) {
+ return (*t->bst_ov->ov_space_reservation_map)(t->bst_ctx, t,
+ bsr, flags, bshp);
+ }
+ if (t->bst_super != NULL) {
+ return bus_space_reservation_map(t->bst_super,
+ bsr, flags, bshp);
+ }
+
+ bpa = bsr->bsr_start;
+ size = bsr->bsr_size;
/*
* For I/O space, that's all she wrote.
*/
if (x86_bus_space_is_io(t)) {
*bshp = bpa;
- return (0);
+ return 0;
}
#ifndef XEN
if (bpa >= IOM_BEGIN && (bpa + size) != 0 && (bpa + size) <= IOM_END) {
*bshp = (bus_space_handle_t)ISA_HOLE_VADDR(bpa);
- return(0);
+ return 0;
}
#endif /* !XEN */
@@ -199,17 +216,7 @@ bus_space_map(bus_space_tag_t t, bus_add
* For memory space, map the bus physical address to
* a kernel virtual address.
*/
- error = x86_mem_add_mapping(bpa, size, flags, bshp);
- if (error) {
- if (extent_free(ex, bpa, size, EX_NOWAIT |
- (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
- printf("x86_memio_map: pa 0x%jx, size 0x%jx\n",
- (uintmax_t)bpa, (uintmax_t)size);
- printf("x86_memio_map: can't free region\n");
- }
- }
-
- return (error);
+ return x86_mem_add_mapping(bpa, size, flags, bshp);
}
int
@@ -235,14 +242,67 @@ _x86_memio_map(bus_space_tag_t t, bus_ad
}
int
-bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend,
- bus_size_t size, bus_size_t alignment, bus_size_t boundary,
- int flags, bus_addr_t *bpap, bus_space_handle_t *bshp)
+bus_space_reserve(bus_space_tag_t t,
+ bus_addr_t bpa,
+ bus_size_t size,
+ int flags, bus_space_reservation_t *bsrp)
{
struct extent *ex;
+ int error;
+
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_RESERVE) != 0) {
+ return (*t->bst_ov->ov_space_reserve)(t->bst_ctx, t,
+ bpa, size, flags, bsrp);
+ }
+ if (t->bst_super != NULL)
+ return bus_space_reserve(t->bst_super, bpa, size, flags, bsrp);
+
+ /*
+ * Pick the appropriate extent map.
+ */
+ if (x86_bus_space_is_io(t)) {
+ if (flags & BUS_SPACE_MAP_LINEAR)
+ return (EOPNOTSUPP);
+ ex = ioport_ex;
+ } else if (x86_bus_space_is_mem(t))
+ ex = iomem_ex;
+ else
+ panic("x86_memio_alloc: bad bus space tag");
+
+ /*
+ * Before we go any further, let's make sure that this
+ * region is available.
+ */
+ error = extent_alloc_region(ex, bpa, size,
+ EX_NOWAIT | (ioport_malloc_safe ? EX_MALLOCOK : 0));
+
+ if (error != 0)
+ return error;
+
+ bsrp->bsr_start = bpa;
+ bsrp->bsr_size = size;
+
+ return 0;
+}
+
+int
+bus_space_reserve_subregion(bus_space_tag_t t,
+ bus_addr_t rstart, bus_addr_t rend,
+ bus_size_t size, bus_size_t alignment, bus_size_t boundary,
+ int flags, bus_space_reservation_t *bsrp)
+{
+ bus_space_reservation_t bsr;
+ struct extent *ex;
u_long bpa;
int error;
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_RESERVE_SUBREGION) != 0) {
+ return (*t->bst_ov->ov_space_reserve_subregion)(t->bst_ctx, t,
+ rstart, rend, size, alignment, boundary, flags, bsrp);
+ }
+ if (t->bst_super != NULL)
+ return bus_space_reserve(t->bst_super, bpa, size, flags, bsrp);
+
/*
* Pick the appropriate extent map.
*/
@@ -258,7 +318,9 @@ bus_space_alloc(bus_space_tag_t t, bus_a
/*
* Sanity check the allocation against the extent's boundaries.
*/
- if (rstart < ex->ex_start || rend > ex->ex_end)
+ rstart = MAX(rstart, ex->ex_start);
+ rend = MIN(rend, ex->ex_end);
+ if (rstart >= rend)
panic("x86_memio_alloc: bad region start/end");
/*
@@ -272,31 +334,78 @@ bus_space_alloc(bus_space_tag_t t, bus_a
if (error)
return (error);
+ bsr.bsr_start = bpa;
+ bsr.bsr_size = size;
+
+ *bsrp = bsr;
+
+ return 0;
+}
+
+void
+bus_space_release(bus_space_tag_t t, bus_space_reservation_t *bsr)
+{
+ struct extent *ex;
+
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_RELEASE) != 0) {
+ (*t->bst_ov->ov_space_release)(t->bst_ctx, t, bsr);
+ return;
+ }
+ if (t->bst_super != NULL) {
+ bus_space_release(t->bst_super, bsr);
+ return;
+ }
/*
- * For I/O space, that's all she wrote.
+ * Pick the appropriate extent map.
*/
if (x86_bus_space_is_io(t)) {
- *bshp = *bpap = bpa;
- return (0);
+ ex = ioport_ex;
+ } else if (x86_bus_space_is_mem(t))
+ ex = iomem_ex;
+ else
+ panic("x86_memio_alloc: bad bus space tag");
+
+ if (extent_free(ex, bsr->bsr_start, bsr->bsr_size, EX_NOWAIT |
+ (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
+ printf("%s: pa 0x%jx, size 0x%jx\n", __func__,
+ (uintmax_t)bsr->bsr_start, (uintmax_t)bsr->bsr_size);
+ printf("%s: can't free region\n", __func__);
+ }
+}
+
+int
+bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart, bus_addr_t rend,
+ bus_size_t size, bus_size_t alignment, bus_size_t boundary,
+ int flags, bus_addr_t *bpap, bus_space_handle_t *bshp)
+{
+ bus_space_reservation_t bsr;
+ int error;
+
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_ALLOC) != 0) {
+ return (*t->bst_ov->ov_space_alloc)(t->bst_ctx, t, rstart, rend,
+ size, alignment, boundary, flags, bpap, bshp);
+ }
+ if (t->bst_super != NULL) {
+ return bus_space_alloc(t->bst_super, rstart, rend, size,
+ alignment, boundary, flags, bpap, bshp);
}
/*
- * For memory space, map the bus physical address to
- * a kernel virtual address.
+ * Do the requested allocation.
*/
- error = x86_mem_add_mapping(bpa, size, flags, bshp);
- if (error) {
- if (extent_free(iomem_ex, bpa, size, EX_NOWAIT |
- (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
- printf("x86_memio_alloc: pa 0x%jx, size 0x%jx\n",
- (uintmax_t)bpa, (uintmax_t)size);
- printf("x86_memio_alloc: can't free region\n");
- }
- }
+ error = bus_space_reserve_subregion(t, rstart, rend, size, alignment,
+ boundary, flags, &bsr);
+
+ if (error != 0)
+ return error;
+
+ error = bus_space_reservation_map(t, &bsr, flags, bshp);
+ if (error != 0)
+ bus_space_release(t, &bsr);
- *bpap = bpa;
+ *bpap = bsr.bsr_start;
- return (error);
+ return error;
}
int
@@ -410,10 +519,10 @@ _x86_memio_unmap(bus_space_tag_t t, bus_
}
}
-void
-bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
+static void
+bus_space_reservation_unmap1(bus_space_tag_t t, const bus_space_handle_t bsh,
+ const bus_size_t size, bus_addr_t *bpap)
{
- struct extent *ex;
u_long va, endva;
bus_addr_t bpa;
@@ -421,11 +530,8 @@ bus_space_unmap(bus_space_tag_t t, bus_s
* Find the correct extent and bus physical address.
*/
if (x86_bus_space_is_io(t)) {
- ex = ioport_ex;
bpa = bsh;
} else if (x86_bus_space_is_mem(t)) {
- ex = iomem_ex;
-
if (bsh >= atdevbase && (bsh + size) != 0 &&
(bsh + size) <= (atdevbase + IOM_SIZE)) {
bpa = (bus_addr_t)ISA_PHYSADDR(bsh);
@@ -452,21 +558,61 @@ bus_space_unmap(bus_space_tag_t t, bus_s
uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY);
} else
panic("x86_memio_unmap: bad bus space tag");
-
ok:
- if (extent_free(ex, bpa, size,
- EX_NOWAIT | (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
- printf("x86_memio_unmap: %s 0x%jx, size 0x%jx\n",
- x86_bus_space_is_io(t) ? "port" : "pa",
- (uintmax_t)bpa, (uintmax_t)size);
- printf("x86_memio_unmap: can't free region\n");
+ if (bpap != NULL)
+ *bpap = bpa;
+}
+
+void
+bus_space_reservation_unmap(bus_space_tag_t t, const bus_space_handle_t bsh,
+ const bus_size_t size)
+{
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_RESERVATION_UNMAP) != 0) {
+ (*t->bst_ov->ov_space_reservation_unmap)(t->bst_ctx,
+ t, bsh, size);
+ return;
+ }
+ if (t->bst_super != NULL) {
+ bus_space_reservation_unmap(t->bst_super, bsh, size);
+ return;
+ }
+
+ bus_space_reservation_unmap1(t, bsh, size, NULL);
+}
+
+void
+bus_space_unmap(bus_space_tag_t t, const bus_space_handle_t bsh,
+ const bus_size_t size)
+{
+ bus_space_reservation_t bsr;
+
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_UNMAP) != 0) {
+ (*t->bst_ov->ov_space_unmap)(t->bst_ctx, t, bsh, size);
+ return;
}
+ if (t->bst_super != NULL) {
+ bus_space_unmap(t->bst_super, bsh, size);
+ return;
+ }
+
+ bus_space_reservation_unmap1(t, bsh, size, &bsr.bsr_start);
+
+ bsr.bsr_size = size;
+ bus_space_release(t, &bsr);
}
void
bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
{
+ if ((t->bst_present & BUS_SPACE_OVERRIDE_FREE) != 0) {
+ (*t->bst_ov->ov_space_free)(t->bst_ctx, t, bsh, size);
+ return;
+ }
+ if (t->bst_super != NULL) {
+ bus_space_free(t->bst_super, bsh, size);
+ return;
+ }
/* bus_space_unmap() does all that we need to do. */
bus_space_unmap(t, bsh, size);
}
@@ -720,3 +866,76 @@ bus_space_vaddr(bus_space_tag_t tag, bus
return x86_bus_space_is_mem(tag) ? (void *)bsh : NULL;
}
+
+static const void *
+bit_to_function_pointer(const struct bus_space_overrides *ov, uint64_t bit)
+{
+ switch (bit) {
+ case BUS_SPACE_OVERRIDE_MAP:
+ return ov->ov_space_map;
+ case BUS_SPACE_OVERRIDE_UNMAP:
+ return ov->ov_space_unmap;
+ case BUS_SPACE_OVERRIDE_ALLOC:
+ return ov->ov_space_alloc;
+ case BUS_SPACE_OVERRIDE_FREE:
+ return ov->ov_space_free;
+ case BUS_SPACE_OVERRIDE_RESERVE:
+ return ov->ov_space_reserve;
+ case BUS_SPACE_OVERRIDE_RELEASE:
+ return ov->ov_space_release;
+ case BUS_SPACE_OVERRIDE_RESERVATION_MAP:
+ return ov->ov_space_reservation_map;
+ case BUS_SPACE_OVERRIDE_RESERVATION_UNMAP:
+ return ov->ov_space_reservation_unmap;
+ case BUS_SPACE_OVERRIDE_RESERVE_SUBREGION:
+ return ov->ov_space_reserve_subregion;
+ default:
+ return NULL;
+ }
+}
+
+void
+bus_space_tag_destroy(bus_space_tag_t bst)
+{
+ kmem_free(bst, sizeof(struct bus_space_tag));
+}
+
+int
+bus_space_tag_create(bus_space_tag_t obst, const uint64_t present,
+ const struct bus_space_overrides *ov, void *ctx, bus_space_tag_t *bstp)
+{
+ uint64_t bit, bits, nbits;
+ bus_space_tag_t bst;
+ const void *fp;
+
+ if (ov == NULL || present == 0)
+ return EINVAL;
+
+ bst = kmem_alloc(sizeof(struct bus_space_tag), KM_SLEEP);
+
+ if (bst == NULL)
+ return ENOMEM;
+
+ bst->bst_super = obst;
+ bst->bst_type = obst->bst_type;
+
+ for (bits = present; bits != 0; bits = nbits) {
+ nbits = bits & (bits - 1);
+ bit = nbits ^ bits;
+ if ((fp = bit_to_function_pointer(ov, bit)) == NULL) {
+ printf("%s: missing bit %" PRIx64 "\n", __func__, bit);
+ goto einval;
+ }
+ }
+
+ bst->bst_ov = ov;
+ bst->bst_present = present;
+ bst->bst_ctx = ctx;
+
+ *bstp = bst;
+
+ return 0;
+einval:
+ kmem_free(bst, sizeof(struct bus_space_tag));
+ return EINVAL;
+}
Index: sys/kern/kern_stub.c
===================================================================
RCS file: /cvsroot/src/sys/kern/kern_stub.c,v
retrieving revision 1.31
diff -u -p -r1.31 kern_stub.c
--- sys/kern/kern_stub.c 27 Apr 2011 00:00:46 -0000 1.31
+++ sys/kern/kern_stub.c 25 May 2011 22:29:00 -0000
@@ -81,6 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: kern_stub.c,
#include <sys/bus.h>
bool default_bus_space_is_equal(bus_space_tag_t, bus_space_tag_t);
+bool default_bus_space_handle_is_equal(bus_space_handle_t, bus_space_handle_t);
/*
* Nonexistent system call-- signal process (may want to handle it). Flag
@@ -127,9 +128,12 @@ __weak_alias(spldebug_stop, voidop);
__weak_alias(machdep_init,nullop);
__weak_alias(pci_chipset_tag_create, eopnotsupp);
__weak_alias(pci_chipset_tag_destroy, voidop);
+__weak_alias(bus_space_reserve, eopnotsupp);
+__weak_alias(bus_space_release, voidop);
__weak_alias(bus_space_tag_create, eopnotsupp);
__weak_alias(bus_space_tag_destroy, voidop);
__weak_alias(bus_space_is_equal, default_bus_space_is_equal);
+__weak_alias(bus_space_handle_is_equal, default_bus_space_handle_is_equal);
__weak_alias(kobj_renamespace, nullop);
@@ -265,6 +269,13 @@ nullop(void *v)
}
bool
+default_bus_space_handle_is_equal(bus_space_handle_t h1, bus_space_handle_t h2)
+{
+
+ return memcmp(&h1, &h2, sizeof(h1)) == 0;
+}
+
+bool
default_bus_space_is_equal(bus_space_tag_t t1, bus_space_tag_t t2)
{
Index: sys/sys/bus.h
===================================================================
RCS file: /cvsroot/src/sys/sys/bus.h,v
retrieving revision 1.3
diff -u -p -r1.3 bus.h
--- sys/sys/bus.h 19 Apr 2010 18:24:27 -0000 1.3
+++ sys/sys/bus.h 26 May 2011 02:55:18 -0000
@@ -29,52 +29,84 @@
#ifndef _SYS_BUS_H_
#define _SYS_BUS_H_
-#include <machine/bus.h>
+#include <machine/bus_defs.h>
-struct bus_space_reservation;
+struct bus_space_reservation {
+ bus_addr_t bsr_start;
+ bus_size_t bsr_size;
+};
+
+typedef struct bus_space_reservation bus_space_reservation_t;
-typedef struct bus_space_reservation /* {
- bus_addr_t sr_addr;
- bus_size_t sr_size;
-} */ bus_space_reservation_t;
+static inline bus_size_t
+bus_space_reservation_size(bus_space_reservation_t *bsr)
+{
+ return bsr->bsr_size;
+}
+
+static inline bus_addr_t
+bus_space_reservation_addr(bus_space_reservation_t *bsr)
+{
+ return bsr->bsr_start;
+}
enum bus_space_override_idx {
- BUS_SPACE_OVERRIDE_SPACE_MAP = __BIT(0)
- , BUS_SPACE_OVERRIDE_SPACE_UNMAP = __BIT(1)
- , BUS_SPACE_OVERRIDE_SPACE_ALLOC = __BIT(2)
- , BUS_SPACE_OVERRIDE_SPACE_FREE = __BIT(3)
- , BUS_SPACE_OVERRIDE_SPACE_EXTEND = __BIT(4)
- , BUS_SPACE_OVERRIDE_SPACE_TRIM = __BIT(5)
+ BUS_SPACE_OVERRIDE_MAP = __BIT(0)
+ , BUS_SPACE_OVERRIDE_UNMAP = __BIT(1)
+ , BUS_SPACE_OVERRIDE_ALLOC = __BIT(2)
+ , BUS_SPACE_OVERRIDE_FREE = __BIT(3)
+ , BUS_SPACE_OVERRIDE_RESERVE = __BIT(4)
+ , BUS_SPACE_OVERRIDE_RELEASE = __BIT(5)
+ , BUS_SPACE_OVERRIDE_RESERVATION_MAP = __BIT(6)
+ , BUS_SPACE_OVERRIDE_RESERVATION_UNMAP = __BIT(7)
+ , BUS_SPACE_OVERRIDE_RESERVE_SUBREGION = __BIT(8)
+#if 0
+ , BUS_SPACE_OVERRIDE_EXTEND = __BIT(9)
+ , BUS_SPACE_OVERRIDE_TRIM = __BIT(10)
+#endif
};
/* Only add new members at the end of this struct! */
struct bus_space_overrides {
- int (*bs_space_map)(void *, bus_space_tag_t, bus_addr_t, bus_size_t,
+ int (*ov_space_map)(void *, bus_space_tag_t, bus_addr_t, bus_size_t,
int, bus_space_handle_t *);
- void (*bs_space_unmap)(void *, bus_space_tag_t, bus_space_handle_t,
+ void (*ov_space_unmap)(void *, bus_space_tag_t, bus_space_handle_t,
bus_size_t);
- int (*bs_space_alloc)(void *, bus_space_tag_t, bus_addr_t, bus_addr_t,
+ int (*ov_space_alloc)(void *, bus_space_tag_t, bus_addr_t, bus_addr_t,
bus_size_t, bus_size_t, bus_size_t, int, bus_addr_t *,
bus_space_handle_t *);
- void (*bs_space_free)(void *, bus_space_tag_t, bus_space_handle_t,
+ void (*ov_space_free)(void *, bus_space_tag_t, bus_space_handle_t,
bus_size_t);
- int (*bs_space_reserve)(void *, bus_space_tag_t, bus_addr_t, bus_size_t,
+ int (*ov_space_reserve)(void *, bus_space_tag_t, bus_addr_t, bus_size_t,
+ int, bus_space_reservation_t *);
+
+ void (*ov_space_release)(void *, bus_space_tag_t,
bus_space_reservation_t *);
- void (*bus_space_release)(void *, bus_space_tag_t,
- bus_space_reservation_t);
+ int (*ov_space_reservation_map)(void *, bus_space_tag_t,
+ bus_space_reservation_t *, int, bus_space_handle_t *);
- int (*bs_space_extend)(void *, bus_space_tag_t, bus_space_reservation_t,
- bus_size_t, bus_size_t);
+ void (*ov_space_reservation_unmap)(void *, bus_space_tag_t,
+ bus_space_handle_t, bus_size_t);
- void (*bs_space_trim)(void *, bus_space_tag_t, bus_space_reservation_t,
- bus_size_t, bus_size_t);
+ int (*ov_space_reserve_subregion)(void *, bus_space_tag_t,
+ bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_size_t,
+ int, bus_space_reservation_t *);
+
+#if 0
+ int (*ov_space_extend)(void *, bus_space_tag_t,
+ bus_space_reservation_t *, bus_size_t, bus_size_t);
+
+ void (*ov_space_trim)(void *, bus_space_tag_t,
+ bus_space_reservation_t *, bus_size_t, bus_size_t);
+#endif
};
+bool bus_space_handle_is_equal(bus_space_handle_t, bus_space_handle_t);
bool bus_space_is_equal(bus_space_tag_t, bus_space_tag_t);
int bus_space_tag_create(bus_space_tag_t, uint64_t,
const struct bus_space_overrides *, void *,
@@ -84,20 +116,37 @@ void bus_space_tag_destroy(bus_space_tag
/* Reserve a region of bus space. Reserved bus space cannot be allocated
* with bus_space_alloc(). Reserved space has not been bus_space_map()'d.
*/
-int bus_space_reserve(bus_space_tag_t, bus_addr_t, bus_size_t,
+int bus_space_reserve(bus_space_tag_t, bus_addr_t, bus_size_t, int,
bus_space_reservation_t *);
+int
+bus_space_reserve_subregion(bus_space_tag_t,
+ bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_size_t,
+ int, bus_space_reservation_t *);
+
/* Cancel a reservation. */
-void bus_space_release(bus_space_tag_t, bus_space_reservation_t);
+void bus_space_release(bus_space_tag_t, bus_space_reservation_t *);
+int bus_space_reservation_map(bus_space_tag_t, bus_space_reservation_t *,
+ int, bus_space_handle_t *);
+
+void bus_space_reservation_unmap(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t);
+
+#if 0
/* Extend a reservation to the left and/or to the right. The extension
* has not been bus_space_map()'d.
*/
-int bus_space_extend(bus_space_tag_t, bus_space_reservation_t, bus_size_t,
+int bus_space_extend(bus_space_tag_t, bus_space_reservation_t *, bus_size_t,
bus_size_t);
/* Trim bus space from a reservation on the left and/or on the right. */
-void bus_space_trim(bus_space_tag_t, bus_space_reservation_t, bus_size_t,
+void bus_space_trim(bus_space_tag_t, bus_space_reservation_t *, bus_size_t,
bus_size_t);
+#endif
+
+#include <sys/bus_proto.h>
+
+#include <machine/bus_funcs.h>
#endif /* _SYS_BUS_H_ */
Index: distrib/sets/lists/comp/md.sparc
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/md.sparc,v
retrieving revision 1.73
diff -u -p -r1.73 md.sparc
--- distrib/sets/lists/comp/md.sparc 20 May 2011 21:42:48 -0000 1.73
+++ distrib/sets/lists/comp/md.sparc 28 May 2011 22:51:13 -0000
@@ -72,7 +72,7 @@
./usr/include/sparc64/autoconf.h comp-c-include
./usr/include/sparc64/bsd_openprom.h comp-c-include
./usr/include/sparc64/bswap.h comp-c-include
-./usr/include/sparc64/bus.h comp-c-include
+./usr/include/sparc64/bus.h comp-obsolete obsolete
./usr/include/sparc64/cdefs.h comp-c-include
./usr/include/sparc64/cgtworeg.h comp-c-include
./usr/include/sparc64/conf.h comp-obsolete obsolete
Index: distrib/sets/lists/comp/md.sparc64
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/md.sparc64,v
retrieving revision 1.99
diff -u -p -r1.99 md.sparc64
--- distrib/sets/lists/comp/md.sparc64 26 May 2011 00:44:14 -0000 1.99
+++ distrib/sets/lists/comp/md.sparc64 28 May 2011 22:51:13 -0000
@@ -72,7 +72,7 @@
./usr/include/sparc64/autoconf.h comp-c-include
./usr/include/sparc64/bsd_openprom.h comp-c-include
./usr/include/sparc64/bswap.h comp-c-include
-./usr/include/sparc64/bus.h comp-c-include
+./usr/include/sparc64/bus.h comp-obsolete obsolete
./usr/include/sparc64/cdefs.h comp-c-include
./usr/include/sparc64/cgtworeg.h comp-c-include
./usr/include/sparc64/conf.h comp-obsolete obsolete
Index: share/man/man9/bus_dma.9
===================================================================
RCS file: /cvsroot/src/share/man/man9/bus_dma.9,v
retrieving revision 1.53
diff -u -p -r1.53 bus_dma.9
--- share/man/man9/bus_dma.9 14 May 2010 18:52:46 -0000 1.53
+++ share/man/man9/bus_dma.9 30 May 2011 02:40:03 -0000
@@ -95,9 +95,12 @@
.Sh DESCRIPTION
Provide a bus- and machine-independent "DMA mapping interface."
.Sh IMPLEMENTATION NOTES
-All data structures, function prototypes, and macros will be defined
+All data types and constants will be defined
by the port-specific header
-.In machine/bus.h .
+.In machine/bus_defs.h .
+All functions will be defined
+by the port-specific header
+.In machine/bus_funcs.h .
Note that this document
assumes the existence of types already defined by the current "bus.h"
interface.
Index: share/man/man9/bus_space.9
===================================================================
RCS file: /cvsroot/src/share/man/man9/bus_space.9,v
retrieving revision 1.40
diff -u -p -r1.40 bus_space.9
--- share/man/man9/bus_space.9 16 Apr 2010 20:05:37 -0000 1.40
+++ share/man/man9/bus_space.9 30 May 2011 02:40:03 -0000
@@ -380,7 +380,9 @@ functions.
Implementations are encouraged to implement prototyped (type-checked)
versions of these interfaces, but may implement them as macros if appropriate.
Machine-dependent types, variables, and functions should be marked clearly in
-.In machine/bus.h
+.In machine/bus_defs.h
+and in
+.In machine/bus_funcs.h
to avoid confusion with the
machine-independent types and functions, and, if possible, should be
given names which make the machine-dependence clear.
@@ -496,7 +498,7 @@ Functions which take a count of bytes ha
is zero.
.Sh TYPES
Several types are defined in
-.In machine/bus.h
+.In machine/bus_defs.h
to facilitate use of the
.Nm
functions by drivers.
Index: share/man/man9/ioasic.9
===================================================================
RCS file: /cvsroot/src/share/man/man9/ioasic.9,v
retrieving revision 1.11
diff -u -p -r1.11 ioasic.9
--- share/man/man9/ioasic.9 2 Dec 2010 12:54:13 -0000 1.11
+++ share/man/man9/ioasic.9 30 May 2011 02:40:03 -0000
@@ -39,7 +39,7 @@
.Nm ioasic_submatch
.Nd baseboard I/O control ASIC for DEC TURBOchannel systems
.Sh SYNOPSIS
-.In machine/bus.h
+.In sys/bus.h
.In dev/tc/tcvar.h
.In dev/tc/ioasicreg.h
.In dev/tc/ioasicvar.h
Index: share/man/man9/tc.9
===================================================================
RCS file: /cvsroot/src/share/man/man9/tc.9,v
retrieving revision 1.11
diff -u -p -r1.11 tc.9
--- share/man/man9/tc.9 2 Dec 2010 12:54:13 -0000 1.11
+++ share/man/man9/tc.9 30 May 2011 02:40:03 -0000
@@ -43,7 +43,7 @@
.Nm TC_PHYS_TO_UNCACHED
.Nd TURBOchannel bus
.Sh SYNOPSIS
-.In machine/bus.h
+.In sys/bus.h
.In dev/tc/tcvar.h
.In dev/tc/tcdevs.h
.Ft void
Index: share/man/man9/vme.9
===================================================================
RCS file: /cvsroot/src/share/man/man9/vme.9,v
retrieving revision 1.12
diff -u -p -r1.12 vme.9
--- share/man/man9/vme.9 2 Dec 2010 12:54:13 -0000 1.12
+++ share/man/man9/vme.9 30 May 2011 02:40:03 -0000
@@ -48,7 +48,7 @@
.Nm vme_space_get
.Nd Versa Module Euroboard bus
.Sh SYNOPSIS
-.In machine/bus.h
+.In sys/bus.h
.In dev/vme/vmereg.h
.In dev/vme/vmevar.h
.Ft int
Index: sys/arch/cobalt/cobalt/bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/cobalt/bus.c,v
retrieving revision 1.40
diff -u -p -r1.40 bus.c
--- sys/arch/cobalt/cobalt/bus.c 3 May 2011 09:15:20 -0000 1.40
+++ sys/arch/cobalt/cobalt/bus.c 25 May 2011 22:28:45 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.40
#include <sys/mbuf.h>
#define _COBALT_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <common/bus_dma/bus_dmamem_common.h>
Index: sys/arch/x86/x86/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/consinit.c,v
retrieving revision 1.21
diff -u -p -r1.21 consinit.c
--- sys/arch/x86/x86/consinit.c 28 Apr 2010 19:17:04 -0000 1.21
+++ sys/arch/x86/x86/consinit.c 25 May 2011 22:28:57 -0000
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
#include <arch/x86/include/genfb_machdep.h>
Index: sys/arch/x86/x86/genfb_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/genfb_machdep.c,v
retrieving revision 1.9
diff -u -p -r1.9 genfb_machdep.c
--- sys/arch/x86/x86/genfb_machdep.c 15 Feb 2011 18:10:33 -0000 1.9
+++ sys/arch/x86/x86/genfb_machdep.c 25 May 2011 22:28:57 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: genfb_machde
#include <sys/kernel.h>
#include <sys/lwp.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
#include <machine/mtrr.h>
Index: sys/arch/x86/x86/mp.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/mp.c,v
retrieving revision 1.2
diff -u -p -r1.2 mp.c
--- sys/arch/x86/x86/mp.c 13 Jun 2009 13:35:11 -0000 1.2
+++ sys/arch/x86/x86/mp.c 25 May 2011 22:28:57 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: mp.c,v 1.2 2
#include <machine/specialreg.h>
#include <machine/cpuvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mpconfig.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/x86/x86/mpacpi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/mpacpi.c,v
retrieving revision 1.91
diff -u -p -r1.91 mpacpi.c
--- sys/arch/x86/x86/mpacpi.c 5 Apr 2011 13:17:04 -0000 1.91
+++ sys/arch/x86/x86/mpacpi.c 25 May 2011 22:28:57 -0000
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpacpi.c,v 1
#include <machine/specialreg.h>
#include <machine/cpuvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/mpacpi.h>
#include <machine/mpbiosvar.h>
Index: sys/arch/xen/i386/npx_hv.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/i386/npx_hv.c,v
retrieving revision 1.8
diff -u -p -r1.8 npx_hv.c
--- sys/arch/xen/i386/npx_hv.c 23 Oct 2009 02:32:33 -0000 1.8
+++ sys/arch/xen/i386/npx_hv.c 25 May 2011 22:28:57 -0000
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: npx_hv.c,v 1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/stdarg.h>
#include <xen/xen.h>
Index: sys/arch/xen/x86/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/x86/consinit.c,v
retrieving revision 1.14
diff -u -p -r1.14 consinit.c
--- sys/arch/xen/x86/consinit.c 28 Apr 2010 19:17:04 -0000 1.14
+++ sys/arch/xen/x86/consinit.c 25 May 2011 22:28:57 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
#include "xencons.h"
Index: sys/arch/xen/x86/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/x86/mainbus.c,v
retrieving revision 1.13
diff -u -p -r1.13 mainbus.c
--- sys/arch/xen/x86/mainbus.c 12 Nov 2010 02:07:27 -0000 1.13
+++ sys/arch/xen/x86/mainbus.c 25 May 2011 22:28:57 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "hypervisor.h"
#include "pci.h"
Index: sys/arch/xen/x86/xen_bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/x86/xen_bus_dma.c,v
retrieving revision 1.22
diff -u -p -r1.22 xen_bus_dma.c
--- sys/arch/xen/x86/xen_bus_dma.c 12 Nov 2010 10:51:14 -0000 1.22
+++ sys/arch/xen/x86/xen_bus_dma.c 25 May 2011 22:28:57 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: xen_bus_dma.
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <uvm/uvm.h>
Index: sys/arch/xen/xen/isa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/xen/isa_machdep.c,v
retrieving revision 1.23
diff -u -p -r1.23 isa_machdep.c
--- sys/arch/xen/xen/isa_machdep.c 6 Feb 2010 17:48:54 -0000 1.23
+++ sys/arch/xen/xen/isa_machdep.c 25 May 2011 22:28:57 -0000
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.
#include <sys/proc.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <machine/pio.h>
Index: sys/arch/xen/xen/pci_intr_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/xen/pci_intr_machdep.c,v
retrieving revision 1.14
diff -u -p -r1.14 pci_intr_machdep.c
--- sys/arch/xen/xen/pci_intr_machdep.c 4 Apr 2011 20:37:55 -0000 1.14
+++ sys/arch/xen/xen/pci_intr_machdep.c 25 May 2011 22:28:57 -0000
@@ -32,7 +32,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_intr_mac
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <dev/pci/pcivar.h>
Index: sys/external/bsd/drm/dist/bsd-core/drmP.h
===================================================================
RCS file: /cvsroot/src/sys/external/bsd/drm/dist/bsd-core/drmP.h,v
retrieving revision 1.21
diff -u -p -r1.21 drmP.h
--- sys/external/bsd/drm/dist/bsd-core/drmP.h 24 Feb 2011 07:59:44 -0000
1.21
+++ sys/external/bsd/drm/dist/bsd-core/drmP.h 25 May 2011 22:29:00 -0000
@@ -74,7 +74,7 @@ struct drm_file;
#include <machine/param.h>
#endif
#include <machine/pmap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined(__i386__) || defined(__x86_64__)
#include <machine/specialreg.h>
#include <machine/sysarch.h>
Index: sys/arch/sparc64/sparc64/rbus_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/rbus_machdep.c,v
retrieving revision 1.15
diff -u -p -r1.15 rbus_machdep.c
--- sys/arch/sparc64/sparc64/rbus_machdep.c 14 Mar 2009 21:04:16 -0000
1.15
+++ sys/arch/sparc64/sparc64/rbus_machdep.c 25 May 2011 22:28:56 -0000
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep
#include <sys/extent.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/openfirm.h>
#include <machine/promlib.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/sparc64/sparc64/vm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/vm_machdep.c,v
retrieving revision 1.96
diff -u -p -r1.96 vm_machdep.c
--- sys/arch/sparc64/sparc64/vm_machdep.c 24 Feb 2011 04:28:48 -0000
1.96
+++ sys/arch/sparc64/sparc64/vm_machdep.c 25 May 2011 22:28:56 -0000
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c
#include <machine/frame.h>
#include <machine/pcb.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Map a user I/O request into kernel virtual address space.
Index: sys/arch/x86/acpi/acpi_wakeup.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/acpi/acpi_wakeup.c,v
retrieving revision 1.28
diff -u -p -r1.28 acpi_wakeup.c
--- sys/arch/x86/acpi/acpi_wakeup.c 16 Feb 2011 18:55:50 -0000 1.28
+++ sys/arch/x86/acpi/acpi_wakeup.c 25 May 2011 22:28:56 -0000
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
cvs diff: cannot find sys/arch/x86/include/bus.h
Index: sys/arch/x86/include/isa_machdep.h
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/include/isa_machdep.h,v
retrieving revision 1.10
diff -u -p -r1.10 isa_machdep.h
--- sys/arch/x86/include/isa_machdep.h 19 Aug 2009 15:04:27 -0000 1.10
+++ sys/arch/x86/include/isa_machdep.h 25 May 2011 22:28:56 -0000
@@ -72,7 +72,7 @@
#ifndef _X86_ISA_MACHDEP_H_ /* XXX */
#define _X86_ISA_MACHDEP_H_ /* XXX */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/x86/include/mpconfig.h
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/include/mpconfig.h,v
retrieving revision 1.12
diff -u -p -r1.12 mpconfig.h
--- sys/arch/x86/include/mpconfig.h 9 Jan 2010 20:56:17 -0000 1.12
+++ sys/arch/x86/include/mpconfig.h 25 May 2011 22:28:56 -0000
@@ -11,7 +11,7 @@
/*
* XXX
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <machine/pci_machdep.h>
Index: sys/arch/x86/pci/agp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/agp_machdep.c,v
retrieving revision 1.1
diff -u -p -r1.1 agp_machdep.c
--- sys/arch/x86/pci/agp_machdep.c 18 Dec 2006 12:11:33 -0000 1.1
+++ sys/arch/x86/pci/agp_machdep.c 25 May 2011 22:28:56 -0000
@@ -7,7 +7,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_machdep.
#include <sys/device.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/x86/pci/amdpcib_hpet.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/amdpcib_hpet.c,v
retrieving revision 1.4
diff -u -p -r1.4 amdpcib_hpet.c
--- sys/arch/x86/pci/amdpcib_hpet.c 21 Mar 2008 13:25:27 -0000 1.4
+++ sys/arch/x86/pci/amdpcib_hpet.c 25 May 2011 22:28:56 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: amdpcib_hpet
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/x86/pci/fwhrng.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/fwhrng.c,v
retrieving revision 1.2
diff -u -p -r1.2 fwhrng.c
--- sys/arch/x86/pci/fwhrng.c 23 Aug 2010 02:57:19 -0000 1.2
+++ sys/arch/x86/pci/fwhrng.c 25 May 2011 22:28:56 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: fwhrng.c,v 1
#include <sys/time.h>
#include <sys/rnd.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/x86/pci/i82802reg.h>
Index: sys/arch/x86/pci/ichlpcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/ichlpcib.c,v
retrieving revision 1.29
diff -u -p -r1.29 ichlpcib.c
--- sys/arch/x86/pci/ichlpcib.c 4 Apr 2011 20:37:55 -0000 1.29
+++ sys/arch/x86/pci/ichlpcib.c 25 May 2011 22:28:57 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: ichlpcib.c,v
#include <sys/sysctl.h>
#include <sys/timetc.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/x86/pci/pchb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pchb.c,v
retrieving revision 1.25
diff -u -p -r1.25 pchb.c
--- sys/arch/x86/pci/pchb.c 17 May 2011 17:34:53 -0000 1.25
+++ sys/arch/x86/pci/pchb.c 25 May 2011 22:28:57 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.2
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/x86/pci/pci_addr_fixup.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pci_addr_fixup.c,v
retrieving revision 1.5
diff -u -p -r1.5 pci_addr_fixup.c
--- sys/arch/x86/pci/pci_addr_fixup.c 26 Jul 2010 22:33:23 -0000 1.5
+++ sys/arch/x86/pci/pci_addr_fixup.c 25 May 2011 22:28:57 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_addr_fix
#include <sys/device.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/x86/pci/pci_bus_fixup.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pci_bus_fixup.c,v
retrieving revision 1.1
diff -u -p -r1.1 pci_bus_fixup.c
--- sys/arch/x86/pci/pci_bus_fixup.c 18 May 2008 02:06:14 -0000 1.1
+++ sys/arch/x86/pci/pci_bus_fixup.c 25 May 2011 22:28:57 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_bus_fixu
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/x86/pci/pcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/pcib.c,v
retrieving revision 1.12
diff -u -p -r1.12 pcib.c
--- sys/arch/x86/pci/pcib.c 28 Apr 2010 19:17:04 -0000 1.12
+++ sys/arch/x86/pci/pcib.c 25 May 2011 22:28:57 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/x86/pci/rdcpcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/pci/rdcpcib.c,v
retrieving revision 1.1
diff -u -p -r1.1 rdcpcib.c
--- sys/arch/x86/pci/rdcpcib.c 4 Apr 2011 17:09:39 -0000 1.1
+++ sys/arch/x86/pci/rdcpcib.c 25 May 2011 22:28:57 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: rdcpcib.c,v
#include <sys/sysctl.h>
#include <sys/timetc.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/x86/x86/acpi_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/acpi_machdep.c,v
retrieving revision 1.29
diff -u -p -r1.29 acpi_machdep.c
--- sys/arch/x86/x86/acpi_machdep.c 14 Jan 2011 18:33:34 -0000 1.29
+++ sys/arch/x86/x86/acpi_machdep.c 25 May 2011 22:28:57 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_machdep
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <dev/acpi/acpica.h>
Index: sys/arch/x86/x86/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/bus_dma.c,v
retrieving revision 1.56
diff -u -p -r1.56 bus_dma.c
--- sys/arch/x86/x86/bus_dma.c 6 Nov 2010 11:46:03 -0000 1.56
+++ sys/arch/x86/x86/bus_dma.c 25 May 2011 22:28:57 -0000
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <machine/i82093var.h>
#include <machine/mpbiosvar.h>
Index: sys/arch/sparc/sparc/memecc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/memecc.c,v
retrieving revision 1.11
diff -u -p -r1.11 memecc.c
--- sys/arch/sparc/sparc/memecc.c 16 Dec 2008 22:35:26 -0000 1.11
+++ sys/arch/sparc/sparc/memecc.c 25 May 2011 22:28:55 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: memecc.c,v 1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <sparc/sparc/memeccreg.h>
Index: sys/arch/sparc/sparc/mkclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/mkclock.c,v
retrieving revision 1.18
diff -u -p -r1.18 mkclock.c
--- sys/arch/sparc/sparc/mkclock.c 28 Apr 2008 20:23:36 -0000 1.18
+++ sys/arch/sparc/sparc/mkclock.c 25 May 2011 22:28:55 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mkclock.c,v
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
#include <machine/promlib.h>
Index: sys/arch/sparc/sparc/msiiep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/msiiep.c,v
retrieving revision 1.40
diff -u -p -r1.40 msiiep.c
--- sys/arch/sparc/sparc/msiiep.c 17 May 2011 17:34:53 -0000 1.40
+++ sys/arch/sparc/sparc/msiiep.c 25 May 2011 22:28:55 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: msiiep.c,v 1
#include <uvm/uvm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/promlib.h>
Index: sys/arch/sparc/sparc/oclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/oclock.c,v
retrieving revision 1.19
diff -u -p -r1.19 oclock.c
--- sys/arch/sparc/sparc/oclock.c 3 Jan 2010 23:03:21 -0000 1.19
+++ sys/arch/sparc/sparc/oclock.c 25 May 2011 22:28:55 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: oclock.c,v 1
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/promlib.h>
#include <machine/autoconf.h>
Index: sys/arch/sparc/sparc/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/pci_machdep.c,v
retrieving revision 1.15
diff -u -p -r1.15 pci_machdep.c
--- sys/arch/sparc/sparc/pci_machdep.c 4 Apr 2011 20:37:54 -0000 1.15
+++ sys/arch/sparc/sparc/pci_machdep.c 25 May 2011 22:28:55 -0000
@@ -64,7 +64,7 @@ int sparc_pci_debug = 0;
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/ctlreg.h>
Index: sys/arch/sparc/sparc/timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/timer.c,v
retrieving revision 1.27
diff -u -p -r1.27 timer.c
--- sys/arch/sparc/sparc/timer.c 14 Feb 2011 10:20:31 -0000 1.27
+++ sys/arch/sparc/sparc/timer.c 25 May 2011 22:28:55 -0000
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer.c,v 1.
#include <sys/timetc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/timerreg.h>
#include <sparc/sparc/timervar.h>
Index: sys/arch/sparc/sparc/timer_sun4.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/timer_sun4.c,v
retrieving revision 1.17
diff -u -p -r1.17 timer_sun4.c
--- sys/arch/sparc/sparc/timer_sun4.c 4 Jan 2010 03:54:42 -0000 1.17
+++ sys/arch/sparc/sparc/timer_sun4.c 25 May 2011 22:28:55 -0000
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_sun4.c
#include <sys/systm.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/vaddrs.h>
#include <sparc/sparc/timerreg.h>
Index: sys/arch/sparc/sparc/timer_sun4m.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/timer_sun4m.c,v
retrieving revision 1.25
diff -u -p -r1.25 timer_sun4m.c
--- sys/arch/sparc/sparc/timer_sun4m.c 15 Feb 2011 09:56:32 -0000 1.25
+++ sys/arch/sparc/sparc/timer_sun4m.c 25 May 2011 22:28:55 -0000
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_sun4m.
#include <sys/cpu.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/vaddrs.h>
#include <sparc/sparc/cpuvar.h>
Index: sys/arch/sparc64/dev/com_ebus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/com_ebus.c,v
retrieving revision 1.31
diff -u -p -r1.31 com_ebus.c
--- sys/arch/sparc64/dev/com_ebus.c 15 Mar 2011 11:22:18 -0000 1.31
+++ sys/arch/sparc64/dev/com_ebus.c 25 May 2011 22:28:55 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v
#include <sys/tty.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: sys/arch/sparc64/dev/ebus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/ebus.c,v
retrieving revision 1.56
diff -u -p -r1.56 ebus.c
--- sys/arch/sparc64/dev/ebus.c 18 Mar 2011 09:52:54 -0000 1.56
+++ sys/arch/sparc64/dev/ebus.c 25 May 2011 22:28:55 -0000
@@ -64,7 +64,7 @@ int ebus_debug = 0x0;
#include <sys/time.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: sys/arch/sparc64/dev/ebus_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/ebus_mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 ebus_mainbus.c
--- sys/arch/sparc64/dev/ebus_mainbus.c 16 Mar 2011 04:00:42 -0000 1.3
+++ sys/arch/sparc64/dev/ebus_mainbus.c 25 May 2011 22:28:55 -0000
@@ -40,7 +40,7 @@ extern int ebus_debug;
#include <sys/time.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: sys/arch/sparc64/dev/ebusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/ebusvar.h,v
retrieving revision 1.9
diff -u -p -r1.9 ebusvar.h
--- sys/arch/sparc64/dev/ebusvar.h 18 Mar 2011 09:52:54 -0000 1.9
+++ sys/arch/sparc64/dev/ebusvar.h 25 May 2011 22:28:55 -0000
@@ -36,7 +36,7 @@
#include <sys/time.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/sparc64/dev/ffb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/ffb.c,v
retrieving revision 1.41
diff -u -p -r1.41 ffb.c
--- sys/arch/sparc64/dev/ffb.c 9 May 2011 09:06:28 -0000 1.41
+++ sys/arch/sparc64/dev/ffb.c 25 May 2011 22:28:55 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.41
#include <sys/malloc.h>
#include <sys/mman.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
#include <machine/vmparam.h>
Index: sys/arch/sparc64/dev/ffb_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/ffb_mainbus.c,v
retrieving revision 1.9
diff -u -p -r1.9 ffb_mainbus.c
--- sys/arch/sparc64/dev/ffb_mainbus.c 21 Sep 2010 03:31:04 -0000 1.9
+++ sys/arch/sparc64/dev/ffb_mainbus.c 25 May 2011 22:28:55 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ffb_mainbus.
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: sys/arch/sparc64/dev/gfb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/gfb.c,v
retrieving revision 1.3
diff -u -p -r1.3 gfb.c
--- sys/arch/sparc64/dev/gfb.c 31 Aug 2010 03:08:23 -0000 1.3
+++ sys/arch/sparc64/dev/gfb.c 25 May 2011 22:28:56 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: gfb.c,v 1.3
#include <dev/videomode/videomode.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: sys/arch/sparc64/dev/iommu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/iommu.c,v
retrieving revision 1.103
diff -u -p -r1.103 iommu.c
--- sys/arch/sparc64/dev/iommu.c 20 Mar 2011 21:26:36 -0000 1.103
+++ sys/arch/sparc64/dev/iommu.c 25 May 2011 22:28:56 -0000
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc64/dev/iommureg.h>
#include <sparc64/dev/iommuvar.h>
Index: sys/arch/sparc64/dev/lpt_ebus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/lpt_ebus.c,v
retrieving revision 1.22
diff -u -p -r1.22 lpt_ebus.c
--- sys/arch/sparc64/dev/lpt_ebus.c 29 May 2008 14:51:26 -0000 1.22
+++ sys/arch/sparc64/dev/lpt_ebus.c 25 May 2011 22:28:56 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_ebus.c,v
#include <sys/device.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ebus/ebusreg.h>
#include <dev/ebus/ebusvar.h>
Index: sys/arch/sparc64/dev/mkclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/mkclock.c,v
retrieving revision 1.7
diff -u -p -r1.7 mkclock.c
--- sys/arch/sparc64/dev/mkclock.c 12 Mar 2011 11:42:57 -0000 1.7
+++ sys/arch/sparc64/dev/mkclock.c 25 May 2011 22:28:56 -0000
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: mkclock.c,v
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
#include <machine/cpu.h>
Index: sys/arch/sparc64/dev/pcfiic_ebus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/pcfiic_ebus.c,v
retrieving revision 1.1
diff -u -p -r1.1 pcfiic_ebus.c
--- sys/arch/sparc64/dev/pcfiic_ebus.c 28 Feb 2010 11:49:44 -0000 1.1
+++ sys/arch/sparc64/dev/pcfiic_ebus.c 25 May 2011 22:28:56 -0000
@@ -29,7 +29,7 @@
#include <sys/kernel.h>
#include <sys/rwlock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/openfirm.h>
#include <machine/autoconf.h>
Index: sys/arch/sparc64/dev/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/pci_machdep.c,v
retrieving revision 1.72
diff -u -p -r1.72 pci_machdep.c
--- sys/arch/sparc64/dev/pci_machdep.c 11 May 2011 22:26:46 -0000 1.72
+++ sys/arch/sparc64/dev/pci_machdep.c 25 May 2011 22:28:56 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/malloc.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/sparc64/dev/psm.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/psm.c,v
retrieving revision 1.7
diff -u -p -r1.7 psm.c
--- sys/arch/sparc64/dev/psm.c 5 Apr 2008 13:40:05 -0000 1.7
+++ sys/arch/sparc64/dev/psm.c 25 May 2011 22:28:56 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: psm.c,v 1.7
#include <sys/kauth.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ebus/ebusreg.h>
Index: sys/arch/sparc64/dev/psycho.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/psycho.c,v
retrieving revision 1.106
diff -u -p -r1.106 psycho.c
--- sys/arch/sparc64/dev/psycho.c 17 May 2011 17:34:53 -0000 1.106
+++ sys/arch/sparc64/dev/psycho.c 25 May 2011 22:28:56 -0000
@@ -88,7 +88,7 @@ int psycho_debug = 0x0;
#include <uvm/uvm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/psl.h>
Index: sys/arch/sparc64/dev/pyro.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/pyro.c,v
retrieving revision 1.5
diff -u -p -r1.5 pyro.c
--- sys/arch/sparc64/dev/pyro.c 17 May 2011 17:34:53 -0000 1.5
+++ sys/arch/sparc64/dev/pyro.c 25 May 2011 22:28:56 -0000
@@ -37,7 +37,7 @@
#include <sys/systm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#ifdef DDB
Index: sys/arch/sparc64/dev/rtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/rtc.c,v
retrieving revision 1.7
diff -u -p -r1.7 rtc.c
--- sys/arch/sparc64/dev/rtc.c 11 Mar 2010 03:54:56 -0000 1.7
+++ sys/arch/sparc64/dev/rtc.c 25 May 2011 22:28:56 -0000
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.7
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/clock_subr.h>
Index: sys/arch/sparc64/dev/sbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/sbus.c,v
retrieving revision 1.87
diff -u -p -r1.87 sbus.c
--- sys/arch/sparc64/dev/sbus.c 16 Mar 2011 05:49:43 -0000 1.87
+++ sys/arch/sparc64/dev/sbus.c 25 May 2011 22:28:56 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.8
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/openfirm.h>
#include <sparc64/dev/iommureg.h>
Index: sys/arch/sparc64/dev/sbusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/sbusvar.h,v
retrieving revision 1.17
diff -u -p -r1.17 sbusvar.h
--- sys/arch/sparc64/dev/sbusvar.h 17 Sep 2009 16:28:12 -0000 1.17
+++ sys/arch/sparc64/dev/sbusvar.h 25 May 2011 22:28:56 -0000
@@ -72,7 +72,7 @@
#ifndef _SBUS_VAR_SPARC64_H_
#define _SBUS_VAR_SPARC64_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Macro to convert a PROM virtual address to a bus_space_handle_t.
Index: sys/arch/sparc64/dev/schizo.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/schizo.c,v
retrieving revision 1.20
diff -u -p -r1.20 schizo.c
--- sys/arch/sparc64/dev/schizo.c 17 May 2011 17:34:53 -0000 1.20
+++ sys/arch/sparc64/dev/schizo.c 25 May 2011 22:28:56 -0000
@@ -39,7 +39,7 @@
#include <sys/reboot.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/psl.h>
Index: sys/arch/sparc64/dev/upa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/dev/upa.c,v
retrieving revision 1.15
diff -u -p -r1.15 upa.c
--- sys/arch/sparc64/dev/upa.c 12 Jan 2010 14:45:50 -0000 1.15
+++ sys/arch/sparc64/dev/upa.c 25 May 2011 22:28:56 -0000
@@ -39,7 +39,7 @@
#include <sys/conf.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
Index: sys/arch/sparc64/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/include/autoconf.h,v
retrieving revision 1.29
diff -u -p -r1.29 autoconf.h
--- sys/arch/sparc64/include/autoconf.h 12 Mar 2011 11:43:38 -0000 1.29
+++ sys/arch/sparc64/include/autoconf.h 25 May 2011 22:28:56 -0000
@@ -73,7 +73,7 @@
* Autoconfiguration information.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/promlib.h>
/* This is used to map device classes to IPLs */
cvs diff: cannot find sys/arch/sparc64/include/bus.h
Index: sys/arch/sparc64/include/z8530var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/include/z8530var.h,v
retrieving revision 1.12
diff -u -p -r1.12 z8530var.h
--- sys/arch/sparc64/include/z8530var.h 29 Mar 2008 19:15:35 -0000 1.12
+++ sys/arch/sparc64/include/z8530var.h 25 May 2011 22:28:56 -0000
@@ -40,7 +40,7 @@
* @(#)zsvar.h 8.1 (Berkeley) 6/11/93
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/z8530sc.h>
#include "kbd.h" /* NKBD */
Index: sys/arch/sparc64/sparc64/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/autoconf.c,v
retrieving revision 1.177
diff -u -p -r1.177 autoconf.c
--- sys/arch/sparc64/sparc64/autoconf.c 12 May 2011 05:42:22 -0000 1.177
+++ sys/arch/sparc64/sparc64/autoconf.c 25 May 2011 22:28:56 -0000
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/openfirm.h>
#include <machine/sparc64.h>
Index: sys/arch/sparc64/sparc64/clock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/clock.c,v
retrieving revision 1.103
diff -u -p -r1.103 clock.c
--- sys/arch/sparc64/sparc64/clock.c 12 May 2011 05:43:06 -0000 1.103
+++ sys/arch/sparc64/sparc64/clock.c 25 May 2011 22:28:56 -0000
@@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
#include <machine/cpu.h>
Index: sys/arch/sparc64/sparc64/core_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/core_machdep.c,v
retrieving revision 1.4
diff -u -p -r1.4 core_machdep.c
--- sys/arch/sparc64/sparc64/core_machdep.c 14 Jan 2011 02:06:32 -0000
1.4
+++ sys/arch/sparc64/sparc64/core_machdep.c 25 May 2011 22:28:56 -0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: core_machdep
#include <machine/frame.h>
#include <machine/pcb.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* cpu_coredump is called to write a core dump header.
Index: sys/arch/sparc64/sparc64/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/sparc64/machdep.c,v
retrieving revision 1.256
diff -u -p -r1.256 machdep.c
--- sys/arch/sparc64/sparc64/machdep.c 4 Mar 2011 22:25:29 -0000 1.256
+++ sys/arch/sparc64/sparc64/machdep.c 25 May 2011 22:28:56 -0000
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#define _SPARC_BUS_DMA_PRIVATE
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/frame.h>
#include <machine/cpu.h>
#include <machine/pcb.h>
Index: sys/arch/sparc/sparc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/machdep.c,v
retrieving revision 1.309
diff -u -p -r1.309 machdep.c
--- sys/arch/sparc/sparc/machdep.c 16 May 2011 18:08:04 -0000 1.309
+++ sys/arch/sparc/sparc/machdep.c 25 May 2011 22:28:55 -0000
@@ -116,7 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#define _SPARC_BUS_DMA_PRIVATE
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/frame.h>
#include <machine/cpu.h>
#include <machine/pcb.h>
Index: sys/arch/sgimips/sgimips/console.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/sgimips/console.c,v
retrieving revision 1.41
diff -u -p -r1.41 console.c
--- sys/arch/sgimips/sgimips/console.c 20 Feb 2011 07:59:51 -0000 1.41
+++ sys/arch/sgimips/sgimips/console.c 25 May 2011 22:28:54 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: console.c,v
#include <sys/termios.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <dev/cons.h>
Index: sys/arch/sgimips/sgimips/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/sgimips/machdep.c,v
retrieving revision 1.134
diff -u -p -r1.134 machdep.c
--- sys/arch/sgimips/sgimips/machdep.c 20 Feb 2011 07:59:51 -0000 1.134
+++ sys/arch/sgimips/sgimips/machdep.c 25 May 2011 22:28:54 -0000
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/sysconf.h>
#include <machine/intr.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/locore.h>
#include <mips/cache.h>
Index: sys/arch/sh3/dev/shpcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/dev/shpcic.c,v
retrieving revision 1.14
diff -u -p -r1.14 shpcic.c
--- sys/arch/sh3/dev/shpcic.c 17 May 2011 17:34:52 -0000 1.14
+++ sys/arch/sh3/dev/shpcic.c 25 May 2011 22:28:54 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1
#include <sh3/exception.h>
#include <sh3/pcicreg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pci_machdep.h>
Index: sys/arch/sh3/dev/shpcicvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sh3/dev/shpcicvar.h,v
retrieving revision 1.7
diff -u -p -r1.7 shpcicvar.h
--- sys/arch/sh3/dev/shpcicvar.h 2 Aug 2009 00:06:44 -0000 1.7
+++ sys/arch/sh3/dev/shpcicvar.h 25 May 2011 22:28:54 -0000
@@ -29,7 +29,7 @@
#ifndef _SH3_SHPCICVAR_H_
#define _SH3_SHPCICVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
bus_space_tag_t shpcic_get_bus_io_tag(void);
bus_space_tag_t shpcic_get_bus_mem_tag(void);
cvs diff: cannot find sys/arch/sh3/include/bus.h
Index: sys/arch/sparc/dev/bootbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/bootbus.c,v
retrieving revision 1.17
diff -u -p -r1.17 bootbus.c
--- sys/arch/sparc/dev/bootbus.c 20 Sep 2009 16:18:21 -0000 1.17
+++ sys/arch/sparc/dev/bootbus.c 25 May 2011 22:28:54 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: bootbus.c,v
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/cpuunitvar.h>
#include <sparc/dev/bootbusvar.h>
Index: sys/arch/sparc/dev/cgsix_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/cgsix_obio.c,v
retrieving revision 1.23
diff -u -p -r1.23 cgsix_obio.c
--- sys/arch/sparc/dev/cgsix_obio.c 12 Dec 2008 18:50:13 -0000 1.23
+++ sys/arch/sparc/dev/cgsix_obio.c 25 May 2011 22:28:54 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c
#include <sys/syslog.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
Index: sys/arch/sparc/dev/com_ebus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/com_ebus.c,v
retrieving revision 1.15
diff -u -p -r1.15 com_ebus.c
--- sys/arch/sparc/dev/com_ebus.c 28 Apr 2008 20:23:35 -0000 1.15
+++ sys/arch/sparc/dev/com_ebus.c 25 May 2011 22:28:54 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_ebus.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/sparc/dev/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/com_obio.c,v
retrieving revision 1.23
diff -u -p -r1.23 com_obio.c
--- sys/arch/sparc/dev/com_obio.c 21 Nov 2009 04:16:51 -0000 1.23
+++ sys/arch/sparc/dev/com_obio.c 25 May 2011 22:28:54 -0000
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/sparc/dev/dma_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/dma_obio.c,v
retrieving revision 1.11
diff -u -p -r1.11 dma_obio.c
--- sys/arch/sparc/dev/dma_obio.c 28 Apr 2008 20:23:35 -0000 1.11
+++ sys/arch/sparc/dev/dma_obio.c 25 May 2011 22:28:54 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: dma_obio.c,v
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/cpu.h>
Index: sys/arch/sparc/dev/ebus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/ebus.c,v
retrieving revision 1.31
diff -u -p -r1.31 ebus.c
--- sys/arch/sparc/dev/ebus.c 20 Sep 2009 16:18:21 -0000 1.31
+++ sys/arch/sparc/dev/ebus.c 25 May 2011 22:28:55 -0000
@@ -60,7 +60,7 @@ int ebus_debug = 0;
#include <sys/kernel.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/sparc/dev/esp_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/esp_obio.c,v
retrieving revision 1.23
diff -u -p -r1.23 esp_obio.c
--- sys/arch/sparc/dev/esp_obio.c 28 Apr 2008 20:23:35 -0000 1.23
+++ sys/arch/sparc/dev/esp_obio.c 25 May 2011 22:28:55 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: esp_obio.c,v
#include <dev/scsipi/scsiconf.h>
#include <dev/scsipi/scsi_message.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/sparc/dev/if_ie_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/if_ie_obio.c,v
retrieving revision 1.38
diff -u -p -r1.38 if_ie_obio.c
--- sys/arch/sparc/dev/if_ie_obio.c 1 Feb 2011 20:19:31 -0000 1.38
+++ sys/arch/sparc/dev/if_ie_obio.c 25 May 2011 22:28:55 -0000
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: sys/arch/sparc/dev/if_le_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/if_le_obio.c,v
retrieving revision 1.26
diff -u -p -r1.26 if_le_obio.c
--- sys/arch/sparc/dev/if_le_obio.c 28 Apr 2008 20:23:35 -0000 1.26
+++ sys/arch/sparc/dev/if_le_obio.c 25 May 2011 22:28:55 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_obio.c
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: sys/arch/sparc/dev/kbd_pckbport.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/kbd_pckbport.c,v
retrieving revision 1.5
diff -u -p -r1.5 kbd_pckbport.c
--- sys/arch/sparc/dev/kbd_pckbport.c 28 Apr 2008 20:23:35 -0000 1.5
+++ sys/arch/sparc/dev/kbd_pckbport.c 25 May 2011 22:28:55 -0000
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: kbd_pckbport
#include <sys/select.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/sun/kbd_reg.h>
Index: sys/arch/sparc/dev/ms_pckbport.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/ms_pckbport.c,v
retrieving revision 1.5
diff -u -p -r1.5 ms_pckbport.c
--- sys/arch/sparc/dev/ms_pckbport.c 17 Jan 2009 14:35:06 -0000 1.5
+++ sys/arch/sparc/dev/ms_pckbport.c 25 May 2011 22:28:55 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ms_pckbport.
#include <sys/proc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pckbport/pckbportvar.h>
Index: sys/arch/sparc/dev/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/obio.c,v
retrieving revision 1.71
diff -u -p -r1.71 obio.c
--- sys/arch/sparc/dev/obio.c 17 May 2008 18:11:32 -0000 1.71
+++ sys/arch/sparc/dev/obio.c 25 May 2011 22:28:55 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/dev/sbusvar.h>
#include <machine/autoconf.h>
#include <machine/oldmon.h>
Index: sys/arch/sparc/dev/rtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/rtc.c,v
retrieving revision 1.16
diff -u -p -r1.16 rtc.c
--- sys/arch/sparc/dev/rtc.c 12 Dec 2009 14:44:09 -0000 1.16
+++ sys/arch/sparc/dev/rtc.c 25 May 2011 22:28:55 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.16
#include <sys/gmon.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/clock_subr.h>
Index: sys/arch/sparc/dev/sbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/sbus.c,v
retrieving revision 1.74
diff -u -p -r1.74 sbus.c
--- sys/arch/sparc/dev/sbus.c 3 Jan 2010 23:03:20 -0000 1.74
+++ sys/arch/sparc/dev/sbus.c 25 May 2011 22:28:55 -0000
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: sbus.c,v 1.7
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/dev/sbusreg.h>
#include <dev/sbus/sbusvar.h>
#include <dev/sbus/xboxvar.h>
Index: sys/arch/sparc/dev/sw.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/sw.c,v
retrieving revision 1.22
diff -u -p -r1.22 sw.c
--- sys/arch/sparc/dev/sw.c 16 Dec 2008 22:35:25 -0000 1.22
+++ sys/arch/sparc/dev/sw.c 25 May 2011 22:28:55 -0000
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: sw.c,v 1.22
#include <sys/device.h>
#include <sys/buf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: sys/arch/sparc/dev/tctrl.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/tctrl.c,v
retrieving revision 1.50
diff -u -p -r1.50 tctrl.c
--- sys/arch/sparc/dev/tctrl.c 21 Nov 2009 04:16:51 -0000 1.50
+++ sys/arch/sparc/dev/tctrl.c 25 May 2011 22:28:55 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: tctrl.c,v 1.
#include <machine/apmvar.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/tctrl.h>
Index: sys/arch/sparc/dev/ts102.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/ts102.c,v
retrieving revision 1.14
diff -u -p -r1.14 ts102.c
--- sys/arch/sparc/dev/ts102.c 17 Sep 2009 16:28:12 -0000 1.14
+++ sys/arch/sparc/dev/ts102.c 25 May 2011 22:28:55 -0000
@@ -77,7 +77,7 @@
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: sys/arch/sparc/dev/vme_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/dev/vme_machdep.c,v
retrieving revision 1.63
diff -u -p -r1.63 vme_machdep.c
--- sys/arch/sparc/dev/vme_machdep.c 14 Jan 2011 02:06:31 -0000 1.63
+++ sys/arch/sparc/dev/vme_machdep.c 25 May 2011 22:28:55 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: vme_machdep.
#include <uvm/uvm_extern.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/iommuvar.h>
#include <machine/autoconf.h>
#include <machine/oldmon.h>
Index: sys/arch/sparc/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/include/autoconf.h,v
retrieving revision 1.46
diff -u -p -r1.46 autoconf.h
--- sys/arch/sparc/include/autoconf.h 28 Apr 2008 20:23:36 -0000 1.46
+++ sys/arch/sparc/include/autoconf.h 25 May 2011 22:28:55 -0000
@@ -73,7 +73,7 @@
* Autoconfiguration information.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bsd_openprom.h>
#include <machine/promlib.h>
#include <dev/sbus/sbusvar.h>
cvs diff: cannot find sys/arch/sparc/include/bus.h
Index: sys/arch/sparc/include/z8530var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/include/z8530var.h,v
retrieving revision 1.10
diff -u -p -r1.10 z8530var.h
--- sys/arch/sparc/include/z8530var.h 26 Jun 2010 16:10:00 -0000 1.10
+++ sys/arch/sparc/include/z8530var.h 25 May 2011 22:28:55 -0000
@@ -40,7 +40,7 @@
* @(#)zsvar.h 8.1 (Berkeley) 6/11/93
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/z8530sc.h>
struct zsc_softc {
Index: sys/arch/sparc/sparc/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/autoconf.c,v
retrieving revision 1.240
diff -u -p -r1.240 autoconf.c
--- sys/arch/sparc/sparc/autoconf.c 14 Jan 2011 02:06:31 -0000 1.240
+++ sys/arch/sparc/sparc/autoconf.c 25 May 2011 22:28:55 -0000
@@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <uvm/uvm_extern.h>
#include <machine/pcb.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/promlib.h>
#include <machine/autoconf.h>
#include <machine/bootinfo.h>
Index: sys/arch/sparc/sparc/clock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/clock.c,v
retrieving revision 1.102
diff -u -p -r1.102 clock.c
--- sys/arch/sparc/sparc/clock.c 17 Oct 2007 19:57:14 -0000 1.102
+++ sys/arch/sparc/sparc/clock.c 25 May 2011 22:28:55 -0000
@@ -100,7 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.
#include <sys/systm.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
#include <machine/cpu.h>
Index: sys/arch/sparc/sparc/cpuunit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/cpuunit.c,v
retrieving revision 1.13
diff -u -p -r1.13 cpuunit.c
--- sys/arch/sparc/sparc/cpuunit.c 28 Apr 2008 20:23:36 -0000 1.13
+++ sys/arch/sparc/sparc/cpuunit.c 25 May 2011 22:28:55 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpuunit.c,v
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sparc/sparc/cpuunitvar.h>
Index: sys/arch/sparc/sparc/eeprom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/eeprom.c,v
retrieving revision 1.7
diff -u -p -r1.7 eeprom.c
--- sys/arch/sparc/sparc/eeprom.c 28 Apr 2008 20:23:36 -0000 1.7
+++ sys/arch/sparc/sparc/eeprom.c 25 May 2011 22:28:55 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: eeprom.c,v 1
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/eeprom.h>
Index: sys/arch/sparc/sparc/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/genassym.cf,v
retrieving revision 1.65
diff -u -p -r1.65 genassym.cf
--- sys/arch/sparc/sparc/genassym.cf 20 Feb 2011 10:02:01 -0000 1.65
+++ sys/arch/sparc/sparc/genassym.cf 25 May 2011 22:28:55 -0000
@@ -96,7 +96,7 @@ include <sparc/dev/zsreg.h>
include <sparc/dev/zsvar.h>
endif
-include <machine/bus.h>
+include <sys/bus.h>
include <sparc/dev/audioamdvar.h>
include <sparc/dev/fdreg.h>
Index: sys/arch/sparc/sparc/iommu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc/sparc/iommu.c,v
retrieving revision 1.92
diff -u -p -r1.92 iommu.c
--- sys/arch/sparc/sparc/iommu.c 7 Nov 2009 07:27:46 -0000 1.92
+++ sys/arch/sparc/sparc/iommu.c 25 May 2011 22:28:55 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: iommu.c,v 1.
#include <uvm/uvm.h>
#define _SPARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/ctlreg.h>
#include <sparc/sparc/asm.h>
Index: sys/arch/sgimips/sgimips/bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/sgimips/bus.c,v
retrieving revision 1.62
diff -u -p -r1.62 bus.c
--- sys/arch/sgimips/sgimips/bus.c 20 Feb 2011 07:59:51 -0000 1.62
+++ sys/arch/sgimips/sgimips/bus.c 25 May 2011 22:28:54 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.62
#include <sys/mbuf.h>
#define _SGIMIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/machtype.h>
Index: sys/arch/powerpc/powerpc/bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/bus_space.c,v
retrieving revision 1.26
diff -u -p -r1.26 bus_space.c
--- sys/arch/powerpc/powerpc/bus_space.c 5 Mar 2011 15:25:52 -0000
1.26
+++ sys/arch/powerpc/powerpc/bus_space.c 25 May 2011 22:28:53 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_space.c,
#include <uvm/uvm.h>
#define _POWERPC_BUS_SPACE_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
#include <powerpc/spr.h>
Index: sys/arch/powerpc/powerpc/pio_subr.S
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/pio_subr.S,v
retrieving revision 1.13
diff -u -p -r1.13 pio_subr.S
--- sys/arch/powerpc/powerpc/pio_subr.S 18 Jan 2011 01:02:55 -0000 1.13
+++ sys/arch/powerpc/powerpc/pio_subr.S 25 May 2011 22:28:53 -0000
@@ -46,7 +46,7 @@
/* LINTSTUB: include <sys/param.h> */
/* LINTSTUB: include <sys/types.h> */
-/* LINTSTUB: include <machine/bus.h> */
+/* LINTSTUB: include <sys/bus.h> */
/* LINTSTUB: Func: void out8(volatile u_int8_t *a, u_int8_t v) */
Index: sys/arch/prep/eisa/eisa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/eisa/eisa_machdep.c,v
retrieving revision 1.2
diff -u -p -r1.2 eisa_machdep.c
--- sys/arch/prep/eisa/eisa_machdep.c 28 Apr 2008 20:23:33 -0000 1.2
+++ sys/arch/prep/eisa/eisa_machdep.c 25 May 2011 22:28:53 -0000
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisa_machdep
#include <sys/extent.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/intr.h>
cvs diff: cannot find sys/arch/prep/include/bus.h
Index: sys/arch/prep/isa/paud_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/isa/paud_isa.c,v
retrieving revision 1.12
diff -u -p -r1.12 paud_isa.c
--- sys/arch/prep/isa/paud_isa.c 28 Apr 2008 20:23:33 -0000 1.12
+++ sys/arch/prep/isa/paud_isa.c 25 May 2011 22:28:53 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: paud_isa.c,v
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <sys/audioio.h>
Index: sys/arch/prep/pci/gten.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pci/gten.c,v
retrieving revision 1.18
diff -u -p -r1.18 gten.c
--- sys/arch/prep/pci/gten.c 17 Dec 2008 20:51:32 -0000 1.18
+++ sys/arch/prep/pci/gten.c 25 May 2011 22:28:53 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: gten.c,v 1.1
#include <dev/wscons/wsdisplayvar.h>
#include <dev/rasops/rasops.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/gtenvar.h>
static int gten_match(struct device *, struct cfdata *, void *);
Index: sys/arch/prep/pci/pceb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pci/pceb.c,v
retrieving revision 1.3
diff -u -p -r1.3 pceb.c
--- sys/arch/prep/pci/pceb.c 28 Apr 2008 20:23:33 -0000 1.3
+++ sys/arch/prep/pci/pceb.c 25 May 2011 22:28:53 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.3
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/eisa/eisavar.h>
Index: sys/arch/prep/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pci/pci_machdep.c,v
retrieving revision 1.34
diff -u -p -r1.34 pci_machdep.c
--- sys/arch/prep/pci/pci_machdep.c 4 Apr 2011 20:37:53 -0000 1.34
+++ sys/arch/prep/pci/pci_machdep.c 25 May 2011 22:28:53 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/platform.h>
#include <machine/pnp.h>
Index: sys/arch/prep/pci/prep_pciconf_direct.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pci/prep_pciconf_direct.c,v
retrieving revision 1.6
diff -u -p -r1.6 prep_pciconf_direct.c
--- sys/arch/prep/pci/prep_pciconf_direct.c 17 Oct 2007 19:56:52 -0000
1.6
+++ sys/arch/prep/pci/prep_pciconf_direct.c 25 May 2011 22:28:53 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: prep_pciconf
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/platform.h>
Index: sys/arch/prep/pnpbus/fdc_pnpbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pnpbus/fdc_pnpbus.c,v
retrieving revision 1.2
diff -u -p -r1.2 fdc_pnpbus.c
--- sys/arch/prep/pnpbus/fdc_pnpbus.c 29 Apr 2008 06:53:02 -0000 1.2
+++ sys/arch/prep/pnpbus/fdc_pnpbus.c 25 May 2011 22:28:53 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_pnpbus.c
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
Index: sys/arch/prep/pnpbus/if_we_pnpbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pnpbus/if_we_pnpbus.c,v
retrieving revision 1.5
diff -u -p -r1.5 if_we_pnpbus.c
--- sys/arch/prep/pnpbus/if_we_pnpbus.c 14 Mar 2009 21:04:14 -0000 1.5
+++ sys/arch/prep/pnpbus/if_we_pnpbus.c 25 May 2011 22:28:53 -0000
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_we_pnpbus
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
#include <machine/residual.h>
Index: sys/arch/prep/pnpbus/mcclock_pnpbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pnpbus/mcclock_pnpbus.c,v
retrieving revision 1.9
diff -u -p -r1.9 mcclock_pnpbus.c
--- sys/arch/prep/pnpbus/mcclock_pnpbus.c 28 Apr 2008 20:23:33 -0000
1.9
+++ sys/arch/prep/pnpbus/mcclock_pnpbus.c 25 May 2011 22:28:53 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_pnpb
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
#include <machine/residual.h>
Index: sys/arch/prep/pnpbus/mkclock_pnpbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pnpbus/mkclock_pnpbus.c,v
retrieving revision 1.5
diff -u -p -r1.5 mkclock_pnpbus.c
--- sys/arch/prep/pnpbus/mkclock_pnpbus.c 28 Apr 2008 20:23:33 -0000
1.5
+++ sys/arch/prep/pnpbus/mkclock_pnpbus.c 25 May 2011 22:28:53 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mkclock_pnpb
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/residual.h>
#include <machine/chpidpnp.h>
Index: sys/arch/prep/pnpbus/pnpbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pnpbus/pnpbus.c,v
retrieving revision 1.9
diff -u -p -r1.9 pnpbus.c
--- sys/arch/prep/pnpbus/pnpbus.c 28 Apr 2008 20:23:33 -0000 1.9
+++ sys/arch/prep/pnpbus/pnpbus.c 25 May 2011 22:28:53 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: pnpbus.c,v 1
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/intr.h>
#include <machine/platform.h>
Index: sys/arch/prep/pnpbus/pnpbusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pnpbus/pnpbusvar.h,v
retrieving revision 1.6
diff -u -p -r1.6 pnpbusvar.h
--- sys/arch/prep/pnpbus/pnpbusvar.h 28 Apr 2008 20:23:33 -0000 1.6
+++ sys/arch/prep/pnpbus/pnpbusvar.h 25 May 2011 22:28:53 -0000
@@ -33,7 +33,7 @@
#define _PREP_PNPBUSVAR_H_
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/residual.h>
struct pnpbus_mem {
Index: sys/arch/prep/pnpbus/wdc_pnpbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/pnpbus/wdc_pnpbus.c,v
retrieving revision 1.9
diff -u -p -r1.9 wdc_pnpbus.c
--- sys/arch/prep/pnpbus/wdc_pnpbus.c 28 Apr 2008 20:23:33 -0000 1.9
+++ sys/arch/prep/pnpbus/wdc_pnpbus.c 25 May 2011 22:28:53 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_pnpbus.c
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/isa_machdep.h>
#include <machine/residual.h>
Index: sys/arch/prep/prep/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/prep/consinit.c,v
retrieving revision 1.6
diff -u -p -r1.6 consinit.c
--- sys/arch/prep/prep/consinit.c 17 Oct 2007 19:56:53 -0000 1.6
+++ sys/arch/prep/prep/consinit.c 25 May 2011 22:28:53 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <sys/systm.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/cons.h>
Index: sys/arch/prep/prep/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/prep/cpu.c,v
retrieving revision 1.15
diff -u -p -r1.15 cpu.c
--- sys/arch/prep/prep/cpu.c 28 Apr 2008 20:23:33 -0000 1.15
+++ sys/arch/prep/prep/cpu.c 25 May 2011 22:28:53 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.15
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/platform.h>
Index: sys/arch/prep/prep/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/prep/machdep.c,v
retrieving revision 1.71
diff -u -p -r1.71 machdep.c
--- sys/arch/prep/prep/machdep.c 7 Aug 2010 06:16:22 -0000 1.71
+++ sys/arch/prep/prep/machdep.c 25 May 2011 22:28:53 -0000
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/autoconf.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pmap.h>
#include <machine/platform.h>
Index: sys/arch/prep/prep/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/prep/prep/mainbus.c,v
retrieving revision 1.30
diff -u -p -r1.30 mainbus.c
--- sys/arch/prep/prep/mainbus.c 17 May 2011 17:34:52 -0000 1.30
+++ sys/arch/prep/prep/mainbus.c 25 May 2011 22:28:53 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <dev/pci/pcivar.h>
cvs diff: cannot find sys/arch/sandpoint/include/bus.h
Index: sys/arch/sandpoint/isa/mcclock_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/isa/mcclock_isa.c,v
retrieving revision 1.4
diff -u -p -r1.4 mcclock_isa.c
--- sys/arch/sandpoint/isa/mcclock_isa.c 29 Mar 2008 05:42:46 -0000
1.4
+++ sys/arch/sandpoint/isa/mcclock_isa.c 25 May 2011 22:28:53 -0000
@@ -125,7 +125,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_isa.
#include <sys/device.h>
#include <sys/time.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/isa/isareg.h>
Index: sys/arch/sandpoint/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/pci/pci_machdep.c,v
retrieving revision 1.27
diff -u -p -r1.27 pci_machdep.c
--- sys/arch/sandpoint/pci/pci_machdep.c 30 Apr 2011 11:12:58 -0000
1.27
+++ sys/arch/sandpoint/pci/pci_machdep.c 25 May 2011 22:28:53 -0000
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/time.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
Index: sys/arch/sandpoint/sandpoint/com_eumb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/com_eumb.c,v
retrieving revision 1.6
diff -u -p -r1.6 com_eumb.c
--- sys/arch/sandpoint/sandpoint/com_eumb.c 24 Feb 2011 19:32:34 -0000
1.6
+++ sys/arch/sandpoint/sandpoint/com_eumb.c 25 May 2011 22:28:53 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_eumb.c,v
#include <sys/tty.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ic/comreg.h>
Index: sys/arch/sandpoint/sandpoint/eumb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/eumb.c,v
retrieving revision 1.3
diff -u -p -r1.3 eumb.c
--- sys/arch/sandpoint/sandpoint/eumb.c 28 Apr 2008 20:23:34 -0000 1.3
+++ sys/arch/sandpoint/sandpoint/eumb.c 25 May 2011 22:28:53 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: eumb.c,v 1.3
#include <sys/tty.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <sandpoint/sandpoint/eumbvar.h>
Index: sys/arch/sandpoint/sandpoint/eumbvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/eumbvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 eumbvar.h
--- sys/arch/sandpoint/sandpoint/eumbvar.h 12 May 2010 17:20:24 -0000
1.5
+++ sys/arch/sandpoint/sandpoint/eumbvar.h 25 May 2011 22:28:53 -0000
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct eumb_attach_args {
const char *eumb_name;
Index: sys/arch/sandpoint/sandpoint/iic_eumb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/iic_eumb.c,v
retrieving revision 1.14
diff -u -p -r1.14 iic_eumb.c
--- sys/arch/sandpoint/sandpoint/iic_eumb.c 30 Apr 2011 11:14:04 -0000
1.14
+++ sys/arch/sandpoint/sandpoint/iic_eumb.c 25 May 2011 22:28:53 -0000
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: iic_eumb.c,v
#include <sys/param.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/i2c/motoi2cvar.h>
#include <sandpoint/sandpoint/eumbvar.h>
#include <machine/bootinfo.h>
Index: sys/arch/sandpoint/sandpoint/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/machdep.c,v
retrieving revision 1.56
diff -u -p -r1.56 machdep.c
--- sys/arch/sandpoint/sandpoint/machdep.c 19 Apr 2011 18:06:19 -0000
1.56
+++ sys/arch/sandpoint/sandpoint/machdep.c 25 May 2011 22:28:53 -0000
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <net/netisr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pmap.h>
#include <machine/powerpc.h>
Index: sys/arch/sandpoint/sandpoint/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/mainbus.c,v
retrieving revision 1.22
diff -u -p -r1.22 mainbus.c
--- sys/arch/sandpoint/sandpoint/mainbus.c 17 May 2011 17:34:52 -0000
1.22
+++ sys/arch/sandpoint/sandpoint/mainbus.c 25 May 2011 22:28:53 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/sandpoint/sandpoint/satmgr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sandpoint/sandpoint/satmgr.c,v
retrieving revision 1.11
diff -u -p -r1.11 satmgr.c
--- sys/arch/sandpoint/sandpoint/satmgr.c 19 Apr 2011 18:16:03 -0000
1.11
+++ sys/arch/sandpoint/sandpoint/satmgr.c 25 May 2011 22:28:53 -0000
@@ -48,7 +48,7 @@
#include <dev/ic/comreg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/bootinfo.h>
cvs diff: cannot find sys/arch/sbmips/include/bus.h
Index: sys/arch/sgimips/dev/crime.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/crime.c,v
retrieving revision 1.34
diff -u -p -r1.34 crime.c
--- sys/arch/sgimips/dev/crime.c 20 Feb 2011 07:59:50 -0000 1.34
+++ sys/arch/sgimips/dev/crime.c 25 May 2011 22:28:53 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: crime.c,v 1.
#include <machine/locore.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/dev/crimevar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/crimevar.h,v
retrieving revision 1.7
diff -u -p -r1.7 crimevar.h
--- sys/arch/sgimips/dev/crimevar.h 17 Oct 2007 19:57:03 -0000 1.7
+++ sys/arch/sgimips/dev/crimevar.h 25 May 2011 22:28:53 -0000
@@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct crime_softc {
struct device sc_dev;
Index: sys/arch/sgimips/dev/crmfb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/crmfb.c,v
retrieving revision 1.33
diff -u -p -r1.33 crmfb.c
--- sys/arch/sgimips/dev/crmfb.c 13 Apr 2011 16:22:09 -0000 1.33
+++ sys/arch/sgimips/dev/crmfb.c 25 May 2011 22:28:53 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.
#define _SGIMIPS_BUS_DMA_PRIVATE
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <machine/vmparam.h>
Index: sys/arch/sgimips/dev/ctl.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/ctl.c,v
retrieving revision 1.2
diff -u -p -r1.2 ctl.c
--- sys/arch/sgimips/dev/ctl.c 20 Feb 2011 07:59:50 -0000 1.2
+++ sys/arch/sgimips/dev/ctl.c 25 May 2011 22:28:53 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ctl.c,v 1.2
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/dev/dpclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/dpclock.c,v
retrieving revision 1.2
diff -u -p -r1.2 dpclock.c
--- sys/arch/sgimips/dev/dpclock.c 12 Dec 2009 14:44:09 -0000 1.2
+++ sys/arch/sgimips/dev/dpclock.c 25 May 2011 22:28:53 -0000
@@ -39,7 +39,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/sysconf.h>
#include <machine/machtype.h>
Index: sys/arch/sgimips/dev/dsclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/dsclock.c,v
retrieving revision 1.4
diff -u -p -r1.4 dsclock.c
--- sys/arch/sgimips/dev/dsclock.c 12 Jan 2010 15:20:29 -0000 1.4
+++ sys/arch/sgimips/dev/dsclock.c 25 May 2011 22:28:53 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: dsclock.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/sysconf.h>
#include <machine/machtype.h>
Index: sys/arch/sgimips/dev/imc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/imc.c,v
retrieving revision 1.30
diff -u -p -r1.30 imc.c
--- sys/arch/sgimips/dev/imc.c 20 Feb 2011 07:59:50 -0000 1.30
+++ sys/arch/sgimips/dev/imc.c 25 May 2011 22:28:54 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: imc.c,v 1.30
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/dev/int.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/int.c,v
retrieving revision 1.23
diff -u -p -r1.23 int.c
--- sys/arch/sgimips/dev/int.c 10 Mar 2011 17:32:46 -0000 1.23
+++ sys/arch/sgimips/dev/int.c 25 May 2011 22:28:54 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: int.c,v 1.23
#include <dev/ic/i8253reg.h>
#include <machine/sysconf.h>
#include <machine/machtype.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/locore.h>
#include <mips/cache.h>
Index: sys/arch/sgimips/dev/pic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/dev/pic.c,v
retrieving revision 1.14
diff -u -p -r1.14 pic.c
--- sys/arch/sgimips/dev/pic.c 20 Feb 2011 07:59:50 -0000 1.14
+++ sys/arch/sgimips/dev/pic.c 25 May 2011 22:28:54 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.14
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/eisa/eisa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/eisa/eisa_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 eisa_machdep.c
--- sys/arch/sgimips/eisa/eisa_machdep.c 14 Mar 2009 21:04:15 -0000
1.6
+++ sys/arch/sgimips/eisa/eisa_machdep.c 25 May 2011 22:28:54 -0000
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisa_machdep
#include <sys/device.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
void
Index: sys/arch/sgimips/gio/gio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/gio/gio.c,v
retrieving revision 1.31
diff -u -p -r1.31 gio.c
--- sys/arch/sgimips/gio/gio.c 18 Mar 2009 10:22:35 -0000 1.31
+++ sys/arch/sgimips/gio/gio.c 25 May 2011 22:28:54 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: gio.c,v 1.31
#include <sys/device.h>
#define _SGIMIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/gio/giovar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/gio/giovar.h,v
retrieving revision 1.9
diff -u -p -r1.9 giovar.h
--- sys/arch/sgimips/gio/giovar.h 19 Feb 2007 20:14:30 -0000 1.9
+++ sys/arch/sgimips/gio/giovar.h 25 May 2011 22:28:54 -0000
@@ -36,7 +36,7 @@
* GIO 32/32-bis/64 bus
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct giobus_attach_args {
bus_space_tag_t gba_iot;
Index: sys/arch/sgimips/gio/grtwovar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/gio/grtwovar.h,v
retrieving revision 1.2
diff -u -p -r1.2 grtwovar.h
--- sys/arch/sgimips/gio/grtwovar.h 11 Dec 2005 12:18:53 -0000 1.2
+++ sys/arch/sgimips/gio/grtwovar.h 25 May 2011 22:28:54 -0000
@@ -32,7 +32,7 @@
#ifndef _ARCH_SGIMIPS_GIO_GRTWOVAR_H_
#define _ARCH_SGIMIPS_GIO_GRTWOVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
int grtwo_cnattach(struct gio_attach_args *);
Index: sys/arch/sgimips/gio/lightvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/gio/lightvar.h,v
retrieving revision 1.1
diff -u -p -r1.1 lightvar.h
--- sys/arch/sgimips/gio/lightvar.h 26 Dec 2006 04:28:16 -0000 1.1
+++ sys/arch/sgimips/gio/lightvar.h 25 May 2011 22:28:54 -0000
@@ -27,7 +27,7 @@
#ifndef _ARCH_SGIMIPS_GIO_LIGHTVAR_H_
#define _ARCH_SGIMIPS_GIO_LIGHTVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
int light_cnattach(struct gio_attach_args *);
Index: sys/arch/sgimips/gio/newportvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/gio/newportvar.h,v
retrieving revision 1.2
diff -u -p -r1.2 newportvar.h
--- sys/arch/sgimips/gio/newportvar.h 11 Dec 2005 12:18:53 -0000 1.2
+++ sys/arch/sgimips/gio/newportvar.h 25 May 2011 22:28:54 -0000
@@ -32,7 +32,7 @@
#ifndef _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_
#define _ARCH_SGIMIPS_GIO_NEWPORTVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
int newport_cnattach(struct gio_attach_args *);
Index: sys/arch/sgimips/gio/pci_gio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/gio/pci_gio.c,v
retrieving revision 1.8
diff -u -p -r1.8 pci_gio.c
--- sys/arch/sgimips/gio/pci_gio.c 17 May 2011 17:34:52 -0000 1.8
+++ sys/arch/sgimips/gio/pci_gio.c 25 May 2011 22:28:54 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_gio.c,v
#include <sys/malloc.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <sgimips/gio/giovar.h>
Index: sys/arch/sgimips/hpc/haltwo.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/haltwo.c,v
retrieving revision 1.19
diff -u -p -r1.19 haltwo.c
--- sys/arch/sgimips/hpc/haltwo.c 25 Jan 2011 13:31:41 -0000 1.19
+++ sys/arch/sgimips/hpc/haltwo.c 25 May 2011 22:28:54 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: haltwo.c,v 1
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/sysconf.h>
#include <sgimips/hpc/hpcvar.h>
Index: sys/arch/sgimips/hpc/hpc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/hpc.c,v
retrieving revision 1.65
diff -u -p -r1.65 hpc.c
--- sys/arch/sgimips/hpc/hpc.c 25 Jan 2011 13:22:05 -0000 1.65
+++ sys/arch/sgimips/hpc/hpc.c 25 May 2011 22:28:54 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpc.c,v 1.65
#include <sys/callout.h>
#define _SGIMIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/hpc/hpcdma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/hpcdma.c,v
retrieving revision 1.20
diff -u -p -r1.20 hpcdma.c
--- sys/arch/sgimips/hpc/hpcdma.c 25 Jan 2011 12:30:32 -0000 1.20
+++ sys/arch/sgimips/hpc/hpcdma.c 25 May 2011 22:28:54 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpcdma.c,v 1
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sgimips/hpc/hpcvar.h>
#include <sgimips/hpc/hpcreg.h>
Index: sys/arch/sgimips/hpc/hpcdma.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/hpcdma.h,v
retrieving revision 1.10
diff -u -p -r1.10 hpcdma.h
--- sys/arch/sgimips/hpc/hpcdma.h 25 Jan 2011 12:21:04 -0000 1.10
+++ sys/arch/sgimips/hpc/hpcdma.h 25 May 2011 22:28:54 -0000
@@ -39,7 +39,7 @@
#ifndef _SGIMIPS_HPC_DMA_H
#define _SGIMIPS_HPC_DMA_H
-#include <machine/bus.h>
+#include <sys/bus.h>
struct hpc_dma_softc {
bus_space_tag_t sc_bst;
Index: sys/arch/sgimips/hpc/if_sq.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/if_sq.c,v
retrieving revision 1.41
diff -u -p -r1.41 if_sq.c
--- sys/arch/sgimips/hpc/if_sq.c 20 Feb 2011 07:59:50 -0000 1.41
+++ sys/arch/sgimips/hpc/if_sq.c 25 May 2011 22:28:54 -0000
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sq.c,v 1.
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/hpc/pi1ppc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/pi1ppc.c,v
retrieving revision 1.9
diff -u -p -r1.9 pi1ppc.c
--- sys/arch/sgimips/hpc/pi1ppc.c 16 Feb 2011 23:44:20 -0000 1.9
+++ sys/arch/sgimips/hpc/pi1ppc.c 25 May 2011 22:28:54 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: pi1ppc.c,v 1
#include <sys/vnode.h>
#include <sys/syslog.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*#include <machine/intr.h>*/
#include <dev/ppbus/ppbus_conf.h>
Index: sys/arch/sgimips/hpc/pi1ppcvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/pi1ppcvar.h,v
retrieving revision 1.4
diff -u -p -r1.4 pi1ppcvar.h
--- sys/arch/sgimips/hpc/pi1ppcvar.h 25 Jan 2011 12:21:04 -0000 1.4
+++ sys/arch/sgimips/hpc/pi1ppcvar.h 25 May 2011 22:28:54 -0000
@@ -33,7 +33,7 @@
#ifndef __PI1PPCVAR_H
#define __PI1PPCVAR_H
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/types.h>
#include <sys/device.h>
#include <sys/callout.h>
Index: sys/arch/sgimips/hpc/wdsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/hpc/wdsc.c,v
retrieving revision 1.31
diff -u -p -r1.31 wdsc.c
--- sys/arch/sgimips/hpc/wdsc.c 25 Jan 2011 12:30:32 -0000 1.31
+++ sys/arch/sgimips/hpc/wdsc.c 25 May 2011 22:28:54 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.3
#include <dev/scsipi/scsiconf.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/include/autoconf.h,v
retrieving revision 1.10
diff -u -p -r1.10 autoconf.h
--- sys/arch/sgimips/include/autoconf.h 17 Oct 2007 19:57:04 -0000 1.10
+++ sys/arch/sgimips/include/autoconf.h 25 May 2011 22:28:54 -0000
@@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct mainbus_attach_args {
char *ma_name;
cvs diff: cannot find sys/arch/sgimips/include/bus.h
Index: sys/arch/sgimips/include/z8530var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/include/z8530var.h,v
retrieving revision 1.9
diff -u -p -r1.9 z8530var.h
--- sys/arch/sgimips/include/z8530var.h 29 Mar 2008 19:15:35 -0000 1.9
+++ sys/arch/sgimips/include/z8530var.h 25 May 2011 22:28:54 -0000
@@ -83,7 +83,7 @@
* @(#)zsvar.h 8.1 (Berkeley) 6/11/93
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/z8530sc.h>
struct zs_channel {
Index: sys/arch/sgimips/ioc/ioc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/ioc/ioc.c,v
retrieving revision 1.8
diff -u -p -r1.8 ioc.c
--- sys/arch/sgimips/ioc/ioc.c 3 Mar 2009 19:45:55 -0000 1.8
+++ sys/arch/sgimips/ioc/ioc.c 25 May 2011 22:28:54 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ioc.c,v 1.8
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
Index: sys/arch/sgimips/ioc/oioc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/ioc/oioc.c,v
retrieving revision 1.1
diff -u -p -r1.1 oioc.c
--- sys/arch/sgimips/ioc/oioc.c 10 Feb 2009 06:04:56 -0000 1.1
+++ sys/arch/sgimips/ioc/oioc.c 25 May 2011 22:28:54 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: oioc.c,v 1.1
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/ioc/oiocsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/ioc/oiocsc.c,v
retrieving revision 1.1
diff -u -p -r1.1 oiocsc.c
--- sys/arch/sgimips/ioc/oiocsc.c 10 Feb 2009 06:04:56 -0000 1.1
+++ sys/arch/sgimips/ioc/oiocsc.c 25 May 2011 22:28:54 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: oiocsc.c,v 1
#include <dev/scsipi/scsiconf.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/machtype.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/ioc/oiocvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/ioc/oiocvar.h,v
retrieving revision 1.1
diff -u -p -r1.1 oiocvar.h
--- sys/arch/sgimips/ioc/oiocvar.h 10 Feb 2009 06:04:56 -0000 1.1
+++ sys/arch/sgimips/ioc/oiocvar.h 25 May 2011 22:28:54 -0000
@@ -40,7 +40,7 @@
#ifndef _ARCH_SGIMIPS_DEV_OIOCVAR_H_
#define _ARCH_SGIMIPS_DEV_OIOCVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct oioc_attach_args {
const char *oa_name; /* name of device */
Index: sys/arch/sgimips/mace/com_mace.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/com_mace.c,v
retrieving revision 1.8
diff -u -p -r1.8 com_mace.c
--- sys/arch/sgimips/mace/com_mace.c 21 Nov 2009 17:40:28 -0000 1.8
+++ sys/arch/sgimips/mace/com_mace.c 25 May 2011 22:28:54 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_mace.c,v
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <sgimips/mace/macevar.h>
Index: sys/arch/sgimips/mace/if_mec.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/if_mec.c,v
retrieving revision 1.45
diff -u -p -r1.45 if_mec.c
--- sys/arch/sgimips/mace/if_mec.c 20 Feb 2011 07:59:51 -0000 1.45
+++ sys/arch/sgimips/mace/if_mec.c 25 May 2011 22:28:54 -0000
@@ -94,7 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_mec.c,v 1
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/machtype.h>
Index: sys/arch/sgimips/mace/lpt_mace.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/lpt_mace.c,v
retrieving revision 1.8
diff -u -p -r1.8 lpt_mace.c
--- sys/arch/sgimips/mace/lpt_mace.c 21 Nov 2009 17:40:28 -0000 1.8
+++ sys/arch/sgimips/mace/lpt_mace.c 25 May 2011 22:28:54 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_mace.c,v
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <sgimips/mace/macevar.h>
Index: sys/arch/sgimips/mace/mace.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/mace.c,v
retrieving revision 1.16
diff -u -p -r1.16 mace.c
--- sys/arch/sgimips/mace/mace.c 14 Dec 2009 00:46:13 -0000 1.16
+++ sys/arch/sgimips/mace/mace.c 25 May 2011 22:28:54 -0000
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: mace.c,v 1.1
#include <uvm/uvm_extern.h>
#define _SGIMIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/locore.h>
#include <machine/autoconf.h>
Index: sys/arch/sgimips/mace/macekbc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/macekbc.c,v
retrieving revision 1.5
diff -u -p -r1.5 macekbc.c
--- sys/arch/sgimips/mace/macekbc.c 20 Feb 2011 07:59:51 -0000 1.5
+++ sys/arch/sgimips/mace/macekbc.c 25 May 2011 22:28:54 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: macekbc.c,v
#include <sys/syslog.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <sgimips/mace/macevar.h>
Index: sys/arch/sgimips/mace/mavb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/mavb.c,v
retrieving revision 1.6
diff -u -p -r1.6 mavb.c
--- sys/arch/sgimips/mace/mavb.c 23 Aug 2008 17:43:36 -0000 1.6
+++ sys/arch/sgimips/mace/mavb.c 25 May 2011 22:28:54 -0000
@@ -24,7 +24,7 @@
#include <sys/malloc.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: sys/arch/sgimips/mace/mcclock_mace.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/mcclock_mace.c,v
retrieving revision 1.13
diff -u -p -r1.13 mcclock_mace.c
--- sys/arch/sgimips/mace/mcclock_mace.c 13 Dec 2009 11:10:50 -0000
1.13
+++ sys/arch/sgimips/mace/mcclock_mace.c 25 May 2011 22:28:54 -0000
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_mace
#include <machine/cpu.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <dev/clock_subr.h>
Index: sys/arch/sgimips/mace/pci_mace.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/mace/pci_mace.c,v
retrieving revision 1.12
diff -u -p -r1.12 pci_mace.c
--- sys/arch/sgimips/mace/pci_mace.c 17 May 2011 17:34:52 -0000 1.12
+++ sys/arch/sgimips/mace/pci_mace.c 25 May 2011 22:28:54 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_mace.c,v
#include <machine/locore.h>
#include <machine/autoconf.h>
#include <machine/vmparam.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/machtype.h>
#include <mips/cache.h>
Index: sys/arch/sgimips/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/pci/pci_machdep.c,v
retrieving revision 1.21
diff -u -p -r1.21 pci_machdep.c
--- sys/arch/sgimips/pci/pci_machdep.c 11 May 2011 17:49:31 -0000 1.21
+++ sys/arch/sgimips/pci/pci_machdep.c 25 May 2011 22:28:54 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <uvm/uvm_extern.h>
#define _SGIMIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/sysconf.h>
Index: sys/arch/sgimips/sgimips/arcemu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/sgimips/sgimips/arcemu.c,v
retrieving revision 1.20
diff -u -p -r1.20 arcemu.c
--- sys/arch/sgimips/sgimips/arcemu.c 20 Feb 2011 07:59:51 -0000 1.20
+++ sys/arch/sgimips/sgimips/arcemu.c 25 May 2011 22:28:54 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: arcemu.c,v 1
#include <sys/systm.h>
#include <machine/machtype.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cons.h>
Index: sys/arch/powerpc/powerpc/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/powerpc/bus_dma.c,v
retrieving revision 1.38
diff -u -p -r1.38 bus_dma.c
--- sys/arch/powerpc/powerpc/bus_dma.c 18 Jan 2011 01:02:55 -0000 1.38
+++ sys/arch/powerpc/powerpc/bus_dma.c 25 May 2011 22:28:53 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#ifdef PPC_BOOKE
Index: sys/arch/powerpc/oea/prep_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/oea/prep_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 prep_machdep.c
--- sys/arch/powerpc/oea/prep_machdep.c 13 Feb 2009 22:41:03 -0000 1.6
+++ sys/arch/powerpc/oea/prep_machdep.c 25 May 2011 22:28:53 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: prep_machdep
#include <uvm/uvm_extern.h>
#include <machine/powerpc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
#include <powerpc/oea/bat.h>
Index: sys/arch/powerpc/pci/pchb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/pci/pchb.c,v
retrieving revision 1.4
diff -u -p -r1.4 pchb.c
--- sys/arch/powerpc/pci/pchb.c 28 Apr 2008 20:23:32 -0000 1.4
+++ sys/arch/powerpc/pci/pchb.c 25 May 2011 22:28:53 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.4
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/powerpc/pci/pci_machdep_common.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/pci/pci_machdep_common.c,v
retrieving revision 1.10
diff -u -p -r1.10 pci_machdep_common.c
--- sys/arch/powerpc/pci/pci_machdep_common.c 4 Apr 2011 20:37:53 -0000
1.10
+++ sys/arch/powerpc/pci/pci_machdep_common.c 25 May 2011 22:28:53 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep_
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/powerpc/pci/pci_machdep_ofw.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/pci/pci_machdep_ofw.c,v
retrieving revision 1.15
diff -u -p -r1.15 pci_machdep_ofw.c
--- sys/arch/powerpc/pci/pci_machdep_ofw.c 4 Apr 2011 20:37:53 -0000
1.15
+++ sys/arch/powerpc/pci/pci_machdep_ofw.c 25 May 2011 22:28:53 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep_
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pio.h>
Index: sys/arch/powerpc/pci/pcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/pci/pcib.c,v
retrieving revision 1.5
diff -u -p -r1.5 pcib.c
--- sys/arch/powerpc/pci/pcib.c 4 May 2008 00:18:16 -0000 1.5
+++ sys/arch/powerpc/pci/pcib.c 25 May 2011 22:28:53 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.5
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/powerpc/pci/pciconf_indirect.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/pci/pciconf_indirect.c,v
retrieving revision 1.3
diff -u -p -r1.3 pciconf_indirect.c
--- sys/arch/powerpc/pci/pciconf_indirect.c 28 Apr 2008 20:23:32 -0000
1.3
+++ sys/arch/powerpc/pci/pciconf_indirect.c 25 May 2011 22:28:53 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciconf_indi
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
Index: sys/arch/powerpc/pci/pciconf_ofmethod.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/pci/pciconf_ofmethod.c,v
retrieving revision 1.2
diff -u -p -r1.2 pciconf_ofmethod.c
--- sys/arch/powerpc/pci/pciconf_ofmethod.c 28 Apr 2008 20:23:32 -0000
1.2
+++ sys/arch/powerpc/pci/pciconf_ofmethod.c 25 May 2011 22:28:53 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciconf_ofme
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
#include <dev/ofw/openfirm.h>
Index: sys/arch/mips/rmi/rmixlvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixlvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 rmixlvar.h
--- sys/arch/mips/rmi/rmixlvar.h 14 Apr 2011 05:21:22 -0000 1.5
+++ sys/arch/mips/rmi/rmixlvar.h 25 May 2011 22:28:52 -0000
@@ -42,7 +42,7 @@
#include <mips/locore.h>
#include <mips/rmi/rmixl_firmware.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
cvs diff: cannot find sys/arch/mvmeppc/include/bus.h
Index: sys/arch/mvmeppc/isa/mkclock_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvmeppc/isa/mkclock_isa.c,v
retrieving revision 1.13
diff -u -p -r1.13 mkclock_isa.c
--- sys/arch/mvmeppc/isa/mkclock_isa.c 28 Apr 2008 20:23:29 -0000 1.13
+++ sys/arch/mvmeppc/isa/mkclock_isa.c 25 May 2011 22:28:52 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: mkclock_isa.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mk48txxreg.h>
Index: sys/arch/mvmeppc/mvmeppc/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvmeppc/mvmeppc/cpu.c,v
retrieving revision 1.8
diff -u -p -r1.8 cpu.c
--- sys/arch/mvmeppc/mvmeppc/cpu.c 28 Apr 2008 20:23:29 -0000 1.8
+++ sys/arch/mvmeppc/mvmeppc/cpu.c 25 May 2011 22:28:52 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.8
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/platform.h>
Index: sys/arch/mvmeppc/mvmeppc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvmeppc/mvmeppc/machdep.c,v
retrieving revision 1.27
diff -u -p -r1.27 machdep.c
--- sys/arch/mvmeppc/mvmeppc/machdep.c 20 Dec 2010 00:25:39 -0000 1.27
+++ sys/arch/mvmeppc/mvmeppc/machdep.c 25 May 2011 22:28:52 -0000
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/autoconf.h>
#include <machine/bootinfo.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pmap.h>
#include <machine/platform.h>
Index: sys/arch/mvmeppc/mvmeppc/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvmeppc/mvmeppc/mainbus.c,v
retrieving revision 1.12
diff -u -p -r1.12 mainbus.c
--- sys/arch/mvmeppc/mvmeppc/mainbus.c 17 May 2011 17:34:51 -0000 1.12
+++ sys/arch/mvmeppc/mvmeppc/mainbus.c 25 May 2011 22:28:52 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "pci.h"
#include "opt_pci.h"
Index: sys/arch/mvmeppc/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mvmeppc/pci/pci_machdep.c,v
retrieving revision 1.7
diff -u -p -r1.7 pci_machdep.c
--- sys/arch/mvmeppc/pci/pci_machdep.c 20 Dec 2010 00:25:39 -0000 1.7
+++ sys/arch/mvmeppc/pci/pci_machdep.c 25 May 2011 22:28:52 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/device.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/platform.h>
cvs diff: cannot find sys/arch/netwinder/include/bus.h
Index: sys/arch/netwinder/netwinder/netwinder_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/netwinder/netwinder/netwinder_machdep.c,v
retrieving revision 1.74
diff -u -p -r1.74 netwinder_machdep.c
--- sys/arch/netwinder/netwinder/netwinder_machdep.c 28 Dec 2009 03:22:20
-0000 1.74
+++ sys/arch/netwinder/netwinder/netwinder_machdep.c 25 May 2011 22:28:52
-0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: netwinder_ma
#include <machine/bootconfig.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: sys/arch/netwinder/pci/pcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/netwinder/pci/pcib.c,v
retrieving revision 1.13
diff -u -p -r1.13 pcib.c
--- sys/arch/netwinder/pci/pcib.c 14 Mar 2009 21:04:13 -0000 1.13
+++ sys/arch/netwinder/pci/pcib.c 25 May 2011 22:28:52 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/ofppc/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/ofppc/include/autoconf.h,v
retrieving revision 1.13
diff -u -p -r1.13 autoconf.h
--- sys/arch/ofppc/include/autoconf.h 8 Apr 2008 02:33:03 -0000 1.13
+++ sys/arch/ofppc/include/autoconf.h 25 May 2011 22:28:52 -0000
@@ -3,7 +3,7 @@
#ifndef _OFPPC_AUTOCONF_H_
#define _OFPPC_AUTOCONF_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct confargs {
const char *ca_name;
cvs diff: cannot find sys/arch/ofppc/include/bus.h
Index: sys/arch/ofppc/isa/isa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ofppc/isa/isa_machdep.c,v
retrieving revision 1.5
diff -u -p -r1.5 isa_machdep.c
--- sys/arch/ofppc/isa/isa_machdep.c 28 Apr 2008 20:23:30 -0000 1.5
+++ sys/arch/ofppc/isa/isa_machdep.c 25 May 2011 22:28:52 -0000
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <sys/extent.h>
Index: sys/arch/ofppc/ofppc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ofppc/ofppc/machdep.c,v
retrieving revision 1.113
diff -u -p -r1.113 machdep.c
--- sys/arch/ofppc/ofppc/machdep.c 2 Nov 2010 19:19:22 -0000 1.113
+++ sys/arch/ofppc/ofppc/machdep.c 25 May 2011 22:28:52 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/pmap.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <powerpc/spr.h>
Index: sys/arch/ofppc/pci/gt_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ofppc/pci/gt_mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 gt_mainbus.c
--- sys/arch/ofppc/pci/gt_mainbus.c 17 Dec 2010 19:18:49 -0000 1.3
+++ sys/arch/ofppc/pci/gt_mainbus.c 25 May 2011 22:28:52 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <machine/pegasosreg.h>
Index: sys/arch/powerpc/ibm4xx/dev/ibm405gp.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/ibm4xx/dev/ibm405gp.c,v
retrieving revision 1.4
diff -u -p -r1.4 ibm405gp.c
--- sys/arch/powerpc/ibm4xx/dev/ibm405gp.c 11 Dec 2005 12:18:42 -0000
1.4
+++ sys/arch/powerpc/ibm4xx/dev/ibm405gp.c 25 May 2011 22:28:53 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ibm405gp.c,v
#include <sys/systm.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <powerpc/ibm4xx/ibm405gp.h>
Index: sys/arch/powerpc/ibm4xx/dev/opbvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/ibm4xx/dev/opbvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 opbvar.h
--- sys/arch/powerpc/ibm4xx/dev/opbvar.h 18 Mar 2010 13:47:04 -0000
1.5
+++ sys/arch/powerpc/ibm4xx/dev/opbvar.h 25 May 2011 22:28:53 -0000
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct opb_softc {
device_t sc_dev;
Index: sys/arch/powerpc/ibm4xx/dev/plb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/ibm4xx/dev/plb.c,v
retrieving revision 1.18
diff -u -p -r1.18 plb.c
--- sys/arch/powerpc/ibm4xx/dev/plb.c 13 Dec 2010 07:29:12 -0000 1.18
+++ sys/arch/powerpc/ibm4xx/dev/plb.c 25 May 2011 22:28:53 -0000
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: plb.c,v 1.18
#include <sys/malloc.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/cpu.h>
#include <powerpc/ibm4xx/dev/malvar.h>
Index: sys/arch/powerpc/ibm4xx/dev/plbvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/ibm4xx/dev/plbvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 plbvar.h
--- sys/arch/powerpc/ibm4xx/dev/plbvar.h 18 Mar 2010 13:47:04 -0000
1.5
+++ sys/arch/powerpc/ibm4xx/dev/plbvar.h 25 May 2011 22:28:53 -0000
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct plb_dev {
int plb_pvr;
Index: sys/arch/powerpc/ibm4xx/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c,v
retrieving revision 1.7
diff -u -p -r1.7 pci_machdep.c
--- sys/arch/powerpc/ibm4xx/pci/pci_machdep.c 18 Mar 2010 13:58:38 -0000
1.7
+++ sys/arch/powerpc/ibm4xx/pci/pci_machdep.c 25 May 2011 22:28:53 -0000
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pci/pcivar.h>
cvs diff: cannot find sys/arch/powerpc/include/bus.h
Index: sys/arch/powerpc/include/isa_machdep.h
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/include/isa_machdep.h,v
retrieving revision 1.6
diff -u -p -r1.6 isa_machdep.h
--- sys/arch/powerpc/include/isa_machdep.h 20 Aug 2009 14:21:12 -0000
1.6
+++ sys/arch/powerpc/include/isa_machdep.h 25 May 2011 22:28:53 -0000
@@ -72,7 +72,7 @@
#ifndef _POWERPC_ISA_MACHDEP_H_
#define _POWERPC_ISA_MACHDEP_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isadmavar.h>
/*
cvs diff: cannot find sys/arch/powerpc/include/ofw_bus.h
cvs diff: cannot find sys/arch/powerpc/include/prep_bus.h
Index: sys/arch/powerpc/include/booke/cpuvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/include/booke/cpuvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 cpuvar.h
--- sys/arch/powerpc/include/booke/cpuvar.h 17 Feb 2011 13:53:32 -0000
1.5
+++ sys/arch/powerpc/include/booke/cpuvar.h 25 May 2011 22:28:53 -0000
@@ -37,7 +37,7 @@
#ifndef _POWERPC_BOOKE_CPUVAR_H_
#define _POWERPC_BOOKE_CPUVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <prop/proplib.h>
struct cpunode_softc {
Index: sys/arch/powerpc/isa/isadma_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/isa/isadma_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 isadma_machdep.c
--- sys/arch/powerpc/isa/isadma_machdep.c 10 Nov 2010 09:27:23 -0000
1.6
+++ sys/arch/powerpc/isa/isadma_machdep.c 25 May 2011 22:28:53 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_machd
#include <sys/mbuf.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
Index: sys/arch/powerpc/isa/isapnp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/isa/isapnp_machdep.c,v
retrieving revision 1.4
diff -u -p -r1.4 isapnp_machdep.c
--- sys/arch/powerpc/isa/isapnp_machdep.c 21 Oct 2009 21:57:40 -0000
1.4
+++ sys/arch/powerpc/isa/isapnp_machdep.c 25 May 2011 22:28:53 -0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp_machd
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/powerpc/oea/ofw_autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/oea/ofw_autoconf.c,v
retrieving revision 1.12
diff -u -p -r1.12 ofw_autoconf.c
--- sys/arch/powerpc/oea/ofw_autoconf.c 9 Jun 2010 04:41:43 -0000 1.12
+++ sys/arch/powerpc/oea/ofw_autoconf.c 25 May 2011 22:28:53 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_autoconf
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/stdarg.h>
#include <dev/ofw/openfirm.h>
Index: sys/arch/powerpc/oea/ofw_consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/oea/ofw_consinit.c,v
retrieving revision 1.11
diff -u -p -r1.11 ofw_consinit.c
--- sys/arch/powerpc/oea/ofw_consinit.c 14 Nov 2010 03:32:44 -0000 1.11
+++ sys/arch/powerpc/oea/ofw_consinit.c 25 May 2011 22:28:53 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_consinit
#include <machine/autoconf.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/ofw_cons.h>
Index: sys/arch/powerpc/oea/ofw_rascons.c
===================================================================
RCS file: /cvsroot/src/sys/arch/powerpc/oea/ofw_rascons.c,v
retrieving revision 1.5
diff -u -p -r1.5 ofw_rascons.c
--- sys/arch/powerpc/oea/ofw_rascons.c 6 May 2010 04:32:16 -0000 1.5
+++ sys/arch/powerpc/oea/ofw_rascons.c 25 May 2011 22:28:53 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_rascons.
#include <dev/ofw/openfirm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsconsio.h>
Index: sys/arch/mips/rmi/rmixl_ohci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_ohci.c,v
retrieving revision 1.3
diff -u -p -r1.3 rmixl_ohci.c
--- sys/arch/mips/rmi/rmixl_ohci.c 29 Apr 2011 21:54:14 -0000 1.3
+++ sys/arch/mips/rmi/rmixl_ohci.c 25 May 2011 22:28:52 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_ohci.c
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_pci_cfg_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_pci_cfg_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_pci_cfg_space.c
--- sys/arch/mips/rmi/rmixl_pci_cfg_space.c 20 Feb 2011 07:48:37 -0000
1.2
+++ sys/arch/mips/rmi/rmixl_pci_cfg_space.c 25 May 2011 22:28:52 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_pci_cf
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_pci_ecfg_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_pci_ecfg_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_pci_ecfg_space.c
--- sys/arch/mips/rmi/rmixl_pci_ecfg_space.c 20 Feb 2011 07:48:37 -0000
1.2
+++ sys/arch/mips/rmi/rmixl_pci_ecfg_space.c 25 May 2011 22:28:52 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_pci_ec
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_pci_io_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_pci_io_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_pci_io_space.c
--- sys/arch/mips/rmi/rmixl_pci_io_space.c 20 Feb 2011 07:48:37 -0000
1.2
+++ sys/arch/mips/rmi/rmixl_pci_io_space.c 25 May 2011 22:28:52 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_pci_io
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_pci_mem_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_pci_mem_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_pci_mem_space.c
--- sys/arch/mips/rmi/rmixl_pci_mem_space.c 20 Feb 2011 07:48:37 -0000
1.2
+++ sys/arch/mips/rmi/rmixl_pci_mem_space.c 25 May 2011 22:28:52 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_pci_me
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_pcie.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_pcie.c,v
retrieving revision 1.6
diff -u -p -r1.6 rmixl_pcie.c
--- sys/arch/mips/rmi/rmixl_pcie.c 17 May 2011 17:34:51 -0000 1.6
+++ sys/arch/mips/rmi/rmixl_pcie.c 25 May 2011 22:28:52 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_pcie.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/rmi/rmixlreg.h>
Index: sys/arch/mips/rmi/rmixl_pcix.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_pcix.c,v
retrieving revision 1.7
diff -u -p -r1.7 rmixl_pcix.c
--- sys/arch/mips/rmi/rmixl_pcix.c 17 May 2011 17:34:51 -0000 1.7
+++ sys/arch/mips/rmi/rmixl_pcix.c 25 May 2011 22:28:52 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/rmi/rmixlreg.h>
Index: sys/arch/mips/rmi/rmixl_usbi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_usbi.c,v
retrieving revision 1.4
diff -u -p -r1.4 rmixl_usbi.c
--- sys/arch/mips/rmi/rmixl_usbi.c 29 Apr 2011 21:54:14 -0000 1.4
+++ sys/arch/mips/rmi/rmixl_usbi.c 25 May 2011 22:28:52 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_usbi.c
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/evbppc/ev64260/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/ev64260/com_obio.c,v
retrieving revision 1.10
diff -u -p -r1.10 com_obio.c
--- sys/arch/evbppc/ev64260/com_obio.c 28 Apr 2010 13:51:55 -0000 1.10
+++ sys/arch/evbppc/ev64260/com_obio.c 25 May 2011 22:28:48 -0000
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ic/comreg.h>
Index: sys/arch/evbppc/ev64260/gt_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/ev64260/gt_mainbus.c,v
retrieving revision 1.16
diff -u -p -r1.16 gt_mainbus.c
--- sys/arch/evbppc/ev64260/gt_mainbus.c 2 Jun 2010 06:44:33 -0000
1.16
+++ sys/arch/evbppc/ev64260/gt_mainbus.c 25 May 2011 22:28:48 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: gt_mainbus.c
#include <sys/extent.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "opt_pci.h"
#include <dev/pci/pcivar.h>
Index: sys/arch/evbppc/evbppc/evbppc_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/evbppc/evbppc_machdep.c,v
retrieving revision 1.9
diff -u -p -r1.9 evbppc_machdep.c
--- sys/arch/evbppc/evbppc/evbppc_machdep.c 7 Nov 2009 07:27:43 -0000
1.9
+++ sys/arch/evbppc/evbppc/evbppc_machdep.c 25 May 2011 22:28:48 -0000
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: evbppc_machd
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
int fake_mapiodev = 1;
Index: sys/arch/evbppc/explora/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/consinit.c,v
retrieving revision 1.7
diff -u -p -r1.7 consinit.c
--- sys/arch/evbppc/explora/consinit.c 28 Apr 2008 20:23:17 -0000 1.7
+++ sys/arch/evbppc/explora/consinit.c 25 May 2011 22:28:48 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <sys/systm.h>
#include <machine/explora.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "com.h"
#if NCOM > 0
Index: sys/arch/evbppc/explora/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/machdep.c,v
retrieving revision 1.32
diff -u -p -r1.32 machdep.c
--- sys/arch/evbppc/explora/machdep.c 14 Jan 2011 02:06:25 -0000 1.32
+++ sys/arch/evbppc/explora/machdep.c 25 May 2011 22:28:48 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <prop/proplib.h>
#include <machine/explora.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/powerpc.h>
#include <machine/tlb.h>
#include <machine/pcb.h>
Index: sys/arch/evbppc/explora/dev/com_elb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/dev/com_elb.c,v
retrieving revision 1.8
diff -u -p -r1.8 com_elb.c
--- sys/arch/evbppc/explora/dev/com_elb.c 8 Aug 2008 09:50:19 -0000
1.8
+++ sys/arch/evbppc/explora/dev/com_elb.c 25 May 2011 22:28:48 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_elb.c,v
#include <sys/systm.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/evbppc/explora/dev/elb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/dev/elb.c,v
retrieving revision 1.6
diff -u -p -r1.6 elb.c
--- sys/arch/evbppc/explora/dev/elb.c 28 Apr 2008 20:23:17 -0000 1.6
+++ sys/arch/evbppc/explora/dev/elb.c 25 May 2011 22:28:48 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: elb.c,v 1.6
#include <machine/explora.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/ibm4xx/dcr403cgx.h>
Index: sys/arch/evbppc/explora/dev/fb_elb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/dev/fb_elb.c,v
retrieving revision 1.11
diff -u -p -r1.11 fb_elb.c
--- sys/arch/evbppc/explora/dev/fb_elb.c 15 May 2010 08:53:26 -0000
1.11
+++ sys/arch/evbppc/explora/dev/fb_elb.c 25 May 2011 22:28:48 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: fb_elb.c,v 1
#include <dev/rasops/rasops.h>
#include <machine/explora.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/explora/dev/elbvar.h>
Index: sys/arch/evbppc/explora/dev/le_elb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/dev/le_elb.c,v
retrieving revision 1.8
diff -u -p -r1.8 le_elb.c
--- sys/arch/evbppc/explora/dev/le_elb.c 28 Apr 2008 20:23:17 -0000
1.8
+++ sys/arch/evbppc/explora/dev/le_elb.c 25 May 2011 22:28:48 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_ether.h>
Index: sys/arch/evbppc/explora/dev/lpt_elb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/dev/lpt_elb.c,v
retrieving revision 1.6
diff -u -p -r1.6 lpt_elb.c
--- sys/arch/evbppc/explora/dev/lpt_elb.c 28 Apr 2008 20:23:17 -0000
1.6
+++ sys/arch/evbppc/explora/dev/lpt_elb.c 25 May 2011 22:28:48 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_elb.c,v
#include <sys/systm.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: sys/arch/evbppc/explora/dev/pckbc_elb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/explora/dev/pckbc_elb.c,v
retrieving revision 1.6
diff -u -p -r1.6 pckbc_elb.c
--- sys/arch/evbppc/explora/dev/pckbc_elb.c 28 Apr 2008 20:23:17 -0000
1.6
+++ sys/arch/evbppc/explora/dev/pckbc_elb.c 25 May 2011 22:28:48 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i8042reg.h>
#include <dev/ic/pckbcvar.h>
cvs diff: cannot find sys/arch/evbppc/include/bus.h
Index: sys/arch/evbppc/obs405/obs200_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/obs405/obs200_machdep.c,v
retrieving revision 1.14
diff -u -p -r1.14 obs200_machdep.c
--- sys/arch/evbppc/obs405/obs200_machdep.c 4 Apr 2011 20:37:50 -0000
1.14
+++ sys/arch/evbppc/obs405/obs200_machdep.c 25 May 2011 22:28:48 -0000
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: obs200_machd
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/obs200.h>
#include <machine/century_bios.h>
Index: sys/arch/evbppc/obs405/obs266_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/obs405/obs266_machdep.c,v
retrieving revision 1.15
diff -u -p -r1.15 obs266_machdep.c
--- sys/arch/evbppc/obs405/obs266_machdep.c 4 Apr 2011 20:37:50 -0000
1.15
+++ sys/arch/evbppc/obs405/obs266_machdep.c 25 May 2011 22:28:48 -0000
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: obs266_machd
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/obs266.h>
#include <powerpc/spr.h>
Index: sys/arch/evbppc/obs405/obs600_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/obs405/obs600_machdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 obs600_machdep.c
--- sys/arch/evbppc/obs405/obs600_machdep.c 25 Feb 2011 10:18:09 -0000
1.3
+++ sys/arch/evbppc/obs405/obs600_machdep.c 25 May 2011 22:28:48 -0000
@@ -87,7 +87,7 @@ __KERNEL_RCSID(0, "$NetBSD: obs600_machd
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/obs600.h>
Index: sys/arch/evbppc/obs405/rbus_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/obs405/rbus_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 rbus_machdep.c
--- sys/arch/evbppc/obs405/rbus_machdep.c 18 Jan 2011 01:08:55 -0000
1.6
+++ sys/arch/evbppc/obs405/rbus_machdep.c 25 May 2011 22:28:48 -0000
@@ -35,7 +35,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
Index: sys/arch/evbppc/pmppc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/machdep.c,v
retrieving revision 1.10
diff -u -p -r1.10 machdep.c
--- sys/arch/evbppc/pmppc/machdep.c 20 Dec 2010 00:25:32 -0000 1.10
+++ sys/arch/evbppc/pmppc/machdep.c 25 May 2011 22:28:48 -0000
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <net/netisr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/db_machdep.h>
#include <machine/intr.h>
#include <machine/pio.h>
Index: sys/arch/evbppc/pmppc/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 mainbus.c
--- sys/arch/evbppc/pmppc/mainbus.c 28 Apr 2008 20:23:17 -0000 1.3
+++ sys/arch/evbppc/pmppc/mainbus.c 25 May 2011 22:28:48 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmppc.h>
#include <arch/evbppc/pmppc/dev/mainbus.h>
Index: sys/arch/evbppc/pmppc/pic_cpc700.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/pic_cpc700.c,v
retrieving revision 1.5
diff -u -p -r1.5 pic_cpc700.c
--- sys/arch/evbppc/pmppc/pic_cpc700.c 20 Dec 2010 00:25:32 -0000 1.5
+++ sys/arch/evbppc/pmppc/pic_cpc700.c 25 May 2011 22:28:48 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: pic_cpc700.c
#include <machine/pio.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/powerpc/pic/picvar.h>
Index: sys/arch/evbppc/pmppc/dev/cpc_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/dev/cpc_mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 cpc_mainbus.c
--- sys/arch/evbppc/pmppc/dev/cpc_mainbus.c 28 Apr 2008 20:23:17 -0000
1.3
+++ sys/arch/evbppc/pmppc/dev/cpc_mainbus.c 25 May 2011 22:28:48 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpc_mainbus.
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "locators.h"
#include <dev/pci/pcivar.h>
Index: sys/arch/evbppc/pmppc/dev/ds17485.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/dev/ds17485.c,v
retrieving revision 1.7
diff -u -p -r1.7 ds17485.c
--- sys/arch/evbppc/pmppc/dev/ds17485.c 9 Dec 2010 04:31:57 -0000 1.7
+++ sys/arch/evbppc/pmppc/dev/ds17485.c 25 May 2011 22:28:48 -0000
@@ -159,7 +159,7 @@ __KERNEL_RCSID(0, "$NetBSD: ds17485.c,v
#include <machine/cpu.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: sys/arch/evbppc/pmppc/dev/flash.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/dev/flash.c,v
retrieving revision 1.3
diff -u -p -r1.3 flash.c
--- sys/arch/evbppc/pmppc/dev/flash.c 28 Apr 2008 20:23:17 -0000 1.3
+++ sys/arch/evbppc/pmppc/dev/flash.c 25 May 2011 22:28:48 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: flash.c,v 1.
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/evbppc/pmppc/dev/mainbus.h>
struct flash_softc {
Index: sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c,v
retrieving revision 1.4
diff -u -p -r1.4 if_cs_mainbus.c
--- sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c 22 Sep 2009 14:55:19 -0000
1.4
+++ sys/arch/evbppc/pmppc/dev/if_cs_mainbus.c 25 May 2011 22:28:48 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_mainbu
#include <netinet/if_inarp.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/pmppc.h>
#include <arch/evbppc/pmppc/dev/mainbus.h>
Index: sys/arch/evbppc/pmppc/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/pmppc/pci/pci_machdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 pci_machdep.c
--- sys/arch/evbppc/pmppc/pci/pci_machdep.c 4 Apr 2011 20:37:50 -0000
1.3
+++ sys/arch/evbppc/pmppc/pci/pci_machdep.c 25 May 2011 22:28:48 -0000
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <uvm/uvm.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/intr.h>
Index: sys/arch/evbppc/virtex/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/consinit.c,v
retrieving revision 1.2
diff -u -p -r1.2 consinit.c
--- sys/arch/evbppc/virtex/consinit.c 17 Oct 2007 19:54:20 -0000 1.2
+++ sys/arch/evbppc/virtex/consinit.c 25 May 2011 22:28:48 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/virtex/virtex.h>
Index: sys/arch/evbppc/virtex/dcr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dcr.c,v
retrieving revision 1.1
diff -u -p -r1.1 dcr.c
--- sys/arch/evbppc/virtex/dcr.c 2 Dec 2006 22:18:47 -0000 1.1
+++ sys/arch/evbppc/virtex/dcr.c 25 May 2011 22:28:48 -0000
@@ -40,7 +40,7 @@
__KERNEL_RCSID(0, "$NetBSD: dcr.c,v 1.1 2006/12/02 22:18:47 freza Exp $");
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/virtex/dcr.h>
int
Index: sys/arch/evbppc/virtex/design_gsrd1.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/design_gsrd1.c,v
retrieving revision 1.2
diff -u -p -r1.2 design_gsrd1.c
--- sys/arch/evbppc/virtex/design_gsrd1.c 17 Oct 2007 19:54:20 -0000
1.2
+++ sys/arch/evbppc/virtex/design_gsrd1.c 25 May 2011 22:28:48 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: design_gsrd1
#include <sys/malloc.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
Index: sys/arch/evbppc/virtex/design_gsrd2.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/design_gsrd2.c,v
retrieving revision 1.3
diff -u -p -r1.3 design_gsrd2.c
--- sys/arch/evbppc/virtex/design_gsrd2.c 17 Oct 2007 19:54:20 -0000
1.3
+++ sys/arch/evbppc/virtex/design_gsrd2.c 25 May 2011 22:28:48 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: design_gsrd2
#include <sys/extent.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/powerpc.h>
#include <machine/tlb.h>
Index: sys/arch/evbppc/virtex/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/machdep.c,v
retrieving revision 1.15
diff -u -p -r1.15 machdep.c
--- sys/arch/evbppc/virtex/machdep.c 17 Jan 2011 07:32:54 -0000 1.15
+++ sys/arch/evbppc/virtex/machdep.c 25 May 2011 22:28:48 -0000
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <dev/cons.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <machine/pcb.h>
Index: sys/arch/evbppc/virtex/dev/if_temac.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dev/if_temac.c,v
retrieving revision 1.7
diff -u -p -r1.7 if_temac.c
--- sys/arch/evbppc/virtex/dev/if_temac.c 5 Apr 2010 07:19:30 -0000
1.7
+++ sys/arch/evbppc/virtex/dev/if_temac.c 25 May 2011 22:28:48 -0000
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_temac.c,v
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/virtex/idcr.h>
#include <evbppc/virtex/dev/xcvbusvar.h>
Index: sys/arch/evbppc/virtex/dev/pstwo.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dev/pstwo.c,v
retrieving revision 1.2
diff -u -p -r1.2 pstwo.c
--- sys/arch/evbppc/virtex/dev/pstwo.c 21 Feb 2007 22:59:40 -0000 1.2
+++ sys/arch/evbppc/virtex/dev/pstwo.c 25 May 2011 22:28:48 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: pstwo.c,v 1.
#include <sys/syslog.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pckbport/pckbportvar.h>
Index: sys/arch/evbppc/virtex/dev/tft.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dev/tft.c,v
retrieving revision 1.3
diff -u -p -r1.3 tft.c
--- sys/arch/evbppc/virtex/dev/tft.c 6 Feb 2011 23:25:17 -0000 1.3
+++ sys/arch/evbppc/virtex/dev/tft.c 25 May 2011 22:28:48 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: tft.c,v 1.3
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsconsio.h>
Index: sys/arch/evbppc/virtex/dev/tft_ll.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dev/tft_ll.c,v
retrieving revision 1.2
diff -u -p -r1.2 tft_ll.c
--- sys/arch/evbppc/virtex/dev/tft_ll.c 4 Mar 2007 05:59:46 -0000 1.2
+++ sys/arch/evbppc/virtex/dev/tft_ll.c 25 May 2011 22:28:48 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: tft_ll.c,v 1
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* XXX needed? */
#include <dev/wscons/wsdisplayvar.h>
Index: sys/arch/evbppc/virtex/dev/tft_plb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dev/tft_plb.c,v
retrieving revision 1.3
diff -u -p -r1.3 tft_plb.c
--- sys/arch/evbppc/virtex/dev/tft_plb.c 25 Oct 2009 09:32:25 -0000
1.3
+++ sys/arch/evbppc/virtex/dev/tft_plb.c 25 May 2011 22:28:48 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: tft_plb.c,v
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wsconsio.h>
Index: sys/arch/evbppc/virtex/dev/xcvbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dev/xcvbus.c,v
retrieving revision 1.1
diff -u -p -r1.1 xcvbus.c
--- sys/arch/evbppc/virtex/dev/xcvbus.c 2 Dec 2006 22:18:47 -0000 1.1
+++ sys/arch/evbppc/virtex/dev/xcvbus.c 25 May 2011 22:28:48 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: xcvbus.c,v 1
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/ibm4xx/dev/plbvar.h>
#include <evbppc/virtex/dev/xcvbusvar.h>
Index: sys/arch/evbppc/virtex/dev/xcvbusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/virtex/dev/xcvbusvar.h,v
retrieving revision 1.1
diff -u -p -r1.1 xcvbusvar.h
--- sys/arch/evbppc/virtex/dev/xcvbusvar.h 2 Dec 2006 22:18:47 -0000
1.1
+++ sys/arch/evbppc/virtex/dev/xcvbusvar.h 25 May 2011 22:28:48 -0000
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifndef _VIRTEX_DEV_VIRTEXVAR_H_
#define _VIRTEX_DEV_VIRTEXVAR_H_
Index: sys/arch/evbppc/walnut/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/walnut/consinit.c,v
retrieving revision 1.7
diff -u -p -r1.7 consinit.c
--- sys/arch/evbppc/walnut/consinit.c 11 Dec 2005 12:17:13 -0000 1.7
+++ sys/arch/evbppc/walnut/consinit.c 25 May 2011 22:28:48 -0000
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <powerpc/ibm4xx/ibm405gp.h>
#include <powerpc/ibm4xx/dev/opbvar.h>
Index: sys/arch/evbppc/walnut/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/walnut/machdep.c,v
retrieving revision 1.48
diff -u -p -r1.48 machdep.c
--- sys/arch/evbppc/walnut/machdep.c 4 Apr 2011 20:37:50 -0000 1.48
+++ sys/arch/evbppc/walnut/machdep.c 25 May 2011 22:28:48 -0000
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <prop/proplib.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
#include <machine/walnut.h>
Index: sys/arch/evbppc/walnut/dev/ds1743.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/walnut/dev/ds1743.c,v
retrieving revision 1.7
diff -u -p -r1.7 ds1743.c
--- sys/arch/evbppc/walnut/dev/ds1743.c 18 Sep 2006 22:05:47 -0000 1.7
+++ sys/arch/evbppc/walnut/dev/ds1743.c 25 May 2011 22:28:48 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ds1743.c,v 1
#include <dev/clock_subr.h>
#include <machine/rtc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbppc/walnut/dev/ds1743reg.h>
#include <evbppc/walnut/dev/pbusvar.h>
Index: sys/arch/evbppc/walnut/dev/pbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/walnut/dev/pbus.c,v
retrieving revision 1.10
diff -u -p -r1.10 pbus.c
--- sys/arch/evbppc/walnut/dev/pbus.c 4 May 2006 10:53:06 -0000 1.10
+++ sys/arch/evbppc/walnut/dev/pbus.c 25 May 2011 22:28:48 -0000
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: pbus.c,v 1.1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/walnut.h>
#include <evbppc/walnut/dev/pbusvar.h>
Index: sys/arch/evbppc/walnut/dev/pbusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbppc/walnut/dev/pbusvar.h,v
retrieving revision 1.1
diff -u -p -r1.1 pbusvar.h
--- sys/arch/evbppc/walnut/dev/pbusvar.h 9 Dec 2002 12:16:24 -0000
1.1
+++ sys/arch/evbppc/walnut/dev/pbusvar.h 25 May 2011 22:28:48 -0000
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct pbus_attach_args {
const char *pb_name;
Index: sys/arch/hp700/dev/asp.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/asp.c,v
retrieving revision 1.18
diff -u -p -r1.18 asp.c
--- sys/arch/hp700/dev/asp.c 1 Feb 2011 18:33:24 -0000 1.18
+++ sys/arch/hp700/dev/asp.c 25 May 2011 22:28:48 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: asp.c,v 1.18
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
#include <machine/cpufunc.h>
Index: sys/arch/hp700/dev/com_dino.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/com_dino.c,v
retrieving revision 1.8
diff -u -p -r1.8 com_dino.c
--- sys/arch/hp700/dev/com_dino.c 18 May 2009 05:13:26 -0000 1.8
+++ sys/arch/hp700/dev/com_dino.c 25 May 2011 22:28:48 -0000
@@ -31,7 +31,7 @@
#include <sys/device.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/dev/com_ssio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/com_ssio.c,v
retrieving revision 1.2
diff -u -p -r1.2 com_ssio.c
--- sys/arch/hp700/dev/com_ssio.c 5 Mar 2010 18:41:29 -0000 1.2
+++ sys/arch/hp700/dev/com_ssio.c 25 May 2011 22:28:48 -0000
@@ -23,7 +23,7 @@
#include <sys/device.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <dev/ic/comreg.h>
Index: sys/arch/hp700/dev/gecko.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/gecko.c,v
retrieving revision 1.3
diff -u -p -r1.3 gecko.c
--- sys/arch/hp700/dev/gecko.c 13 Jan 2011 21:15:13 -0000 1.3
+++ sys/arch/hp700/dev/gecko.c 25 May 2011 22:28:48 -0000
@@ -22,7 +22,7 @@
#include <sys/systm.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/iomod.h>
#include <machine/pdc.h>
Index: sys/arch/hp700/dev/lasi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/lasi.c,v
retrieving revision 1.20
diff -u -p -r1.20 lasi.c
--- sys/arch/hp700/dev/lasi.c 1 Feb 2011 18:33:24 -0000 1.20
+++ sys/arch/hp700/dev/lasi.c 25 May 2011 22:28:48 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: lasi.c,v 1.2
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/dev/lcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/lcd.c,v
retrieving revision 1.4
diff -u -p -r1.4 lcd.c
--- sys/arch/hp700/dev/lcd.c 4 Jan 2011 10:42:33 -0000 1.4
+++ sys/arch/hp700/dev/lcd.c 25 May 2011 22:28:48 -0000
@@ -24,7 +24,7 @@
#include <sys/callout.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/pdc.h>
Index: sys/arch/hp700/dev/lpt_ssio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/lpt_ssio.c,v
retrieving revision 1.1
diff -u -p -r1.1 lpt_ssio.c
--- sys/arch/hp700/dev/lpt_ssio.c 28 May 2009 08:41:29 -0000 1.1
+++ sys/arch/hp700/dev/lpt_ssio.c 25 May 2011 22:28:48 -0000
@@ -20,7 +20,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: sys/arch/hp700/dev/mongoose.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/mongoose.c,v
retrieving revision 1.21
diff -u -p -r1.21 mongoose.c
--- sys/arch/hp700/dev/mongoose.c 1 Feb 2011 18:33:24 -0000 1.21
+++ sys/arch/hp700/dev/mongoose.c 25 May 2011 22:28:48 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mongoose.c,v
#include <sys/device.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/dev/siop_sgc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/siop_sgc.c,v
retrieving revision 1.7
diff -u -p -r1.7 siop_sgc.c
--- sys/arch/hp700/dev/siop_sgc.c 1 Feb 2011 18:33:24 -0000 1.7
+++ sys/arch/hp700/dev/siop_sgc.c 25 May 2011 22:28:48 -0000
@@ -28,7 +28,7 @@ __KERNEL_RCSID(0, "$NetBSD: siop_sgc.c,v
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <dev/scsipi/scsi_all.h>
Index: sys/arch/hp700/dev/ssio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/ssio.c,v
retrieving revision 1.1
diff -u -p -r1.1 ssio.c
--- sys/arch/hp700/dev/ssio.c 28 May 2009 08:41:29 -0000 1.1
+++ sys/arch/hp700/dev/ssio.c 25 May 2011 22:28:48 -0000
@@ -26,7 +26,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/hp700/dev/sti_sgc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/sti_sgc.c,v
retrieving revision 1.20
diff -u -p -r1.20 sti_sgc.c
--- sys/arch/hp700/dev/sti_sgc.c 9 Nov 2010 12:24:47 -0000 1.20
+++ sys/arch/hp700/dev/sti_sgc.c 25 May 2011 22:28:48 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/dev/uturn.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/dev/uturn.c,v
retrieving revision 1.15
diff -u -p -r1.15 uturn.c
--- sys/arch/hp700/dev/uturn.c 13 Jan 2011 21:44:13 -0000 1.15
+++ sys/arch/hp700/dev/uturn.c 25 May 2011 22:28:48 -0000
@@ -40,7 +40,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/gsc/com_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/com_gsc.c,v
retrieving revision 1.16
diff -u -p -r1.16 com_gsc.c
--- sys/arch/hp700/gsc/com_gsc.c 1 Feb 2011 18:33:24 -0000 1.16
+++ sys/arch/hp700/gsc/com_gsc.c 25 May 2011 22:28:48 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_gsc.c,v
#include <sys/kgdb.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/gsc/fdc_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/fdc_gsc.c,v
retrieving revision 1.9
diff -u -p -r1.9 fdc_gsc.c
--- sys/arch/hp700/gsc/fdc_gsc.c 11 Dec 2010 19:32:06 -0000 1.9
+++ sys/arch/hp700/gsc/fdc_gsc.c 25 May 2011 22:28:48 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_gsc.c,v
#include <sys/device.h>
#include <machine/iomod.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/gsc/gsckbc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/gsckbc.c,v
retrieving revision 1.7
diff -u -p -r1.7 gsckbc.c
--- sys/arch/hp700/gsc/gsckbc.c 1 Feb 2011 18:33:24 -0000 1.7
+++ sys/arch/hp700/gsc/gsckbc.c 25 May 2011 22:28:48 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: gsckbc.c,v 1
#include "ioconf.h"
/* bus_space / bus_dma etc. */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
/* general system data and functions */
Index: sys/arch/hp700/gsc/harmony.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/harmony.c,v
retrieving revision 1.22
diff -u -p -r1.22 harmony.c
--- sys/arch/hp700/gsc/harmony.c 4 Feb 2011 11:00:30 -0000 1.22
+++ sys/arch/hp700/gsc/harmony.c 25 May 2011 22:28:49 -0000
@@ -85,7 +85,7 @@
#include <machine/intr.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <hp700/dev/cpudevs.h>
#include <hp700/gsc/gscbusvar.h>
Index: sys/arch/hp700/gsc/if_ie_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/if_ie_gsc.c,v
retrieving revision 1.23
diff -u -p -r1.23 if_ie_gsc.c
--- sys/arch/hp700/gsc/if_ie_gsc.c 1 Feb 2011 18:33:24 -0000 1.23
+++ sys/arch/hp700/gsc/if_ie_gsc.c 25 May 2011 22:28:49 -0000
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ie_gsc.c,
#include <netinet/in.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/gsc/if_iee_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/if_iee_gsc.c,v
retrieving revision 1.19
diff -u -p -r1.19 if_iee_gsc.c
--- sys/arch/hp700/gsc/if_iee_gsc.c 1 Feb 2011 18:33:24 -0000 1.19
+++ sys/arch/hp700/gsc/if_iee_gsc.c 25 May 2011 22:28:49 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_iee_gsc.c
#include "ioconf.h"
/* bus_space / bus_dma etc. */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
/* general system data and functions */
Index: sys/arch/hp700/gsc/lpt_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/lpt_gsc.c,v
retrieving revision 1.13
diff -u -p -r1.13 lpt_gsc.c
--- sys/arch/hp700/gsc/lpt_gsc.c 1 Feb 2011 18:33:24 -0000 1.13
+++ sys/arch/hp700/gsc/lpt_gsc.c 25 May 2011 22:28:49 -0000
@@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_gsc.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
Index: sys/arch/hp700/gsc/oosiop_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/oosiop_gsc.c,v
retrieving revision 1.12
diff -u -p -r1.12 oosiop_gsc.c
--- sys/arch/hp700/gsc/oosiop_gsc.c 1 Feb 2011 18:33:24 -0000 1.12
+++ sys/arch/hp700/gsc/oosiop_gsc.c 25 May 2011 22:28:49 -0000
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: oosiop_gsc.c
#include <machine/intr.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/oosiopreg.h>
#include <dev/ic/oosiopvar.h>
Index: sys/arch/hp700/gsc/osiop_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/osiop_gsc.c,v
retrieving revision 1.19
diff -u -p -r1.19 osiop_gsc.c
--- sys/arch/hp700/gsc/osiop_gsc.c 1 Feb 2011 18:33:24 -0000 1.19
+++ sys/arch/hp700/gsc/osiop_gsc.c 25 May 2011 22:28:49 -0000
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: osiop_gsc.c,
#include <machine/intr.h>
#include <machine/iomod.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/osiopreg.h>
#include <dev/ic/osiopvar.h>
Index: sys/arch/hp700/gsc/siop_gsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/gsc/siop_gsc.c,v
retrieving revision 1.13
diff -u -p -r1.13 siop_gsc.c
--- sys/arch/hp700/gsc/siop_gsc.c 1 Feb 2011 18:33:24 -0000 1.13
+++ sys/arch/hp700/gsc/siop_gsc.c 25 May 2011 22:28:49 -0000
@@ -28,7 +28,7 @@ __KERNEL_RCSID(0, "$NetBSD: siop_gsc.c,v
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomod.h>
#include <dev/scsipi/scsi_all.h>
Index: sys/arch/hp700/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/hp700/include/autoconf.h,v
retrieving revision 1.18
diff -u -p -r1.18 autoconf.h
--- sys/arch/hp700/include/autoconf.h 20 Jan 2011 19:47:40 -0000 1.18
+++ sys/arch/hp700/include/autoconf.h 25 May 2011 22:28:49 -0000
@@ -30,7 +30,7 @@
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pdc.h>
/* 16 should be enough for anyone */
cvs diff: cannot find sys/arch/hp700/include/bus.h
Index: sys/arch/i386/acpi/npx_acpi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/acpi/npx_acpi.c,v
retrieving revision 1.18
diff -u -p -r1.18 npx_acpi.c
--- sys/arch/i386/acpi/npx_acpi.c 21 Feb 2009 00:30:37 -0000 1.18
+++ sys/arch/i386/acpi/npx_acpi.c 25 May 2011 22:28:49 -0000
@@ -32,7 +32,7 @@ __KERNEL_RCSID(0, "$NetBSD: npx_acpi.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <machine/intr.h>
#include <machine/specialreg.h>
Index: sys/arch/i386/eisa/eisa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/eisa/eisa_machdep.c,v
retrieving revision 1.34
diff -u -p -r1.34 eisa_machdep.c
--- sys/arch/i386/eisa/eisa_machdep.c 17 Nov 2009 23:51:59 -0000 1.34
+++ sys/arch/i386/eisa/eisa_machdep.c 25 May 2011 22:28:49 -0000
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: eisa_machdep
#include <sys/errno.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <dev/isa/isareg.h>
Index: sys/arch/i386/i386/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/genassym.cf,v
retrieving revision 1.88
diff -u -p -r1.88 genassym.cf
--- sys/arch/i386/i386/genassym.cf 20 Dec 2010 00:25:35 -0000 1.88
+++ sys/arch/i386/i386/genassym.cf 25 May 2011 22:28:49 -0000
@@ -143,7 +143,7 @@ endif
include <machine/tlog.h>
-include <x86/bus.h>
+include <sys/bus.h>
define PAGE_SIZE PAGE_SIZE
Index: sys/arch/i386/i386/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/machdep.c,v
retrieving revision 1.702
diff -u -p -r1.702 machdep.c
--- sys/arch/i386/i386/machdep.c 26 Apr 2011 15:51:23 -0000 1.702
+++ sys/arch/i386/i386/machdep.c 25 May 2011 22:28:49 -0000
@@ -210,7 +210,7 @@ uint32_t arch_i386_xbox_memsize = 0;
#include "cardbus.h"
#if NCARDBUS > 0
/* For rbus_min_start hint. */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/rbus.h>
#include <machine/rbus_machdep.h>
#endif
Index: sys/arch/i386/i386/rbus_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/i386/rbus_machdep.c,v
retrieving revision 1.25
diff -u -p -r1.25 rbus_machdep.c
--- sys/arch/i386/i386/rbus_machdep.c 1 Mar 2010 01:15:24 -0000 1.25
+++ sys/arch/i386/i386/rbus_machdep.c 25 May 2011 22:28:49 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/rbus.h>
#include <sys/device.h>
cvs diff: cannot find sys/arch/i386/include/bus.h
Index: sys/arch/i386/include/mca_machdep.h
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/include/mca_machdep.h,v
retrieving revision 1.14
diff -u -p -r1.14 mca_machdep.h
--- sys/arch/i386/include/mca_machdep.h 3 Apr 2011 22:29:26 -0000 1.14
+++ sys/arch/i386/include/mca_machdep.h 25 May 2011 22:28:49 -0000
@@ -31,7 +31,7 @@
#define _I386_MCA_MACHDEP_H_
#include <sys/device.h> /* for device_t */
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* i386-specific definitions for MCA autoconfiguration.
Index: sys/arch/i386/isa/ahc_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/ahc_isa.c,v
retrieving revision 1.38
diff -u -p -r1.38 ahc_isa.c
--- sys/arch/i386/isa/ahc_isa.c 28 Feb 2010 15:52:16 -0000 1.38
+++ sys/arch/i386/isa/ahc_isa.c 25 May 2011 22:28:49 -0000
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v
#include <sys/malloc.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/scsipi/scsi_all.h>
Index: sys/arch/i386/isa/cmos.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/cmos.c,v
retrieving revision 1.8
diff -u -p -r1.8 cmos.c
--- sys/arch/i386/isa/cmos.c 19 Oct 2009 23:19:38 -0000 1.8
+++ sys/arch/i386/isa/cmos.c 25 May 2011 22:28:49 -0000
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: cmos.c,v 1.8
#include <sys/conf.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isareg.h>
Index: sys/arch/i386/isa/isapnp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/isapnp_machdep.c,v
retrieving revision 1.16
diff -u -p -r1.16 isapnp_machdep.c
--- sys/arch/i386/isa/isapnp_machdep.c 28 Apr 2010 19:17:03 -0000 1.16
+++ sys/arch/i386/isa/isapnp_machdep.c 25 May 2011 22:28:49 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp_machd
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/i386/isa/lms.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/lms.c,v
retrieving revision 1.55
diff -u -p -r1.55 lms.c
--- sys/arch/i386/isa/lms.c 4 May 2009 12:14:31 -0000 1.55
+++ sys/arch/i386/isa/lms.c 25 May 2011 22:28:49 -0000
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: lms.c,v 1.55
#include <sys/ioctl.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: sys/arch/i386/isa/mms.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/mms.c,v
retrieving revision 1.52
diff -u -p -r1.52 mms.c
--- sys/arch/i386/isa/mms.c 4 May 2009 12:14:31 -0000 1.52
+++ sys/arch/i386/isa/mms.c 25 May 2011 22:28:49 -0000
@@ -32,7 +32,7 @@ __KERNEL_RCSID(0, "$NetBSD: mms.c,v 1.52
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/i386/isa/npx_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/isa/npx_isa.c,v
retrieving revision 1.21
diff -u -p -r1.21 npx_isa.c
--- sys/arch/i386/isa/npx_isa.c 4 May 2009 12:38:51 -0000 1.21
+++ sys/arch/i386/isa/npx_isa.c 25 May 2011 22:28:49 -0000
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: npx_isa.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <machine/intr.h>
#include <machine/specialreg.h>
Index: sys/arch/i386/mca/mca_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/mca/mca_machdep.c,v
retrieving revision 1.40
diff -u -p -r1.40 mca_machdep.c
--- sys/arch/i386/mca/mca_machdep.c 3 Apr 2011 22:29:27 -0000 1.40
+++ sys/arch/i386/mca/mca_machdep.c 25 May 2011 22:28:49 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mca_machdep.
#include <machine/bioscall.h>
#include <machine/psl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bus_private.h>
#include <machine/pio.h>
Index: sys/arch/i386/pci/ali1543.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/ali1543.c,v
retrieving revision 1.11
diff -u -p -r1.11 ali1543.c
--- sys/arch/i386/pci/ali1543.c 15 Dec 2009 22:17:12 -0000 1.11
+++ sys/arch/i386/pci/ali1543.c 25 May 2011 22:28:49 -0000
@@ -94,7 +94,7 @@ __KERNEL_RCSID(0, "$NetBSD: ali1543.c,v
#include <sys/proc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/amd756.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/amd756.c,v
retrieving revision 1.8
diff -u -p -r1.8 amd756.c
--- sys/arch/i386/pci/amd756.c 28 Apr 2008 20:23:24 -0000 1.8
+++ sys/arch/i386/pci/amd756.c 25 May 2011 22:28:49 -0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: amd756.c,v 1
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/elan520.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/elan520.c,v
retrieving revision 1.48
diff -u -p -r1.48 elan520.c
--- sys/arch/i386/pci/elan520.c 26 Feb 2010 19:25:07 -0000 1.48
+++ sys/arch/i386/pci/elan520.c 25 May 2011 22:28:49 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: elan520.c,v
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <x86/nmi.h>
Index: sys/arch/i386/pci/gcscehci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/gcscehci.c,v
retrieving revision 1.8
diff -u -p -r1.8 gcscehci.c
--- sys/arch/i386/pci/gcscehci.c 25 May 2010 08:37:10 -0000 1.8
+++ sys/arch/i386/pci/gcscehci.c 25 May 2011 22:28:49 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: gcscehci.c,v
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <dev/pci/pcidevs.h>
Index: sys/arch/i386/pci/geode.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/geode.c,v
retrieving revision 1.14
diff -u -p -r1.14 geode.c
--- sys/arch/i386/pci/geode.c 19 Oct 2009 23:19:38 -0000 1.14
+++ sys/arch/i386/pci/geode.c 25 May 2011 22:28:49 -0000
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: geode.c,v 1.
#include <sys/device.h>
#include <sys/wdog.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <arch/i386/pci/geodevar.h>
Index: sys/arch/i386/pci/geodecntr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/geodecntr.c,v
retrieving revision 1.8
diff -u -p -r1.8 geodecntr.c
--- sys/arch/i386/pci/geodecntr.c 10 May 2008 13:35:56 -0000 1.8
+++ sys/arch/i386/pci/geodecntr.c 25 May 2011 22:28:49 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: geodecntr.c,
#include <sys/device.h>
#include <machine/cpu.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/i386/pci/geodevar.h>
#include <arch/i386/pci/geodereg.h>
Index: sys/arch/i386/pci/geodewdg.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/geodewdg.c,v
retrieving revision 1.10
diff -u -p -r1.10 geodewdg.c
--- sys/arch/i386/pci/geodewdg.c 19 Oct 2009 23:19:38 -0000 1.10
+++ sys/arch/i386/pci/geodewdg.c 25 May 2011 22:28:49 -0000
@@ -70,7 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: geodewdg.c,v
#include <sys/device.h>
#include <sys/wdog.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
#include <arch/i386/pci/geodevar.h>
Index: sys/arch/i386/pci/gscpcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/gscpcib.c,v
retrieving revision 1.15
diff -u -p -r1.15 gscpcib.c
--- sys/arch/i386/pci/gscpcib.c 8 Jan 2010 00:09:44 -0000 1.15
+++ sys/arch/i386/pci/gscpcib.c 25 May 2011 22:28:49 -0000
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: gscpcib.c,v
#include <sys/gpio.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/i386/pci/opti82c558.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/opti82c558.c,v
retrieving revision 1.9
diff -u -p -r1.9 opti82c558.c
--- sys/arch/i386/pci/opti82c558.c 28 Apr 2008 20:23:25 -0000 1.9
+++ sys/arch/i386/pci/opti82c558.c 25 May 2011 22:28:49 -0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: opti82c558.c
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/opti82c700.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/opti82c700.c,v
retrieving revision 1.9
diff -u -p -r1.9 opti82c700.c
--- sys/arch/i386/pci/opti82c700.c 28 Apr 2008 20:23:25 -0000 1.9
+++ sys/arch/i386/pci/opti82c700.c 25 May 2011 22:28:49 -0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: opti82c700.c
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/pceb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/pceb.c,v
retrieving revision 1.23
diff -u -p -r1.23 pceb.c
--- sys/arch/i386/pci/pceb.c 28 Apr 2010 19:17:03 -0000 1.23
+++ sys/arch/i386/pci/pceb.c 25 May 2011 22:28:49 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pceb.c,v 1.2
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/eisa/eisavar.h>
Index: sys/arch/i386/pci/pci_intr_fixup.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/pci_intr_fixup.c,v
retrieving revision 1.47
diff -u -p -r1.47 pci_intr_fixup.c
--- sys/arch/i386/pci/pci_intr_fixup.c 28 Apr 2008 20:23:25 -0000 1.47
+++ sys/arch/i386/pci/pci_intr_fixup.c 25 May 2011 22:28:49 -0000
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_intr_fix
#include <sys/queue.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/pcmb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/pcmb.c,v
retrieving revision 1.19
diff -u -p -r1.19 pcmb.c
--- sys/arch/i386/pci/pcmb.c 28 Apr 2010 19:17:04 -0000 1.19
+++ sys/arch/i386/pci/pcmb.c 25 May 2011 22:28:49 -0000
@@ -40,8 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcmb.c,v 1.1
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mca/mcavar.h>
Index: sys/arch/i386/pci/piix.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/piix.c,v
retrieving revision 1.14
diff -u -p -r1.14 piix.c
--- sys/arch/i386/pci/piix.c 28 Apr 2008 20:23:25 -0000 1.14
+++ sys/arch/i386/pci/piix.c 25 May 2011 22:28:49 -0000
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: piix.c,v 1.1
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/piixpcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/piixpcib.c,v
retrieving revision 1.20
diff -u -p -r1.20 piixpcib.c
--- sys/arch/i386/pci/piixpcib.c 4 Apr 2011 20:37:51 -0000 1.20
+++ sys/arch/i386/pci/piixpcib.c 25 May 2011 22:28:49 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: piixpcib.c,v
#include <sys/systm.h>
#include <sys/device.h>
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/frame.h>
#include <machine/bioscall.h>
Index: sys/arch/i386/pci/sis85c503.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/sis85c503.c,v
retrieving revision 1.9
diff -u -p -r1.9 sis85c503.c
--- sys/arch/i386/pci/sis85c503.c 28 Apr 2008 20:23:25 -0000 1.9
+++ sys/arch/i386/pci/sis85c503.c 25 May 2011 22:28:49 -0000
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: sis85c503.c,
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/via8231.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/via8231.c,v
retrieving revision 1.3
diff -u -p -r1.3 via8231.c
--- sys/arch/i386/pci/via8231.c 28 Apr 2008 20:23:25 -0000 1.3
+++ sys/arch/i386/pci/via8231.c 25 May 2011 22:28:49 -0000
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: via8231.c,v
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pci/via82c586.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pci/via82c586.c,v
retrieving revision 1.11
diff -u -p -r1.11 via82c586.c
--- sys/arch/i386/pci/via82c586.c 28 Apr 2008 20:23:25 -0000 1.11
+++ sys/arch/i386/pci/via82c586.c 25 May 2011 22:28:49 -0000
@@ -67,7 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: via82c586.c,
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/i386/pnpbios/atppc_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/atppc_pnpbios.c,v
retrieving revision 1.8
diff -u -p -r1.8 atppc_pnpbios.c
--- sys/arch/i386/pnpbios/atppc_pnpbios.c 28 Apr 2008 20:23:25 -0000
1.8
+++ sys/arch/i386/pnpbios/atppc_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: atppc_pnpbio
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/i386/pnpbios/com_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/com_pnpbios.c,v
retrieving revision 1.14
diff -u -p -r1.14 com_pnpbios.c
--- sys/arch/i386/pnpbios/com_pnpbios.c 14 Mar 2008 15:09:10 -0000 1.14
+++ sys/arch/i386/pnpbios/com_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_pnpbios.
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/i386/pnpbios/ess_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/ess_pnpbios.c,v
retrieving revision 1.21
diff -u -p -r1.21 ess_pnpbios.c
--- sys/arch/i386/pnpbios/ess_pnpbios.c 22 May 2010 16:35:00 -0000 1.21
+++ sys/arch/i386/pnpbios/ess_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ess_pnpbios.
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: sys/arch/i386/pnpbios/fdc_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/fdc_pnpbios.c,v
retrieving revision 1.15
diff -u -p -r1.15 fdc_pnpbios.c
--- sys/arch/i386/pnpbios/fdc_pnpbios.c 25 Nov 2009 13:15:17 -0000 1.15
+++ sys/arch/i386/pnpbios/fdc_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_pnpbios.
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: sys/arch/i386/pnpbios/joy_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/joy_pnpbios.c,v
retrieving revision 1.12
diff -u -p -r1.12 joy_pnpbios.c
--- sys/arch/i386/pnpbios/joy_pnpbios.c 28 Apr 2008 20:23:25 -0000 1.12
+++ sys/arch/i386/pnpbios/joy_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: joy_pnpbios.
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/i386/pnpbios/lm_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/lm_pnpbios.c,v
retrieving revision 1.14
diff -u -p -r1.14 lm_pnpbios.c
--- sys/arch/i386/pnpbios/lm_pnpbios.c 28 Apr 2008 20:23:25 -0000 1.14
+++ sys/arch/i386/pnpbios/lm_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: lm_pnpbios.c
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/i386/pnpbios/lpt_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/lpt_pnpbios.c,v
retrieving revision 1.11
diff -u -p -r1.11 lpt_pnpbios.c
--- sys/arch/i386/pnpbios/lpt_pnpbios.c 7 Mar 2008 17:15:51 -0000 1.11
+++ sys/arch/i386/pnpbios/lpt_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_pnpbios.
#include <sys/proc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/i386/pnpbios/npx_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/npx_pnpbios.c,v
retrieving revision 1.12
diff -u -p -r1.12 npx_pnpbios.c
--- sys/arch/i386/pnpbios/npx_pnpbios.c 28 Apr 2008 20:23:25 -0000 1.12
+++ sys/arch/i386/pnpbios/npx_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: npx_pnpbios.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpufunc.h>
#include <machine/intr.h>
#include <machine/specialreg.h>
Index: sys/arch/i386/pnpbios/pciide_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/pciide_pnpbios.c,v
retrieving revision 1.26
diff -u -p -r1.26 pciide_pnpbios.c
--- sys/arch/i386/pnpbios/pciide_pnpbios.c 16 Apr 2008 22:15:17 -0000
1.26
+++ sys/arch/i386/pnpbios/pciide_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pciide_pnpbi
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/wdcreg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/i386/pnpbios/sb_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/sb_pnpbios.c,v
retrieving revision 1.15
diff -u -p -r1.15 sb_pnpbios.c
--- sys/arch/i386/pnpbios/sb_pnpbios.c 17 Mar 2008 13:38:25 -0000 1.15
+++ sys/arch/i386/pnpbios/sb_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: sb_pnpbios.c
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: sys/arch/i386/pnpbios/wss_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/wss_pnpbios.c,v
retrieving revision 1.18
diff -u -p -r1.18 wss_pnpbios.c
--- sys/arch/i386/pnpbios/wss_pnpbios.c 4 May 2009 12:13:19 -0000 1.18
+++ sys/arch/i386/pnpbios/wss_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: wss_pnpbios.
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: sys/arch/i386/pnpbios/ym_pnpbios.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/pnpbios/ym_pnpbios.c,v
retrieving revision 1.15
diff -u -p -r1.15 ym_pnpbios.c
--- sys/arch/i386/pnpbios/ym_pnpbios.c 4 May 2009 12:13:19 -0000 1.15
+++ sys/arch/i386/pnpbios/ym_pnpbios.c 25 May 2011 22:28:50 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ym_pnpbios.c
#include <sys/device.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/audioio.h>
#include <dev/audio_if.h>
Index: sys/arch/i386/xbox/xbox.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/xbox/xbox.c,v
retrieving revision 1.5
diff -u -p -r1.5 xbox.c
--- sys/arch/i386/xbox/xbox.c 28 Apr 2010 19:17:04 -0000 1.5
+++ sys/arch/i386/xbox/xbox.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: xbox.c,v 1.5
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/i386/include/xbox.h>
Index: sys/arch/i386/xbox/xboxfb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/xbox/xboxfb.c,v
retrieving revision 1.14
diff -u -p -r1.14 xboxfb.c
--- sys/arch/i386/xbox/xboxfb.c 16 Dec 2010 07:59:10 -0000 1.14
+++ sys/arch/i386/xbox/xboxfb.c 25 May 2011 22:28:50 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: xboxfb.c,v 1
#include <uvm/uvm_extern.h>
/* #include <machine/autoconf.h> */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/xbox.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/i386/xbox/xboxlcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/i386/xbox/xboxlcd.c,v
retrieving revision 1.3
diff -u -p -r1.3 xboxlcd.c
--- sys/arch/i386/xbox/xboxlcd.c 11 Dec 2007 12:00:56 -0000 1.3
+++ sys/arch/i386/xbox/xboxlcd.c 25 May 2011 22:28:50 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: xboxlcd.c,v
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/xbox.h>
#include <machine/pio.h>
Index: sys/arch/ibmnws/ibmnws/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ibmnws/ibmnws/consinit.c,v
retrieving revision 1.4
diff -u -p -r1.4 consinit.c
--- sys/arch/ibmnws/ibmnws/consinit.c 15 May 2008 23:38:49 -0000 1.4
+++ sys/arch/ibmnws/ibmnws/consinit.c 25 May 2011 22:28:50 -0000
@@ -34,7 +34,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/cons.h>
Index: sys/arch/ibmnws/ibmnws/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ibmnws/ibmnws/cpu.c,v
retrieving revision 1.6
diff -u -p -r1.6 cpu.c
--- sys/arch/ibmnws/ibmnws/cpu.c 3 Nov 2008 15:13:16 -0000 1.6
+++ sys/arch/ibmnws/ibmnws/cpu.c 25 May 2011 22:28:50 -0000
@@ -34,7 +34,7 @@
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
int cpumatch(device_t, cfdata_t, void *);
Index: sys/arch/ibmnws/ibmnws/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ibmnws/ibmnws/machdep.c,v
retrieving revision 1.14
diff -u -p -r1.14 machdep.c
--- sys/arch/ibmnws/ibmnws/machdep.c 27 Nov 2009 03:23:10 -0000 1.14
+++ sys/arch/ibmnws/ibmnws/machdep.c 25 May 2011 22:28:50 -0000
@@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <net/netisr.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pmap.h>
#include <machine/powerpc.h>
Index: sys/arch/ibmnws/ibmnws/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ibmnws/ibmnws/mainbus.c,v
retrieving revision 1.9
diff -u -p -r1.9 mainbus.c
--- sys/arch/ibmnws/ibmnws/mainbus.c 17 May 2011 17:34:50 -0000 1.9
+++ sys/arch/ibmnws/ibmnws/mainbus.c 25 May 2011 22:28:50 -0000
@@ -43,7 +43,7 @@
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/isa_machdep.h>
#include <dev/pci/pcivar.h>
cvs diff: cannot find sys/arch/ibmnws/include/bus.h
Index: sys/arch/ibmnws/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/ibmnws/pci/pci_machdep.c,v
retrieving revision 1.6
diff -u -p -r1.6 pci_machdep.c
--- sys/arch/ibmnws/pci/pci_machdep.c 13 Dec 2010 16:19:03 -0000 1.6
+++ sys/arch/ibmnws/pci/pci_machdep.c 25 May 2011 22:28:50 -0000
@@ -49,7 +49,7 @@
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
cvs diff: cannot find sys/arch/iyonix/include/bus.h
Index: sys/arch/iyonix/iyonix/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/iyonix/iyonix/com_obio.c,v
retrieving revision 1.5
diff -u -p -r1.5 com_obio.c
--- sys/arch/iyonix/iyonix/com_obio.c 28 Apr 2008 20:23:26 -0000 1.5
+++ sys/arch/iyonix/iyonix/com_obio.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/iyonix/iyonix/i80321_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/iyonix/iyonix/i80321_mainbus.c,v
retrieving revision 1.4
diff -u -p -r1.4 i80321_mainbus.c
--- sys/arch/iyonix/iyonix/i80321_mainbus.c 14 May 2006 15:26:05 -0000
1.4
+++ sys/arch/iyonix/iyonix/i80321_mainbus.c 25 May 2011 22:28:50 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_mainb
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <iyonix/iyonix/iyonixreg.h>
#include <iyonix/iyonix/iyonixvar.h>
Index: sys/arch/iyonix/iyonix/iyonix_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/iyonix/iyonix/iyonix_machdep.c,v
retrieving revision 1.16
diff -u -p -r1.16 iyonix_machdep.c
--- sys/arch/iyonix/iyonix/iyonix_machdep.c 28 Dec 2009 03:22:20 -0000
1.16
+++ sys/arch/iyonix/iyonix/iyonix_machdep.c 25 May 2011 22:28:50 -0000
@@ -102,7 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: iyonix_machd
#include <ddb/db_extern.h>
#include <acorn32/include/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/iyonix/iyonix/iyonix_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/iyonix/iyonix/iyonix_pci.c,v
retrieving revision 1.6
diff -u -p -r1.6 iyonix_pci.c
--- sys/arch/iyonix/iyonix/iyonix_pci.c 6 Apr 2011 01:48:43 -0000 1.6
+++ sys/arch/iyonix/iyonix/iyonix_pci.c 25 May 2011 22:28:50 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: iyonix_pci.c
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <iyonix/iyonix/iyonixreg.h>
#include <iyonix/iyonix/iyonixvar.h>
Index: sys/arch/iyonix/iyonix/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/iyonix/iyonix/obio.c,v
retrieving revision 1.4
diff -u -p -r1.4 obio.c
--- sys/arch/iyonix/iyonix/obio.c 11 Dec 2005 12:17:51 -0000 1.4
+++ sys/arch/iyonix/iyonix/obio.c 25 May 2011 22:28:50 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.4
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
Index: sys/arch/iyonix/iyonix/obio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/iyonix/iyonix/obio_space.c,v
retrieving revision 1.4
diff -u -p -r1.4 obio_space.c
--- sys/arch/iyonix/iyonix/obio_space.c 7 Nov 2009 07:27:44 -0000 1.4
+++ sys/arch/iyonix/iyonix/obio_space.c 25 May 2011 22:28:50 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_space.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(obio);
Index: sys/arch/landisk/dev/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/dev/obio.c,v
retrieving revision 1.8
diff -u -p -r1.8 obio.c
--- sys/arch/landisk/dev/obio.c 7 Nov 2009 07:27:45 -0000 1.8
+++ sys/arch/landisk/dev/obio.c 25 May 2011 22:28:50 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.8
#include <sh3/pmap.h>
#include <sh3/pte.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
Index: sys/arch/landisk/dev/obiovar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/dev/obiovar.h,v
retrieving revision 1.3
diff -u -p -r1.3 obiovar.h
--- sys/arch/landisk/dev/obiovar.h 28 Apr 2008 20:23:26 -0000 1.3
+++ sys/arch/landisk/dev/obiovar.h 25 May 2011 22:28:50 -0000
@@ -69,7 +69,7 @@
#ifndef _LANDISK_OBIOVAR_H_
#define _LANDISK_OBIOVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/* obio tag */
extern struct _bus_space obio_bus_io;
Index: sys/arch/landisk/dev/wdc_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/dev/wdc_obio.c,v
retrieving revision 1.4
diff -u -p -r1.4 wdc_obio.c
--- sys/arch/landisk/dev/wdc_obio.c 28 Apr 2008 20:23:26 -0000 1.4
+++ sys/arch/landisk/dev/wdc_obio.c 25 May 2011 22:28:50 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ata/atavar.h>
cvs diff: cannot find sys/arch/landisk/include/bus.h
Index: sys/arch/landisk/landisk/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/landisk/bus_dma.c,v
retrieving revision 1.13
diff -u -p -r1.13 bus_dma.c
--- sys/arch/landisk/landisk/bus_dma.c 6 Nov 2010 11:46:01 -0000 1.13
+++ sys/arch/landisk/landisk/bus_dma.c 25 May 2011 22:28:50 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <machine/autoconf.h>
#define _LANDISK_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#if defined(DEBUG) && defined(BUSDMA_DEBUG)
int busdma_debug = 0;
Index: sys/arch/landisk/landisk/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/landisk/machdep.c,v
retrieving revision 1.14
diff -u -p -r1.14 machdep.c
--- sys/arch/landisk/landisk/machdep.c 2 Mar 2010 17:28:08 -0000 1.14
+++ sys/arch/landisk/landisk/machdep.c 25 May 2011 22:28:50 -0000
@@ -101,7 +101,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <sh3/cache_sh4.h>
#include <sh3/mmu_sh4.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/bootinfo.h>
#include <landisk/landisk/landiskreg.h>
Index: sys/arch/landisk/landisk/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/landisk/mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 mainbus.c
--- sys/arch/landisk/landisk/mainbus.c 28 Apr 2008 20:23:26 -0000 1.3
+++ sys/arch/landisk/landisk/mainbus.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <landisk/dev/obiovar.h>
Index: sys/arch/landisk/landisk/shpcic_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/landisk/landisk/shpcic_machdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 shpcic_machdep.c
--- sys/arch/landisk/landisk/shpcic_machdep.c 6 Apr 2011 01:32:06 -0000
1.3
+++ sys/arch/landisk/landisk/shpcic_machdep.c 25 May 2011 22:28:50 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: shpcic_machd
#include <dev/pci/pcidevs.h>
#include <dev/pci/pciconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pci_machdep.h>
Index: sys/arch/macppc/dev/adb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/adb.c,v
retrieving revision 1.29
diff -u -p -r1.29 adb.c
--- sys/arch/macppc/dev/adb.c 12 Dec 2009 14:44:09 -0000 1.29
+++ sys/arch/macppc/dev/adb.c 25 May 2011 22:28:50 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.29
#include <sys/signalvar.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pio.h>
Index: sys/arch/macppc/dev/am79c950.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/am79c950.c,v
retrieving revision 1.30
diff -u -p -r1.30 am79c950.c
--- sys/arch/macppc/dev/am79c950.c 20 Dec 2010 00:25:37 -0000 1.30
+++ sys/arch/macppc/dev/am79c950.c 25 May 2011 22:28:50 -0000
@@ -66,7 +66,7 @@ __KERNEL_RCSID(0, "$NetBSD: am79c950.c,v
#include <net/bpf.h>
#include <net/bpfdesc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <macppc/dev/am79c950reg.h>
#include <macppc/dev/if_mcvar.h>
Index: sys/arch/macppc/dev/battery.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/battery.c,v
retrieving revision 1.11
diff -u -p -r1.11 battery.c
--- sys/arch/macppc/dev/battery.c 23 Oct 2008 07:35:46 -0000 1.11
+++ sys/arch/macppc/dev/battery.c 25 May 2011 22:28:50 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: battery.c,v
#include <macppc/dev/pmuvar.h>
#include <macppc/dev/batteryvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include "opt_battery.h"
Index: sys/arch/macppc/dev/com_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/com_mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 com_mainbus.c
--- sys/arch/macppc/dev/com_mainbus.c 14 Mar 2008 15:09:10 -0000 1.3
+++ sys/arch/macppc/dev/com_mainbus.c 25 May 2011 22:28:50 -0000
@@ -41,7 +41,7 @@
#include <sys/device.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ofw/openfirm.h>
#include <dev/ic/comreg.h>
Index: sys/arch/macppc/dev/cuda.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/cuda.c,v
retrieving revision 1.15
diff -u -p -r1.15 cuda.c
--- sys/arch/macppc/dev/cuda.c 12 Dec 2009 14:44:09 -0000 1.15
+++ sys/arch/macppc/dev/cuda.c 25 May 2011 22:28:50 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.1
#include <sys/proc.h>
#include <sys/mutex.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pio.h>
#include <dev/clock_subr.h>
Index: sys/arch/macppc/dev/if_mc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/if_mc.c,v
retrieving revision 1.18
diff -u -p -r1.18 if_mc.c
--- sys/arch/macppc/dev/if_mc.c 20 Dec 2010 00:25:37 -0000 1.18
+++ sys/arch/macppc/dev/if_mc.c 25 May 2011 22:28:50 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.
#include <dev/ofw/openfirm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pio.h>
Index: sys/arch/macppc/dev/if_wi_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/if_wi_obio.c,v
retrieving revision 1.21
diff -u -p -r1.21 if_wi_obio.c
--- sys/arch/macppc/dev/if_wi_obio.c 16 Dec 2010 01:56:21 -0000 1.21
+++ sys/arch/macppc/dev/if_wi_obio.c 25 May 2011 22:28:50 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c
#endif
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/wi_ieee.h>
#include <dev/ic/wireg.h>
Index: sys/arch/macppc/dev/kauai.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/kauai.c,v
retrieving revision 1.27
diff -u -p -r1.27 kauai.c
--- sys/arch/macppc/dev/kauai.c 18 Nov 2009 22:51:07 -0000 1.27
+++ sys/arch/macppc/dev/kauai.c 25 May 2011 22:28:51 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <dev/ata/atareg.h>
Index: sys/arch/macppc/dev/ofb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/ofb.c,v
retrieving revision 1.65
diff -u -p -r1.65 ofb.c
--- sys/arch/macppc/dev/ofb.c 20 Dec 2010 00:25:37 -0000 1.65
+++ sys/arch/macppc/dev/ofb.c 25 May 2011 22:28:51 -0000
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: ofb.c,v 1.65
#include <dev/ofw/openfirm.h>
#include <dev/ofw/ofw_pci.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/grfioctl.h>
Index: sys/arch/macppc/dev/pmu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/pmu.c,v
retrieving revision 1.19
diff -u -p -r1.19 pmu.c
--- sys/arch/macppc/dev/pmu.c 9 Nov 2010 20:44:49 -0000 1.19
+++ sys/arch/macppc/dev/pmu.c 25 May 2011 22:28:51 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.19
#include <sys/proc.h>
#include <sys/kthread.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/autoconf.h>
#include <dev/clock_subr.h>
Index: sys/arch/macppc/dev/smartbat.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/smartbat.c,v
retrieving revision 1.4
diff -u -p -r1.4 smartbat.c
--- sys/arch/macppc/dev/smartbat.c 14 Sep 2010 02:45:25 -0000 1.4
+++ sys/arch/macppc/dev/smartbat.c 25 May 2011 22:28:51 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: smartbat.c,v
#include <macppc/dev/pmuvar.h>
#include <macppc/dev/batteryvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "opt_battery.h"
#ifdef SMARTBAT_DEBUG
Index: sys/arch/macppc/dev/wdc_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/dev/wdc_obio.c,v
retrieving revision 1.52
diff -u -p -r1.52 wdc_obio.c
--- sys/arch/macppc/dev/wdc_obio.c 18 Nov 2009 22:51:07 -0000 1.52
+++ sys/arch/macppc/dev/wdc_obio.c 25 May 2011 22:28:51 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pio.h>
Index: sys/arch/macppc/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/include/autoconf.h,v
retrieving revision 1.15
diff -u -p -r1.15 autoconf.h
--- sys/arch/macppc/include/autoconf.h 26 Nov 2007 19:58:30 -0000 1.15
+++ sys/arch/macppc/include/autoconf.h 25 May 2011 22:28:51 -0000
@@ -34,7 +34,7 @@
#ifndef _MACHINE_AUTOCONF_H_
#define _MACHINE_AUTOCONF_H_
-#include <machine/bus.h> /* for bus_space_tag_t */
+#include <sys/bus.h> /* for bus_space_tag_t */
struct confargs {
const char *ca_name;
cvs diff: cannot find sys/arch/macppc/include/bus.h
Index: sys/arch/macppc/macppc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/macppc/machdep.c,v
retrieving revision 1.155
diff -u -p -r1.155 machdep.c
--- sys/arch/macppc/macppc/machdep.c 20 Dec 2010 00:25:37 -0000 1.155
+++ sys/arch/macppc/macppc/machdep.c 25 May 2011 22:28:51 -0000
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/autoconf.h>
#include <machine/powerpc.h>
#include <machine/trap.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/fpu.h>
#include <powerpc/oea/bat.h>
#include <powerpc/spr.h>
Index: sys/arch/macppc/macppc/rbus_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/macppc/rbus_machdep.c,v
retrieving revision 1.17
diff -u -p -r1.17 rbus_machdep.c
--- sys/arch/macppc/macppc/rbus_machdep.c 20 Dec 2010 00:25:37 -0000
1.17
+++ sys/arch/macppc/macppc/rbus_machdep.c 25 May 2011 22:28:51 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep
#include <sys/systm.h>
#include <powerpc/oea/bat.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
Index: sys/arch/macppc/pci/agp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/pci/agp_machdep.c,v
retrieving revision 1.2
diff -u -p -r1.2 agp_machdep.c
--- sys/arch/macppc/pci/agp_machdep.c 29 Apr 2008 06:53:02 -0000 1.2
+++ sys/arch/macppc/pci/agp_machdep.c 25 May 2011 22:28:51 -0000
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_machdep.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/macppc/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/macppc/pci/pci_machdep.c,v
retrieving revision 1.38
diff -u -p -r1.38 pci_machdep.c
--- sys/arch/macppc/pci/pci_machdep.c 20 Dec 2010 00:25:38 -0000 1.38
+++ sys/arch/macppc/pci/pci_machdep.c 25 May 2011 22:28:51 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/device.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/mips/adm5120/adm5120_cfio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_cfio.c,v
retrieving revision 1.1
diff -u -p -r1.1 adm5120_cfio.c
--- sys/arch/mips/adm5120/adm5120_cfio.c 20 Mar 2007 08:52:04 -0000
1.1
+++ sys/arch/mips/adm5120/adm5120_cfio.c 25 May 2011 22:28:51 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_cfio
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: sys/arch/mips/adm5120/adm5120_extio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_extio.c,v
retrieving revision 1.4
diff -u -p -r1.4 adm5120_extio.c
--- sys/arch/mips/adm5120/adm5120_extio.c 20 Feb 2011 07:48:35 -0000
1.4
+++ sys/arch/mips/adm5120/adm5120_extio.c 25 May 2011 22:28:51 -0000
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_exti
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: sys/arch/mips/adm5120/adm5120_extio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_extio_space.c,v
retrieving revision 1.3
diff -u -p -r1.3 adm5120_extio_space.c
--- sys/arch/mips/adm5120/adm5120_extio_space.c 19 Oct 2009 23:19:38 -0000
1.3
+++ sys/arch/mips/adm5120/adm5120_extio_space.c 25 May 2011 22:28:51 -0000
@@ -64,7 +64,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_exti
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120_extiovar.h>
Index: sys/arch/mips/adm5120/adm5120_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_intr.c,v
retrieving revision 1.4
diff -u -p -r1.4 adm5120_intr.c
--- sys/arch/mips/adm5120/adm5120_intr.c 20 Feb 2011 07:48:35 -0000
1.4
+++ sys/arch/mips/adm5120/adm5120_intr.c 25 May 2011 22:28:51 -0000
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_intr
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: sys/arch/mips/adm5120/adm5120_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_obio.c,v
retrieving revision 1.3
diff -u -p -r1.3 adm5120_obio.c
--- sys/arch/mips/adm5120/adm5120_obio.c 20 Feb 2011 07:48:35 -0000
1.3
+++ sys/arch/mips/adm5120/adm5120_obio.c 25 May 2011 22:28:51 -0000
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_obio
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: sys/arch/mips/adm5120/adm5120_obio_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_obio_dma.c,v
retrieving revision 1.3
diff -u -p -r1.3 adm5120_obio_dma.c
--- sys/arch/mips/adm5120/adm5120_obio_dma.c 20 Feb 2011 07:48:35 -0000
1.3
+++ sys/arch/mips/adm5120/adm5120_obio_dma.c 25 May 2011 22:28:51 -0000
@@ -69,7 +69,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_obio
#include <sys/param.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120_obiovar.h>
Index: sys/arch/mips/adm5120/adm5120_obio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_obio_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 adm5120_obio_space.c
--- sys/arch/mips/adm5120/adm5120_obio_space.c 28 Apr 2008 20:23:27 -0000
1.2
+++ sys/arch/mips/adm5120/adm5120_obio_space.c 25 May 2011 22:28:51 -0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_obio
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120_obiovar.h>
#define CHIP obio
Index: sys/arch/mips/adm5120/adm5120_pciio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_pciio_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 adm5120_pciio_space.c
--- sys/arch/mips/adm5120/adm5120_pciio_space.c 28 Apr 2008 20:23:27 -0000
1.2
+++ sys/arch/mips/adm5120/adm5120_pciio_space.c 25 May 2011 22:28:51 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_pcii
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120_pcivar.h>
Index: sys/arch/mips/adm5120/adm5120_pcimem_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/adm5120_pcimem_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 adm5120_pcimem_space.c
--- sys/arch/mips/adm5120/adm5120_pcimem_space.c 28 Apr 2008 20:23:27
-0000 1.2
+++ sys/arch/mips/adm5120/adm5120_pcimem_space.c 25 May 2011 22:28:51
-0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: adm5120_pcim
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120reg.h>
#include <mips/adm5120/include/adm5120_pcivar.h>
Index: sys/arch/mips/adm5120/dev/admgpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/admgpio.c,v
retrieving revision 1.3
diff -u -p -r1.3 admgpio.c
--- sys/arch/mips/adm5120/dev/admgpio.c 20 Feb 2011 07:48:35 -0000 1.3
+++ sys/arch/mips/adm5120/dev/admgpio.c 25 May 2011 22:28:51 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: admgpio.c,v
#include <sys/gpio.h>
#include <sys/kernel.h> /* for hz */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/gpio/gpiovar.h>
Index: sys/arch/mips/adm5120/dev/admpci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/admpci.c,v
retrieving revision 1.6
diff -u -p -r1.6 admpci.c
--- sys/arch/mips/adm5120/dev/admpci.c 17 May 2011 17:34:50 -0000 1.6
+++ sys/arch/mips/adm5120/dev/admpci.c 25 May 2011 22:28:51 -0000
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: admpci.c,v 1
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/pte.h>
Index: sys/arch/mips/adm5120/dev/admwdog.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/admwdog.c,v
retrieving revision 1.2
diff -u -p -r1.2 admwdog.c
--- sys/arch/mips/adm5120/dev/admwdog.c 19 Oct 2009 23:19:38 -0000 1.2
+++ sys/arch/mips/adm5120/dev/admwdog.c 25 May 2011 22:28:51 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: admwdog.c,v
#include <sys/wdog.h>
#include <sys/kernel.h> /* for hz */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
Index: sys/arch/mips/adm5120/dev/ahci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/ahci.c,v
retrieving revision 1.6
diff -u -p -r1.6 ahci.c
--- sys/arch/mips/adm5120/dev/ahci.c 4 Apr 2011 19:58:56 -0000 1.6
+++ sys/arch/mips/adm5120/dev/ahci.c 25 May 2011 22:28:51 -0000
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: ahci.c,v 1.6
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <dev/usb/usb.h>
Index: sys/arch/mips/adm5120/dev/if_admsw.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/if_admsw.c,v
retrieving revision 1.8
diff -u -p -r1.8 if_admsw.c
--- sys/arch/mips/adm5120/dev/if_admsw.c 5 Apr 2010 07:19:30 -0000
1.8
+++ sys/arch/mips/adm5120/dev/if_admsw.c 25 May 2011 22:28:51 -0000
@@ -102,7 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_admsw.c,v
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/endian.h>
Index: sys/arch/mips/adm5120/dev/if_admswvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/if_admswvar.h,v
retrieving revision 1.2
diff -u -p -r1.2 if_admswvar.h
--- sys/arch/mips/adm5120/dev/if_admswvar.h 19 Jan 2010 22:06:21 -0000
1.2
+++ sys/arch/mips/adm5120/dev/if_admswvar.h 25 May 2011 22:28:51 -0000
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_admswvar.
#include <net/if_media.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/endian.h>
Index: sys/arch/mips/adm5120/dev/uart.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/uart.c,v
retrieving revision 1.7
diff -u -p -r1.7 uart.c
--- sys/arch/mips/adm5120/dev/uart.c 24 Apr 2011 16:26:56 -0000 1.7
+++ sys/arch/mips/adm5120/dev/uart.c 25 May 2011 22:28:51 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: uart.c,v 1.7
#include <sys/vnode.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/adm5120/include/adm5120var.h>
#include <mips/adm5120/include/adm5120_obiovar.h>
Index: sys/arch/mips/adm5120/dev/wdc_extio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/dev/wdc_extio.c,v
retrieving revision 1.3
diff -u -p -r1.3 wdc_extio.c
--- sys/arch/mips/adm5120/dev/wdc_extio.c 19 Oct 2009 23:19:38 -0000
1.3
+++ sys/arch/mips/adm5120/dev/wdc_extio.c 25 May 2011 22:28:51 -0000
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_extio.c,
#include <sys/kernel.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/cpu.h>
Index: sys/arch/mips/adm5120/include/adm5120var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/adm5120/include/adm5120var.h,v
retrieving revision 1.2
diff -u -p -r1.2 adm5120var.h
--- sys/arch/mips/adm5120/include/adm5120var.h 28 Apr 2008 20:23:27 -0000
1.2
+++ sys/arch/mips/adm5120/include/adm5120var.h 25 May 2011 22:28:51 -0000
@@ -62,7 +62,7 @@
#ifndef _ADM5120VAR_H_
#define _ADM5120VAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#if 0
#include <sys/socket.h>
Index: sys/arch/mips/alchemy/au1000.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au1000.c,v
retrieving revision 1.8
diff -u -p -r1.8 au1000.c
--- sys/arch/mips/alchemy/au1000.c 20 Feb 2011 07:48:36 -0000 1.8
+++ sys/arch/mips/alchemy/au1000.c 25 May 2011 22:28:51 -0000
@@ -100,7 +100,7 @@
__KERNEL_RCSID(0, "$NetBSD");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/au1100.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au1100.c,v
retrieving revision 1.8
diff -u -p -r1.8 au1100.c
--- sys/arch/mips/alchemy/au1100.c 20 Feb 2011 07:48:36 -0000 1.8
+++ sys/arch/mips/alchemy/au1100.c 25 May 2011 22:28:51 -0000
@@ -100,7 +100,7 @@
__KERNEL_RCSID(0, "$NetBSD: au1100.c,v 1.8 2011/02/20 07:48:36 matt Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/au1500.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au1500.c,v
retrieving revision 1.9
diff -u -p -r1.9 au1500.c
--- sys/arch/mips/alchemy/au1500.c 20 Feb 2011 07:48:36 -0000 1.9
+++ sys/arch/mips/alchemy/au1500.c 25 May 2011 22:28:51 -0000
@@ -100,7 +100,7 @@
__KERNEL_RCSID(0, "$NetBSD: au1500.c,v 1.9 2011/02/20 07:48:36 matt Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/au1550.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au1550.c,v
retrieving revision 1.12
diff -u -p -r1.12 au1550.c
--- sys/arch/mips/alchemy/au1550.c 20 Feb 2011 07:48:36 -0000 1.12
+++ sys/arch/mips/alchemy/au1550.c 25 May 2011 22:28:51 -0000
@@ -100,7 +100,7 @@
__KERNEL_RCSID(0, "$NetBSD: au1550.c,v 1.12 2011/02/20 07:48:36 matt Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/au_chipdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_chipdep.c,v
retrieving revision 1.2
diff -u -p -r1.2 au_chipdep.c
--- sys/arch/mips/alchemy/au_chipdep.c 20 Feb 2011 07:48:36 -0000 1.2
+++ sys/arch/mips/alchemy/au_chipdep.c 25 May 2011 22:28:51 -0000
@@ -35,7 +35,7 @@
__KERNEL_RCSID(0, "$NetBSD: au_chipdep.c,v 1.2 2011/02/20 07:48:36 matt Exp
$");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/au_cpureg_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_cpureg_mem.c,v
retrieving revision 1.5
diff -u -p -r1.5 au_cpureg_mem.c
--- sys/arch/mips/alchemy/au_cpureg_mem.c 28 Apr 2008 20:23:27 -0000
1.5
+++ sys/arch/mips/alchemy/au_cpureg_mem.c 25 May 2011 22:28:51 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_cpureg_me
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/alchemy/include/auvar.h>
#include <mips/alchemy/include/aubusvar.h>
Index: sys/arch/mips/alchemy/au_himem_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_himem_space.c,v
retrieving revision 1.11
diff -u -p -r1.11 au_himem_space.c
--- sys/arch/mips/alchemy/au_himem_space.c 7 Jun 2010 13:33:33 -0000
1.11
+++ sys/arch/mips/alchemy/au_himem_space.c 25 May 2011 22:28:51 -0000
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_himem_spa
#include <sys/endian.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/au_himem_space.h>
Index: sys/arch/mips/alchemy/au_icu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_icu.c,v
retrieving revision 1.26
diff -u -p -r1.26 au_icu.c
--- sys/arch/mips/alchemy/au_icu.c 20 Feb 2011 07:48:36 -0000 1.26
+++ sys/arch/mips/alchemy/au_icu.c 25 May 2011 22:28:51 -0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_icu.c,v 1
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: sys/arch/mips/alchemy/au_timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_timer.c,v
retrieving revision 1.10
diff -u -p -r1.10 au_timer.c
--- sys/arch/mips/alchemy/au_timer.c 20 Feb 2011 07:48:36 -0000 1.10
+++ sys/arch/mips/alchemy/au_timer.c 25 May 2011 22:28:51 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_timer.c,v
#include <sys/lwp.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/locore.h>
#include <mips/alchemy/include/aureg.h>
Index: sys/arch/mips/alchemy/au_wired_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/au_wired_space.c,v
retrieving revision 1.6
diff -u -p -r1.6 au_wired_space.c
--- sys/arch/mips/alchemy/au_wired_space.c 28 Apr 2008 20:23:27 -0000
1.6
+++ sys/arch/mips/alchemy/au_wired_space.c 25 May 2011 22:28:51 -0000
@@ -75,7 +75,7 @@ __KERNEL_RCSID(0, "$NetBSD: au_wired_spa
#include <sys/malloc.h>
#include <sys/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <machine/wired_map.h>
#include <mips/alchemy/include/au_wired_space.h>
Index: sys/arch/mips/alchemy/aubus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/aubus.c,v
retrieving revision 1.21
diff -u -p -r1.21 aubus.c
--- sys/arch/mips/alchemy/aubus.c 20 Feb 2011 07:48:36 -0000 1.21
+++ sys/arch/mips/alchemy/aubus.c 25 May 2011 22:28:51 -0000
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: aubus.c,v 1.
#include <sys/malloc.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/dev/augpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/augpio.c,v
retrieving revision 1.5
diff -u -p -r1.5 augpio.c
--- sys/arch/mips/alchemy/dev/augpio.c 24 Mar 2006 18:22:42 -0000 1.5
+++ sys/arch/mips/alchemy/dev/augpio.c 25 May 2011 22:28:51 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: augpio.c,v 1
#include <dev/gpio/gpiovar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/include/aubusvar.h>
Index: sys/arch/mips/alchemy/dev/aupci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/aupci.c,v
retrieving revision 1.10
diff -u -p -r1.10 aupci.c
--- sys/arch/mips/alchemy/dev/aupci.c 17 May 2011 17:34:51 -0000 1.10
+++ sys/arch/mips/alchemy/dev/aupci.c 25 May 2011 22:28:51 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: aupci.c,v 1.
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/pte.h>
Index: sys/arch/mips/alchemy/dev/aupsc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/aupsc.c,v
retrieving revision 1.5
diff -u -p -r1.5 aupsc.c
--- sys/arch/mips/alchemy/dev/aupsc.c 2 Oct 2006 07:32:16 -0000 1.5
+++ sys/arch/mips/alchemy/dev/aupsc.c 25 May 2011 22:28:51 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: aupsc.c,v 1.
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/include/aubusvar.h>
Index: sys/arch/mips/alchemy/dev/aurtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/aurtc.c,v
retrieving revision 1.12
diff -u -p -r1.12 aurtc.c
--- sys/arch/mips/alchemy/dev/aurtc.c 12 Dec 2009 14:44:09 -0000 1.12
+++ sys/arch/mips/alchemy/dev/aurtc.c 25 May 2011 22:28:51 -0000
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: aurtc.c,v 1.
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/dev/ausmbus_psc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/ausmbus_psc.c,v
retrieving revision 1.9
diff -u -p -r1.9 ausmbus_psc.c
--- sys/arch/mips/alchemy/dev/ausmbus_psc.c 20 Apr 2009 12:11:50 -0000
1.9
+++ sys/arch/mips/alchemy/dev/ausmbus_psc.c 25 May 2011 22:28:51 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ausmbus_psc.
#include <sys/device.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/dev/aupscreg.h>
Index: sys/arch/mips/alchemy/dev/auspi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/auspi.c,v
retrieving revision 1.3
diff -u -p -r1.3 auspi.c
--- sys/arch/mips/alchemy/dev/auspi.c 28 Feb 2007 04:21:53 -0000 1.3
+++ sys/arch/mips/alchemy/dev/auspi.c 25 May 2011 22:28:51 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.
#include <sys/errno.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/alchemy/include/aubusvar.h>
Index: sys/arch/mips/alchemy/dev/com_aubus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/com_aubus.c,v
retrieving revision 1.5
diff -u -p -r1.5 com_aubus.c
--- sys/arch/mips/alchemy/dev/com_aubus.c 14 Mar 2008 15:09:10 -0000
1.5
+++ sys/arch/mips/alchemy/dev/com_aubus.c 25 May 2011 22:28:51 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_aubus.c,
#include <sys/systm.h>
#include <sys/tty.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comvar.h>
#include <mips/alchemy/include/aureg.h>
Index: sys/arch/mips/alchemy/dev/if_aumac.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/if_aumac.c,v
retrieving revision 1.29
diff -u -p -r1.29 if_aumac.c
--- sys/arch/mips/alchemy/dev/if_aumac.c 12 Nov 2010 13:40:10 -0000
1.29
+++ sys/arch/mips/alchemy/dev/if_aumac.c 25 May 2011 22:28:51 -0000
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_aumac.c,v
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/endian.h>
Index: sys/arch/mips/alchemy/dev/ohci_aubus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/dev/ohci_aubus.c,v
retrieving revision 1.14
diff -u -p -r1.14 ohci_aubus.c
--- sys/arch/mips/alchemy/dev/ohci_aubus.c 28 Apr 2008 20:23:27 -0000
1.14
+++ sys/arch/mips/alchemy/dev/ohci_aubus.c 25 May 2011 22:28:51 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_aubus.c
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/include/auvar.h>
Index: sys/arch/mips/alchemy/include/aubusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/alchemy/include/aubusvar.h,v
retrieving revision 1.4
diff -u -p -r1.4 aubusvar.h
--- sys/arch/mips/alchemy/include/aubusvar.h 13 Jul 2006 22:56:01 -0000
1.4
+++ sys/arch/mips/alchemy/include/aubusvar.h 25 May 2011 22:28:51 -0000
@@ -3,7 +3,7 @@
#ifndef _MIPS_ALCHEMY_DEV_AUBUSVAR_H_
#define _MIPS_ALCHEMY_DEV_AUBUSVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Machine-dependent structures for autoconfiguration
Index: sys/arch/mips/atheros/ar5312_board.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/ar5312_board.c,v
retrieving revision 1.2
diff -u -p -r1.2 ar5312_board.c
--- sys/arch/mips/atheros/ar5312_board.c 6 Jul 2009 00:43:22 -0000
1.2
+++ sys/arch/mips/atheros/ar5312_board.c 25 May 2011 22:28:51 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5312_board
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/atheros/include/ar5312reg.h>
#include <mips/atheros/include/ar531xvar.h>
Index: sys/arch/mips/atheros/ar5312_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/ar5312_intr.c,v
retrieving revision 1.7
diff -u -p -r1.7 ar5312_intr.c
--- sys/arch/mips/atheros/ar5312_intr.c 20 Feb 2011 07:48:36 -0000 1.7
+++ sys/arch/mips/atheros/ar5312_intr.c 25 May 2011 22:28:51 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5312_intr.
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: sys/arch/mips/atheros/ar5315_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/ar5315_intr.c,v
retrieving revision 1.6
diff -u -p -r1.6 ar5315_intr.c
--- sys/arch/mips/atheros/ar5315_intr.c 20 Feb 2011 07:48:36 -0000 1.6
+++ sys/arch/mips/atheros/ar5315_intr.c 25 May 2011 22:28:51 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: ar5315_intr.
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: sys/arch/mips/atheros/arbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/arbus.c,v
retrieving revision 1.12
diff -u -p -r1.12 arbus.c
--- sys/arch/mips/atheros/arbus.c 20 Feb 2011 07:48:36 -0000 1.12
+++ sys/arch/mips/atheros/arbus.c 25 May 2011 22:28:51 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: arbus.c,v 1.
#include <sys/malloc.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/atheros/include/ar5312reg.h>
#include <mips/atheros/include/ar531xvar.h>
#include <mips/atheros/include/arbusvar.h>
Index: sys/arch/mips/atheros/dev/argpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/dev/argpio.c,v
retrieving revision 1.3
diff -u -p -r1.3 argpio.c
--- sys/arch/mips/atheros/dev/argpio.c 4 Sep 2006 05:17:26 -0000 1.3
+++ sys/arch/mips/atheros/dev/argpio.c 25 May 2011 22:28:51 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: argpio.c,v 1
#include <sys/device.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/atheros/include/arbusvar.h>
Index: sys/arch/mips/atheros/dev/arspi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/dev/arspi.c,v
retrieving revision 1.5
diff -u -p -r1.5 arspi.c
--- sys/arch/mips/atheros/dev/arspi.c 28 Feb 2007 04:21:53 -0000 1.5
+++ sys/arch/mips/atheros/dev/arspi.c 25 May 2011 22:28:51 -0000
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <mips/atheros/include/ar5315reg.h>
Index: sys/arch/mips/atheros/dev/athflash.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/dev/athflash.c,v
retrieving revision 1.3
diff -u -p -r1.3 athflash.c
--- sys/arch/mips/atheros/dev/athflash.c 11 Jun 2008 23:55:20 -0000
1.3
+++ sys/arch/mips/atheros/dev/athflash.c 25 May 2011 22:28:52 -0000
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: athflash.c,v
#include <sys/proc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/atheros/include/arbusvar.h>
Index: sys/arch/mips/atheros/dev/com_arbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/dev/com_arbus.c,v
retrieving revision 1.8
diff -u -p -r1.8 com_arbus.c
--- sys/arch/mips/atheros/dev/com_arbus.c 9 Feb 2011 22:01:44 -0000
1.8
+++ sys/arch/mips/atheros/dev/com_arbus.c 25 May 2011 22:28:52 -0000
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_arbus.c,
#include <sys/ttydefaults.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cons.h>
#include <dev/ic/comreg.h>
Index: sys/arch/mips/atheros/dev/if_ae.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/dev/if_ae.c,v
retrieving revision 1.19
diff -u -p -r1.19 if_ae.c
--- sys/arch/mips/atheros/dev/if_ae.c 5 Apr 2010 07:19:31 -0000 1.19
+++ sys/arch/mips/atheros/dev/if_ae.c 25 May 2011 22:28:52 -0000
@@ -123,7 +123,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ae.c,v 1.
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/mii/mii.h>
Index: sys/arch/mips/atheros/dev/if_ath_arbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/dev/if_ath_arbus.c,v
retrieving revision 1.18
diff -u -p -r1.18 if_ath_arbus.c
--- sys/arch/mips/atheros/dev/if_ath_arbus.c 24 Feb 2010 22:37:55 -0000
1.18
+++ sys/arch/mips/atheros/dev/if_ath_arbus.c 25 May 2011 22:28:52 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ath_arbus
#include <sys/kernel.h>
#include <sys/errno.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <net/if.h>
Index: sys/arch/mips/atheros/include/ar531xvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/include/ar531xvar.h,v
retrieving revision 1.6
diff -u -p -r1.6 ar531xvar.h
--- sys/arch/mips/atheros/include/ar531xvar.h 20 Feb 2011 07:48:36 -0000
1.6
+++ sys/arch/mips/atheros/include/ar531xvar.h 25 May 2011 22:28:52 -0000
@@ -44,7 +44,7 @@
#define _MIPS_ATHEROS_AR531XVAR_H_
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct ar531x_device {
const char *name;
Index: sys/arch/mips/atheros/include/arbusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/atheros/include/arbusvar.h,v
retrieving revision 1.2
diff -u -p -r1.2 arbusvar.h
--- sys/arch/mips/atheros/include/arbusvar.h 4 Sep 2006 05:17:26 -0000
1.2
+++ sys/arch/mips/atheros/include/arbusvar.h 25 May 2011 22:28:52 -0000
@@ -43,7 +43,7 @@
#ifndef _MIPS_ATHEROS_ARBUSVAR_H_
#define _MIPS_ATHEROS_ARBUSVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arbus_attach_args {
const char *aa_name;
Index: sys/arch/mips/bonito/bonito_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/bonito/bonito_pci.c,v
retrieving revision 1.7
diff -u -p -r1.7 bonito_pci.c
--- sys/arch/mips/bonito/bonito_pci.c 9 Aug 2009 04:09:55 -0000 1.7
+++ sys/arch/mips/bonito/bonito_pci.c 25 May 2011 22:28:52 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: bonito_pci.c
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/locore.h>
cvs diff: cannot find sys/arch/mips/include/bus_dma.h
cvs diff: cannot find sys/arch/mips/include/bus_space.h
Index: sys/arch/mips/mips/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/bus_dma.c,v
retrieving revision 1.25
diff -u -p -r1.25 bus_dma.c
--- sys/arch/mips/mips/bus_dma.c 20 Feb 2011 07:45:47 -0000 1.25
+++ sys/arch/mips/mips/bus_dma.c 25 May 2011 22:28:52 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#endif
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/locore.h>
Index: sys/arch/mips/rmi/rmixl_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_com.c,v
retrieving revision 1.4
diff -u -p -r1.4 rmixl_com.c
--- sys/arch/mips/rmi/rmixl_com.c 11 May 2011 00:38:03 -0000 1.4
+++ sys/arch/mips/rmi/rmixl_com.c 25 May 2011 22:28:52 -0000
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_com.c,
#include <sys/ttydefaults.h>
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cons.h>
#include <dev/ic/comreg.h>
Index: sys/arch/mips/rmi/rmixl_cpunode.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_cpunode.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_cpunode.c
--- sys/arch/mips/rmi/rmixl_cpunode.c 20 Feb 2011 07:48:37 -0000 1.2
+++ sys/arch/mips/rmi/rmixl_cpunode.c 25 May 2011 22:28:52 -0000
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_cpunod
#include <mips/rmi/rmixlvar.h>
#include <mips/rmi/rmixl_cpunodevar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "locators.h"
static int cpunode_rmixl_match(device_t, cfdata_t, void *);
Index: sys/arch/mips/rmi/rmixl_ehci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_ehci.c,v
retrieving revision 1.3
diff -u -p -r1.3 rmixl_ehci.c
--- sys/arch/mips/rmi/rmixl_ehci.c 29 Apr 2011 21:54:14 -0000 1.3
+++ sys/arch/mips/rmi/rmixl_ehci.c 25 May 2011 22:28:52 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_ehci.c
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_gpio.c,v
retrieving revision 1.1
diff -u -p -r1.1 rmixl_gpio.c
--- sys/arch/mips/rmi/rmixl_gpio.c 18 Mar 2011 01:03:10 -0000 1.1
+++ sys/arch/mips/rmi/rmixl_gpio.c 25 May 2011 22:28:52 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_gpio.c
#include <mips/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_intr.c,v
retrieving revision 1.5
diff -u -p -r1.5 rmixl_intr.c
--- sys/arch/mips/rmi/rmixl_intr.c 29 Apr 2011 21:58:27 -0000 1.5
+++ sys/arch/mips/rmi/rmixl_intr.c 25 May 2011 22:28:52 -0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_intr.c
#include <sys/mutex.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/cpu.h>
Index: sys/arch/mips/rmi/rmixl_iobus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_iobus.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_iobus.c
--- sys/arch/mips/rmi/rmixl_iobus.c 18 Mar 2011 01:21:34 -0000 1.2
+++ sys/arch/mips/rmi/rmixl_iobus.c 25 May 2011 22:28:52 -0000
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_iobus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_iobus_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_iobus_space.c
--- sys/arch/mips/rmi/rmixl_iobus_space.c 18 Mar 2011 07:12:29 -0000
1.2
+++ sys/arch/mips/rmi/rmixl_iobus_space.c 25 May 2011 22:28:52 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_iobus_
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_iobusvar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 rmixl_mainbus.c
--- sys/arch/mips/rmi/rmixl_mainbus.c 20 Feb 2011 07:48:37 -0000 1.3
+++ sys/arch/mips/rmi/rmixl_mainbus.c 25 May 2011 22:28:52 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_mainbu
#include <sys/device.h>
#include <evbmips/rmixl/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "locators.h"
static int mainbusmatch(device_t, cfdata_t, void *);
Index: sys/arch/mips/rmi/rmixl_nand.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_nand.c,v
retrieving revision 1.5
diff -u -p -r1.5 rmixl_nand.c
--- sys/arch/mips/rmi/rmixl_nand.c 27 Mar 2011 13:36:50 -0000 1.5
+++ sys/arch/mips/rmi/rmixl_nand.c 25 May 2011 22:28:52 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_nand.c
#include <sys/device.h>
#include <sys/endian.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_obio.c,v
retrieving revision 1.3
diff -u -p -r1.3 rmixl_obio.c
--- sys/arch/mips/rmi/rmixl_obio.c 20 Feb 2011 07:48:37 -0000 1.3
+++ sys/arch/mips/rmi/rmixl_obio.c 25 May 2011 22:28:52 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_obio.c
#include <sys/malloc.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/int_fmtio.h>
Index: sys/arch/mips/rmi/rmixl_obio_eb_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_obio_eb_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_obio_eb_space.c
--- sys/arch/mips/rmi/rmixl_obio_eb_space.c 20 Feb 2011 07:48:37 -0000
1.2
+++ sys/arch/mips/rmi/rmixl_obio_eb_space.c 25 May 2011 22:28:52 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_obio_e
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/mips/rmi/rmixl_obio_el_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/rmi/rmixl_obio_el_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 rmixl_obio_el_space.c
--- sys/arch/mips/rmi/rmixl_obio_el_space.c 20 Feb 2011 07:48:37 -0000
1.2
+++ sys/arch/mips/rmi/rmixl_obio_el_space.c 25 May 2011 22:28:52 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: rmixl_obio_e
#include <sys/types.h>
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/rmi/rmixl_obiovar.h>
#include <mips/rmi/rmixlreg.h>
#include <mips/rmi/rmixlvar.h>
Index: sys/arch/evbarm/lubbock/lubbock_var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/lubbock_var.h,v
retrieving revision 1.2
diff -u -p -r1.2 lubbock_var.h
--- sys/arch/evbarm/lubbock/lubbock_var.h 29 May 2009 14:15:44 -0000
1.2
+++ sys/arch/evbarm/lubbock/lubbock_var.h 25 May 2011 22:28:47 -0000
@@ -35,7 +35,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/lubbock/lubbock_reg.h>
Index: sys/arch/evbarm/lubbock/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/obio.c,v
retrieving revision 1.9
diff -u -p -r1.9 obio.c
--- sys/arch/evbarm/lubbock/obio.c 29 May 2009 14:15:44 -0000 1.9
+++ sys/arch/evbarm/lubbock/obio.c 25 May 2011 22:28:47 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/evbarm/lubbock/sacc_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/sacc_obio.c,v
retrieving revision 1.11
diff -u -p -r1.11 sacc_obio.c
--- sys/arch/evbarm/lubbock/sacc_obio.c 13 Mar 2010 10:55:09 -0000 1.11
+++ sys/arch/evbarm/lubbock/sacc_obio.c 25 May 2011 22:28:47 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: sacc_obio.c,
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/sa11x0/sa1111_reg.h>
#include <arm/sa11x0/sa1111_var.h>
Index: sys/arch/evbarm/lubbock/sm_obio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/sm_obio_space.c,v
retrieving revision 1.3
diff -u -p -r1.3 sm_obio_space.c
--- sys/arch/evbarm/lubbock/sm_obio_space.c 11 Dec 2005 12:17:09 -0000
1.3
+++ sys/arch/evbarm/lubbock/sm_obio_space.c 25 May 2011 22:28:47 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: sm_obio_spac
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
/* Proto types for all the bus_space structure functions */
Index: sys/arch/evbarm/mpcsa/mpcsa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/mpcsa/mpcsa_machdep.c,v
retrieving revision 1.4
diff -u -p -r1.4 mpcsa_machdep.c
--- sys/arch/evbarm/mpcsa/mpcsa_machdep.c 22 Jan 2010 08:56:05 -0000
1.4
+++ sys/arch/evbarm/mpcsa/mpcsa_machdep.c 25 May 2011 22:28:47 -0000
@@ -104,7 +104,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcsa_machde
#define DRAM_BLOCKS 1
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/netwalker/netwalker_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/netwalker/netwalker_machdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 netwalker_machdep.c
--- sys/arch/evbarm/netwalker/netwalker_machdep.c 9 Dec 2010 05:00:14
-0000 1.3
+++ sys/arch/evbarm/netwalker/netwalker_machdep.c 25 May 2011 22:28:47
-0000
@@ -139,7 +139,7 @@ __KERNEL_RCSID(0, "$NetBSD: netwalker_ma
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/npwr_fc/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/npwr_fc/com_obio.c,v
retrieving revision 1.4
diff -u -p -r1.4 com_obio.c
--- sys/arch/evbarm/npwr_fc/com_obio.c 28 Apr 2008 20:23:17 -0000 1.4
+++ sys/arch/evbarm/npwr_fc/com_obio.c 25 May 2011 22:28:47 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c,v
retrieving revision 1.14
diff -u -p -r1.14 npwr_fc_machdep.c
--- sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c 26 Dec 2009 16:01:24 -0000
1.14
+++ sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c 25 May 2011 22:28:47 -0000
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: npwr_fc_mach
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/npwr_fc/npwr_fc_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/npwr_fc/npwr_fc_pci.c,v
retrieving revision 1.2
diff -u -p -r1.2 npwr_fc_pci.c
--- sys/arch/evbarm/npwr_fc/npwr_fc_pci.c 4 Apr 2011 20:37:49 -0000
1.2
+++ sys/arch/evbarm/npwr_fc/npwr_fc_pci.c 25 May 2011 22:28:47 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: npwr_fc_pci.
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/nslu2/nslu2_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/nslu2/nslu2_machdep.c,v
retrieving revision 1.17
diff -u -p -r1.17 nslu2_machdep.c
--- sys/arch/evbarm/nslu2/nslu2_machdep.c 26 Dec 2009 16:01:25 -0000
1.17
+++ sys/arch/evbarm/nslu2/nslu2_machdep.c 25 May 2011 22:28:47 -0000
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_machde
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/osk5912/if_sm_emifs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/osk5912/if_sm_emifs.c,v
retrieving revision 1.3
diff -u -p -r1.3 if_sm_emifs.c
--- sys/arch/evbarm/osk5912/if_sm_emifs.c 17 Oct 2007 19:54:13 -0000
1.3
+++ sys/arch/evbarm/osk5912/if_sm_emifs.c 25 May 2011 22:28:47 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_emifs.
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: sys/arch/evbarm/osk5912/osk5912_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/osk5912/osk5912_machdep.c,v
retrieving revision 1.9
diff -u -p -r1.9 osk5912_machdep.c
--- sys/arch/evbarm/osk5912/osk5912_machdep.c 28 Nov 2010 08:23:24 -0000
1.9
+++ sys/arch/evbarm/osk5912/osk5912_machdep.c 25 May 2011 22:28:47 -0000
@@ -132,7 +132,7 @@ __KERNEL_RCSID(0, "$NetBSD: osk5912_mach
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c,v
retrieving revision 1.3
diff -u -p -r1.3 if_cs_smdk24x0.c
--- sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c 22 Sep 2009 14:55:19 -0000
1.3
+++ sys/arch/evbarm/smdk2xx0/if_cs_smdk24x0.c 25 May 2011 22:28:47 -0000
@@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_cs_smdk24
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arch/arm/s3c2xx0/s3c2410reg.h>
Index: sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c,v
retrieving revision 1.6
diff -u -p -r1.6 smdk2410_kbd.c
--- sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c 7 Jun 2010 15:17:24 -0000
1.6
+++ sys/arch/evbarm/smdk2xx0/smdk2410_kbd.c 25 May 2011 22:28:47 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_kbd
#include <sys/systm.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <dev/wscons/wsconsio.h>
Index: sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c,v
retrieving revision 1.5
diff -u -p -r1.5 smdk2410_lcd.c
--- sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c 5 Feb 2010 21:10:58 -0000
1.5
+++ sys/arch/evbarm/smdk2xx0/smdk2410_lcd.c 25 May 2011 22:28:47 -0000
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_lcd
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c24x0var.h>
#include <arm/s3c2xx0/s3c24x0reg.h>
#include <arm/s3c2xx0/s3c2410reg.h>
Index: sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c,v
retrieving revision 1.27
diff -u -p -r1.27 smdk2410_machdep.c
--- sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c 26 Dec 2009 16:01:25 -0000
1.27
+++ sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c 25 May 2011 22:28:47 -0000
@@ -136,7 +136,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2410_mac
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c,v
retrieving revision 1.35
diff -u -p -r1.35 smdk2800_machdep.c
--- sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c 26 Dec 2009 16:01:25 -0000
1.35
+++ sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c 25 May 2011 22:28:47 -0000
@@ -138,7 +138,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2800_mac
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: sys/arch/evbarm/smdk2xx0/smdk2800_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/smdk2xx0/smdk2800_pci.c,v
retrieving revision 1.4
diff -u -p -r1.4 smdk2800_pci.c
--- sys/arch/evbarm/smdk2xx0/smdk2800_pci.c 11 Dec 2005 12:17:09 -0000
1.4
+++ sys/arch/evbarm/smdk2xx0/smdk2800_pci.c 25 May 2011 22:28:47 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: smdk2800_pci
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pciconf.h>
Index: sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c,v
retrieving revision 1.3
diff -u -p -r1.3 if_sm_gpmc.c
--- sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c 27 Aug 2008 11:03:10 -0000
1.3
+++ sys/arch/evbarm/tisdp24xx/if_sm_gpmc.c 25 May 2011 22:28:47 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_gpmc.c
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c,v
retrieving revision 1.10
diff -u -p -r1.10 sdp24xx_machdep.c
--- sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c 28 Nov 2010 08:23:24 -0000
1.10
+++ sys/arch/evbarm/tisdp24xx/sdp24xx_machdep.c 25 May 2011 22:28:47 -0000
@@ -160,7 +160,7 @@ __KERNEL_RCSID(0, "$NetBSD: sdp24xx_mach
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/armreg.h>
Index: sys/arch/evbarm/tsarm/epcom_ts.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/epcom_ts.c,v
retrieving revision 1.4
diff -u -p -r1.4 epcom_ts.c
--- sys/arch/evbarm/tsarm/epcom_ts.c 21 Oct 2009 14:15:51 -0000 1.4
+++ sys/arch/evbarm/tsarm/epcom_ts.c 25 May 2011 22:28:47 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: epcom_ts.c,v
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epcomreg.h>
#include <arm/ep93xx/epcomvar.h>
Index: sys/arch/evbarm/tsarm/toastersensors.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/toastersensors.c,v
retrieving revision 1.8
diff -u -p -r1.8 toastersensors.c
--- sys/arch/evbarm/tsarm/toastersensors.c 14 Mar 2009 15:36:05 -0000
1.8
+++ sys/arch/evbarm/tsarm/toastersensors.c 25 May 2011 22:28:47 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: toastersenso
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsconsio.h>
Index: sys/arch/evbarm/tsarm/tsarm_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/tsarm_machdep.c,v
retrieving revision 1.14
diff -u -p -r1.14 tsarm_machdep.c
--- sys/arch/evbarm/tsarm/tsarm_machdep.c 26 Dec 2009 16:01:25 -0000
1.14
+++ sys/arch/evbarm/tsarm/tsarm_machdep.c 25 May 2011 22:28:47 -0000
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: tsarm_machde
#include <ddb/db_extern.h>
#include <acorn32/include/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/tsarm/tskp.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/tskp.c,v
retrieving revision 1.7
diff -u -p -r1.7 tskp.c
--- sys/arch/evbarm/tsarm/tskp.c 14 Mar 2009 15:36:05 -0000 1.7
+++ sys/arch/evbarm/tsarm/tskp.c 25 May 2011 22:28:47 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: tskp.c,v 1.7
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsconsio.h>
Index: sys/arch/evbarm/tsarm/tslcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/tslcd.c,v
retrieving revision 1.13
diff -u -p -r1.13 tslcd.c
--- sys/arch/evbarm/tsarm/tslcd.c 14 Mar 2009 21:04:08 -0000 1.13
+++ sys/arch/evbarm/tsarm/tslcd.c 25 May 2011 22:28:47 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: tslcd.c,v 1.
#include <sys/callout.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/wscons/wsdisplayvar.h>
Index: sys/arch/evbarm/tsarm/tspld.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/tspld.c,v
retrieving revision 1.20
diff -u -p -r1.20 tspld.c
--- sys/arch/evbarm/tsarm/tspld.c 23 Oct 2009 00:39:31 -0000 1.20
+++ sys/arch/evbarm/tsarm/tspld.c 25 May 2011 22:28:47 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: tspld.c,v 1.
#include <sys/device.h>
#include <sys/wdog.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/autoconf.h>
#include "isa.h"
Index: sys/arch/evbarm/tsarm/tsrtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/tsrtc.c,v
retrieving revision 1.6
diff -u -p -r1.6 tsrtc.c
--- sys/arch/evbarm/tsarm/tsrtc.c 4 Apr 2008 09:33:07 -0000 1.6
+++ sys/arch/evbarm/tsarm/tsrtc.c 25 May 2011 22:28:47 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: tsrtc.c,v 1.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: sys/arch/evbarm/tsarm/wdc_ts.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/wdc_ts.c,v
retrieving revision 1.5
diff -u -p -r1.5 wdc_ts.c
--- sys/arch/evbarm/tsarm/wdc_ts.c 28 Apr 2008 20:23:17 -0000 1.5
+++ sys/arch/evbarm/tsarm/wdc_ts.c 25 May 2011 22:28:47 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_ts.c,v 1
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/ep93xx/ep93xxvar.h>
Index: sys/arch/evbarm/tsarm/isa/isa_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/isa/isa_io.c,v
retrieving revision 1.7
diff -u -p -r1.7 isa_io.c
--- sys/arch/evbarm/tsarm/isa/isa_io.c 14 Mar 2009 21:04:08 -0000 1.7
+++ sys/arch/evbarm/tsarm/isa/isa_io.c 25 May 2011 22:28:47 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1
#include <sys/systm.h>
#include <sys/malloc.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/isa_machdep.h>
Index: sys/arch/evbarm/tsarm/isa/isa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/tsarm/isa/isa_machdep.c,v
retrieving revision 1.10
diff -u -p -r1.10 isa_machdep.c
--- sys/arch/evbarm/tsarm/isa/isa_machdep.c 19 Aug 2009 15:14:59 -0000
1.10
+++ sys/arch/evbarm/tsarm/isa/isa_machdep.c 25 May 2011 22:28:47 -0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.
#include <sys/malloc.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
Index: sys/arch/evbarm/viper/if_sm_pxaip.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/viper/if_sm_pxaip.c,v
retrieving revision 1.4
diff -u -p -r1.4 if_sm_pxaip.c
--- sys/arch/evbarm/viper/if_sm_pxaip.c 17 Oct 2007 19:54:13 -0000 1.4
+++ sys/arch/evbarm/viper/if_sm_pxaip.c 25 May 2011 22:28:47 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_pxaip.
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: sys/arch/evbarm/viper/viper_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/viper/viper_machdep.c,v
retrieving revision 1.17
diff -u -p -r1.17 viper_machdep.c
--- sys/arch/evbarm/viper/viper_machdep.c 28 Nov 2010 08:23:24 -0000
1.17
+++ sys/arch/evbarm/viper/viper_machdep.c 25 May 2011 22:28:47 -0000
@@ -147,7 +147,7 @@ __KERNEL_RCSID(0, "$NetBSD: viper_machde
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbmips/adm5120/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/adm5120/mainbus.c,v
retrieving revision 1.2
diff -u -p -r1.2 mainbus.c
--- sys/arch/evbmips/adm5120/mainbus.c 20 Feb 2011 07:48:33 -0000 1.2
+++ sys/arch/evbmips/adm5120/mainbus.c 25 May 2011 22:28:47 -0000
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: sys/arch/evbmips/alchemy/dbau1500.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/alchemy/dbau1500.c,v
retrieving revision 1.5
diff -u -p -r1.5 dbau1500.c
--- sys/arch/evbmips/alchemy/dbau1500.c 4 Apr 2011 20:37:49 -0000 1.5
+++ sys/arch/evbmips/alchemy/dbau1500.c 25 May 2011 22:28:47 -0000
@@ -35,7 +35,7 @@
__KERNEL_RCSID(0, "$NetBSD: dbau1500.c,v 1.5 2011/04/04 20:37:49 dyoung Exp
$");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
Index: sys/arch/evbmips/alchemy/dbau1550.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/alchemy/dbau1550.c,v
retrieving revision 1.10
diff -u -p -r1.10 dbau1550.c
--- sys/arch/evbmips/alchemy/dbau1550.c 4 Apr 2011 20:37:49 -0000 1.10
+++ sys/arch/evbmips/alchemy/dbau1550.c 25 May 2011 22:28:47 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: dbau1550.c,v
#include <sys/kernel.h>
#include <sys/time.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/include/aureg.h>
#include <mips/alchemy/dev/aupcmciavar.h>
Index: sys/arch/evbmips/alchemy/genericbd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/alchemy/genericbd.c,v
retrieving revision 1.2
diff -u -p -r1.2 genericbd.c
--- sys/arch/evbmips/alchemy/genericbd.c 20 Feb 2011 07:48:33 -0000
1.2
+++ sys/arch/evbmips/alchemy/genericbd.c 25 May 2011 22:28:47 -0000
@@ -35,7 +35,7 @@
__KERNEL_RCSID(0, "$NetBSD: genericbd.c,v 1.2 2011/02/20 07:48:33 matt Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
Index: sys/arch/evbmips/alchemy/mach_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/alchemy/mach_intr.c,v
retrieving revision 1.4
diff -u -p -r1.4 mach_intr.c
--- sys/arch/evbmips/alchemy/mach_intr.c 20 Feb 2011 07:48:33 -0000
1.4
+++ sys/arch/evbmips/alchemy/mach_intr.c 25 May 2011 22:28:47 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_intr.c,
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: sys/arch/evbmips/alchemy/mtx-1.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/alchemy/mtx-1.c,v
retrieving revision 1.5
diff -u -p -r1.5 mtx-1.c
--- sys/arch/evbmips/alchemy/mtx-1.c 4 Apr 2011 20:37:49 -0000 1.5
+++ sys/arch/evbmips/alchemy/mtx-1.c 25 May 2011 22:28:47 -0000
@@ -35,7 +35,7 @@
__KERNEL_RCSID(0, "$NetBSD: mtx-1.c,v 1.5 2011/04/04 20:37:49 dyoung Exp $");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <evbmips/alchemy/obiovar.h>
#include <evbmips/alchemy/board.h>
Index: sys/arch/evbmips/alchemy/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/alchemy/obio.c,v
retrieving revision 1.3
diff -u -p -r1.3 obio.c
--- sys/arch/evbmips/alchemy/obio.c 20 Feb 2011 07:48:33 -0000 1.3
+++ sys/arch/evbmips/alchemy/obio.c 25 May 2011 22:28:47 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.3
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/cache.h>
#include <mips/cpuregs.h>
Index: sys/arch/evbmips/alchemy/omsal400.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/alchemy/omsal400.c,v
retrieving revision 1.7
diff -u -p -r1.7 omsal400.c
--- sys/arch/evbmips/alchemy/omsal400.c 4 Apr 2011 20:37:49 -0000 1.7
+++ sys/arch/evbmips/alchemy/omsal400.c 25 May 2011 22:28:47 -0000
@@ -39,7 +39,7 @@
__KERNEL_RCSID(0, "$NetBSD: omsal400.c,v 1.7 2011/04/04 20:37:49 dyoung Exp
$");
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <mips/alchemy/dev/augpiovar.h>
#include <mips/alchemy/dev/aupcmciavar.h>
Index: sys/arch/evbmips/atheros/mach_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/atheros/mach_intr.c,v
retrieving revision 1.3
diff -u -p -r1.3 mach_intr.c
--- sys/arch/evbmips/atheros/mach_intr.c 20 Feb 2011 07:48:33 -0000
1.3
+++ sys/arch/evbmips/atheros/mach_intr.c 25 May 2011 22:28:47 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mach_intr.c,
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: sys/arch/evbmips/gdium/bonito_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/gdium/bonito_mainbus.c,v
retrieving revision 1.2
diff -u -p -r1.2 bonito_mainbus.c
--- sys/arch/evbmips/gdium/bonito_mainbus.c 17 May 2011 17:34:49 -0000
1.2
+++ sys/arch/evbmips/gdium/bonito_mainbus.c 25 May 2011 22:28:47 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: bonito_mainb
#include <sys/reboot.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <mips/bonito/bonitoreg.h>
Index: sys/arch/evbmips/gdium/gdium_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/gdium/gdium_dma.c,v
retrieving revision 1.2
diff -u -p -r1.2 gdium_dma.c
--- sys/arch/evbmips/gdium/gdium_dma.c 6 Aug 2009 16:37:01 -0000 1.2
+++ sys/arch/evbmips/gdium/gdium_dma.c 25 May 2011 22:28:47 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_dma.c,
#include <sys/param.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbmips/gdium/gdiumreg.h>
#include <evbmips/gdium/gdiumvar.h>
Index: sys/arch/evbmips/gdium/gdium_genfb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/gdium/gdium_genfb.c,v
retrieving revision 1.4
diff -u -p -r1.4 gdium_genfb.c
--- sys/arch/evbmips/gdium/gdium_genfb.c 11 May 2010 01:38:14 -0000
1.4
+++ sys/arch/evbmips/gdium/gdium_genfb.c 25 May 2011 22:28:47 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_genfb.
#include <sys/malloc.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wsdisplayvar.h>
Index: sys/arch/evbmips/gdium/gdium_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/gdium/gdium_intr.c,v
retrieving revision 1.2
diff -u -p -r1.2 gdium_intr.c
--- sys/arch/evbmips/gdium/gdium_intr.c 7 Aug 2009 01:27:14 -0000 1.2
+++ sys/arch/evbmips/gdium/gdium_intr.c 25 May 2011 22:28:47 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: gdium_intr.c
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/locore.h>
Index: sys/arch/evbmips/gdium/gdiumvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/gdium/gdiumvar.h,v
retrieving revision 1.1
diff -u -p -r1.1 gdiumvar.h
--- sys/arch/evbmips/gdium/gdiumvar.h 6 Aug 2009 00:50:26 -0000 1.1
+++ sys/arch/evbmips/gdium/gdiumvar.h 25 May 2011 22:28:47 -0000
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <mips/bonito/bonitovar.h>
cvs diff: cannot find sys/arch/evbmips/include/bus.h
Index: sys/arch/evbmips/isa/isadma_bounce.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/isa/isadma_bounce.c,v
retrieving revision 1.8
diff -u -p -r1.8 isadma_bounce.c
--- sys/arch/evbmips/isa/isadma_bounce.c 28 Apr 2008 20:23:17 -0000
1.8
+++ sys/arch/evbmips/isa/isadma_bounce.c 25 May 2011 22:28:48 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounc
#include <mips/cache.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <dev/isa/isareg.h>
Index: sys/arch/evbmips/isa/mcclock_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/isa/mcclock_isa.c,v
retrieving revision 1.12
diff -u -p -r1.12 mcclock_isa.c
--- sys/arch/evbmips/isa/mcclock_isa.c 29 Mar 2008 05:42:45 -0000 1.12
+++ sys/arch/evbmips/isa/mcclock_isa.c 25 May 2011 22:28:48 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_isa.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: sys/arch/evbmips/malta/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/malta/autoconf.h,v
retrieving revision 1.1
diff -u -p -r1.1 autoconf.h
--- sys/arch/evbmips/malta/autoconf.h 7 Mar 2002 14:44:03 -0000 1.1
+++ sys/arch/evbmips/malta/autoconf.h 25 May 2011 22:28:48 -0000
@@ -35,7 +35,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct mainbus_attach_args {
const char *ma_name;
Index: sys/arch/evbmips/malta/malta_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/malta/malta_dma.c,v
retrieving revision 1.8
diff -u -p -r1.8 malta_dma.c
--- sys/arch/evbmips/malta/malta_dma.c 20 Feb 2011 07:48:34 -0000 1.8
+++ sys/arch/evbmips/malta/malta_dma.c 25 May 2011 22:28:48 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: malta_dma.c,
#include <sys/device.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/evbmips/malta/maltavar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/malta/maltavar.h,v
retrieving revision 1.5
diff -u -p -r1.5 maltavar.h
--- sys/arch/evbmips/malta/maltavar.h 20 Feb 2011 07:48:34 -0000 1.5
+++ sys/arch/evbmips/malta/maltavar.h 25 May 2011 22:28:48 -0000
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
Index: sys/arch/evbmips/malta/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/malta/pci/pci_machdep.c,v
retrieving revision 1.5
diff -u -p -r1.5 pci_machdep.c
--- sys/arch/evbmips/malta/pci/pci_machdep.c 20 Feb 2011 07:48:35 -0000
1.5
+++ sys/arch/evbmips/malta/pci/pci_machdep.c 25 May 2011 22:28:48 -0000
@@ -7,7 +7,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/device.h>
#define _MIPS_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* PCI doesn't have any special needs; just use
Index: sys/arch/evbmips/malta/pci/pcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbmips/malta/pci/pcib.c,v
retrieving revision 1.14
diff -u -p -r1.14 pcib.c
--- sys/arch/evbmips/malta/pci/pcib.c 20 Feb 2011 07:48:35 -0000 1.14
+++ sys/arch/evbmips/malta/pci/pcib.c 25 May 2011 22:28:48 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.1
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbmips/malta/maltareg.h>
#include <evbmips/malta/maltavar.h>
#include <evbmips/malta/dev/gtreg.h>
Index: sys/arch/evbarm/cp3100/cp3100_leds.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/cp3100/cp3100_leds.c,v
retrieving revision 1.1
diff -u -p -r1.1 cp3100_leds.c
--- sys/arch/evbarm/cp3100/cp3100_leds.c 8 Nov 2006 23:49:02 -0000
1.1
+++ sys/arch/evbarm/cp3100/cp3100_leds.c 25 May 2011 22:28:46 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: cp3100_leds.
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/cp3100/cp3100_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/cp3100/cp3100_pci.c,v
retrieving revision 1.2
diff -u -p -r1.2 cp3100_pci.c
--- sys/arch/evbarm/cp3100/cp3100_pci.c 4 Apr 2011 20:37:47 -0000 1.2
+++ sys/arch/evbarm/cp3100/cp3100_pci.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: cp3100_pci.c
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/devkit8000/if_dme_gpmc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/devkit8000/if_dme_gpmc.c,v
retrieving revision 1.1
diff -u -p -r1.1 if_dme_gpmc.c
--- sys/arch/evbarm/devkit8000/if_dme_gpmc.c 8 Sep 2010 22:49:49 -0000
1.1
+++ sys/arch/evbarm/devkit8000/if_dme_gpmc.c 25 May 2011 22:28:46 -0000
@@ -65,7 +65,7 @@
#include <net/if_ether.h>
#include <net/if_media.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arch/arm/omap/omap2_gpmcvar.h>
Index: sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c,v
retrieving revision 1.11
diff -u -p -r1.11 g42xxeb_kmkbd.c
--- sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c 13 Mar 2010 11:26:42 -0000
1.11
+++ sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: g42xxeb_kmkb
#include <sys/callout.h>
#include <sys/kernel.h> /* for hz */
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/wscons/wsconsio.h>
#include <dev/wscons/wskbdvar.h>
Index: sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c,v
retrieving revision 1.13
diff -u -p -r1.13 g42xxeb_lcd.c
--- sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c 13 Mar 2010 11:15:52 -0000
1.13
+++ sys/arch/evbarm/g42xxeb/g42xxeb_lcd.c 25 May 2011 22:28:46 -0000
@@ -44,7 +44,7 @@
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/sa11x0/sa11x0_var.h>
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0reg.h>
Index: sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c,v
retrieving revision 1.22
diff -u -p -r1.22 g42xxeb_machdep.c
--- sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c 28 Nov 2010 08:23:23 -0000
1.22
+++ sys/arch/evbarm/g42xxeb/g42xxeb_machdep.c 25 May 2011 22:28:46 -0000
@@ -139,7 +139,7 @@
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/g42xxeb/g42xxeb_var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/g42xxeb_var.h,v
retrieving revision 1.4
diff -u -p -r1.4 g42xxeb_var.h
--- sys/arch/evbarm/g42xxeb/g42xxeb_var.h 13 Mar 2010 11:26:42 -0000
1.4
+++ sys/arch/evbarm/g42xxeb/g42xxeb_var.h 25 May 2011 22:28:46 -0000
@@ -35,7 +35,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/g42xxeb/g42xxeb_reg.h>
Index: sys/arch/evbarm/g42xxeb/gb225.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/gb225.c,v
retrieving revision 1.9
diff -u -p -r1.9 gb225.c
--- sys/arch/evbarm/g42xxeb/gb225.c 7 Jun 2010 15:17:24 -0000 1.9
+++ sys/arch/evbarm/g42xxeb/gb225.c 25 May 2011 22:28:46 -0000
@@ -37,7 +37,7 @@
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/evbarm/g42xxeb/gb225_pcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/gb225_pcic.c,v
retrieving revision 1.10
diff -u -p -r1.10 gb225_pcic.c
--- sys/arch/evbarm/g42xxeb/gb225_pcic.c 7 Jun 2010 15:17:24 -0000
1.10
+++ sys/arch/evbarm/g42xxeb/gb225_pcic.c 25 May 2011 22:28:46 -0000
@@ -39,7 +39,7 @@
#include <sys/malloc.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pcmcia/pcmciareg.h>
Index: sys/arch/evbarm/g42xxeb/gb225_slhci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/gb225_slhci.c,v
retrieving revision 1.5
diff -u -p -r1.5 gb225_slhci.c
--- sys/arch/evbarm/g42xxeb/gb225_slhci.c 7 Jun 2010 15:17:24 -0000
1.5
+++ sys/arch/evbarm/g42xxeb/gb225_slhci.c 25 May 2011 22:28:46 -0000
@@ -37,7 +37,7 @@
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <dev/usb/usb.h>
Index: sys/arch/evbarm/g42xxeb/if_ne_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/if_ne_obio.c,v
retrieving revision 1.6
diff -u -p -r1.6 if_ne_obio.c
--- sys/arch/evbarm/g42xxeb/if_ne_obio.c 16 Mar 2008 16:08:57 -0000
1.6
+++ sys/arch/evbarm/g42xxeb/if_ne_obio.c 25 May 2011 22:28:46 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ne_obio.c
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: sys/arch/evbarm/g42xxeb/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/g42xxeb/obio.c,v
retrieving revision 1.9
diff -u -p -r1.9 obio.c
--- sys/arch/evbarm/g42xxeb/obio.c 7 Jun 2010 15:17:24 -0000 1.9
+++ sys/arch/evbarm/g42xxeb/obio.c 25 May 2011 22:28:46 -0000
@@ -37,7 +37,7 @@
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/evbarm/gemini/gemini_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gemini/gemini_machdep.c,v
retrieving revision 1.16
diff -u -p -r1.16 gemini_machdep.c
--- sys/arch/evbarm/gemini/gemini_machdep.c 28 Nov 2010 08:23:23 -0000
1.16
+++ sys/arch/evbarm/gemini/gemini_machdep.c 25 May 2011 22:28:46 -0000
@@ -166,7 +166,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_machd
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/armreg.h>
Index: sys/arch/evbarm/gumstix/gumstix_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/gumstix_machdep.c,v
retrieving revision 1.35
diff -u -p -r1.35 gumstix_machdep.c
--- sys/arch/evbarm/gumstix/gumstix_machdep.c 28 Nov 2010 08:23:23 -0000
1.35
+++ sys/arch/evbarm/gumstix/gumstix_machdep.c 25 May 2011 22:28:46 -0000
@@ -165,7 +165,7 @@
#include <machine/autoconf.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/db_machdep.h>
#include <machine/frame.h>
Index: sys/arch/evbarm/gumstix/gumstixvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/gumstixvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 gumstixvar.h
--- sys/arch/evbarm/gumstix/gumstixvar.h 22 Nov 2009 12:05:14 -0000
1.5
+++ sys/arch/evbarm/gumstix/gumstixvar.h 25 May 2011 22:28:46 -0000
@@ -36,7 +36,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0_gpio.h>
#include <evbarm/gumstix/gumstixreg.h>
Index: sys/arch/evbarm/gumstix/gxlcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/gxlcd.c,v
retrieving revision 1.2
diff -u -p -r1.2 gxlcd.c
--- sys/arch/evbarm/gumstix/gxlcd.c 21 Nov 2009 08:33:50 -0000 1.2
+++ sys/arch/evbarm/gumstix/gxlcd.c 25 May 2011 22:28:46 -0000
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: gxlcd.c,v 1.
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0reg.h>
Index: sys/arch/evbarm/gumstix/gxmci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/gxmci.c,v
retrieving revision 1.2
diff -u -p -r1.2 gxmci.c
--- sys/arch/evbarm/gumstix/gxmci.c 9 Aug 2009 06:12:34 -0000 1.2
+++ sys/arch/evbarm/gumstix/gxmci.c 25 May 2011 22:28:46 -0000
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: gxmci.c,v 1.
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/xscale/pxa2x0cpu.h>
Index: sys/arch/evbarm/gumstix/gxpcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/gxpcic.c,v
retrieving revision 1.11
diff -u -p -r1.11 gxpcic.c
--- sys/arch/evbarm/gumstix/gxpcic.c 9 Aug 2009 07:10:13 -0000 1.11
+++ sys/arch/evbarm/gumstix/gxpcic.c 25 May 2011 22:28:46 -0000
@@ -71,7 +71,7 @@
#include <sys/malloc.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pcmcia/pcmciareg.h>
Index: sys/arch/evbarm/gumstix/if_sm_gxio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/gumstix/if_sm_gxio.c,v
retrieving revision 1.9
diff -u -p -r1.9 if_sm_gxio.c
--- sys/arch/evbarm/gumstix/if_sm_gxio.c 28 Aug 2010 04:33:00 -0000
1.9
+++ sys/arch/evbarm/gumstix/if_sm_gxio.c 25 May 2011 22:28:46 -0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_gxio.c
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: sys/arch/evbarm/hdl_g/btn_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/btn_obio.c,v
retrieving revision 1.1
diff -u -p -r1.1 btn_obio.c
--- sys/arch/evbarm/hdl_g/btn_obio.c 16 Apr 2006 02:22:33 -0000 1.1
+++ sys/arch/evbarm/hdl_g/btn_obio.c 25 May 2011 22:28:46 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: btn_obio.c,v
#include <arm/xscale/i80321var.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/sysmon/sysmonvar.h>
Index: sys/arch/evbarm/hdl_g/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/com_obio.c,v
retrieving revision 1.4
diff -u -p -r1.4 com_obio.c
--- sys/arch/evbarm/hdl_g/com_obio.c 28 Apr 2008 20:23:16 -0000 1.4
+++ sys/arch/evbarm/hdl_g/com_obio.c 25 May 2011 22:28:46 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/evbarm/hdl_g/hdlg_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/hdlg_machdep.c,v
retrieving revision 1.14
diff -u -p -r1.14 hdlg_machdep.c
--- sys/arch/evbarm/hdl_g/hdlg_machdep.c 26 Dec 2009 16:01:24 -0000
1.14
+++ sys/arch/evbarm/hdl_g/hdlg_machdep.c 25 May 2011 22:28:46 -0000
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: hdlg_machdep
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/hdl_g/hdlg_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/hdlg_pci.c,v
retrieving revision 1.2
diff -u -p -r1.2 hdlg_pci.c
--- sys/arch/evbarm/hdl_g/hdlg_pci.c 4 Apr 2011 20:37:47 -0000 1.2
+++ sys/arch/evbarm/hdl_g/hdlg_pci.c 25 May 2011 22:28:46 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: hdlg_pci.c,v
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/hdl_g/hdlgreg.h>
#include <evbarm/hdl_g/hdlgvar.h>
Index: sys/arch/evbarm/hdl_g/i80321_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/i80321_mainbus.c,v
retrieving revision 1.1
diff -u -p -r1.1 i80321_mainbus.c
--- sys/arch/evbarm/hdl_g/i80321_mainbus.c 16 Apr 2006 02:22:33 -0000
1.1
+++ sys/arch/evbarm/hdl_g/i80321_mainbus.c 25 May 2011 22:28:46 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_mainb
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/hdl_g/hdlgreg.h>
#include <evbarm/hdl_g/hdlgvar.h>
Index: sys/arch/evbarm/hdl_g/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/obio.c,v
retrieving revision 1.1
diff -u -p -r1.1 obio.c
--- sys/arch/evbarm/hdl_g/obio.c 16 Apr 2006 02:22:33 -0000 1.1
+++ sys/arch/evbarm/hdl_g/obio.c 25 May 2011 22:28:46 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.1
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
Index: sys/arch/evbarm/hdl_g/obio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/hdl_g/obio_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 obio_space.c
--- sys/arch/evbarm/hdl_g/obio_space.c 7 Nov 2009 07:27:42 -0000 1.2
+++ sys/arch/evbarm/hdl_g/obio_space.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_space.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(obio);
Index: sys/arch/evbarm/ifpga/ifpga_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ifpga/ifpga_io.c,v
retrieving revision 1.9
diff -u -p -r1.9 ifpga_io.c
--- sys/arch/evbarm/ifpga/ifpga_io.c 14 Mar 2009 21:04:08 -0000 1.9
+++ sys/arch/evbarm/ifpga/ifpga_io.c 25 May 2011 22:28:46 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: ifpga_io.c,v
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
#include <evbarm/ifpga/ifpgavar.h>
Index: sys/arch/evbarm/ifpga/ifpgavar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ifpga/ifpgavar.h,v
retrieving revision 1.5
diff -u -p -r1.5 ifpgavar.h
--- sys/arch/evbarm/ifpga/ifpgavar.h 21 Jul 2009 16:04:16 -0000 1.5
+++ sys/arch/evbarm/ifpga/ifpgavar.h 25 May 2011 22:28:46 -0000
@@ -32,7 +32,7 @@
#ifndef _IFPGAVAR_H_
#define _IFPGAVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/* We statically map the UARTS at boot so that we can access the console
before we've probed for the IFPGA. */
Index: sys/arch/evbarm/ifpga/plcom_ifpga.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ifpga/plcom_ifpga.c,v
retrieving revision 1.10
diff -u -p -r1.10 plcom_ifpga.c
--- sys/arch/evbarm/ifpga/plcom_ifpga.c 28 Mar 2006 17:38:24 -0000 1.10
+++ sys/arch/evbarm/ifpga/plcom_ifpga.c 25 May 2011 22:28:46 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: plcom_ifpga.
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/dev/plcomreg.h>
#include <evbarm/dev/plcomvar.h>
Index: sys/arch/evbarm/imx31/imx31lk_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/imx31/imx31lk_machdep.c,v
retrieving revision 1.11
diff -u -p -r1.11 imx31lk_machdep.c
--- sys/arch/evbarm/imx31/imx31lk_machdep.c 28 Nov 2010 08:23:23 -0000
1.11
+++ sys/arch/evbarm/imx31/imx31lk_machdep.c 25 May 2011 22:28:46 -0000
@@ -144,7 +144,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx31lk_mach
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/imx31/imx31lk_pcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/imx31/imx31lk_pcic.c,v
retrieving revision 1.3
diff -u -p -r1.3 imx31lk_pcic.c
--- sys/arch/evbarm/imx31/imx31lk_pcic.c 30 Jun 2008 00:49:31 -0000
1.3
+++ sys/arch/evbarm/imx31/imx31lk_pcic.c 25 May 2011 22:28:46 -0000
@@ -26,7 +26,7 @@ __KERNEL_RCSID(0, "$Id: imx31lk_pcic.c,v
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm.h>
cvs diff: cannot find sys/arch/evbarm/include/bus.h
Index: sys/arch/evbarm/integrator/int_bus_dma.h
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/integrator/int_bus_dma.h,v
retrieving revision 1.2
diff -u -p -r1.2 int_bus_dma.h
--- sys/arch/evbarm/integrator/int_bus_dma.h 31 Jul 2002 17:34:26 -0000
1.2
+++ sys/arch/evbarm/integrator/int_bus_dma.h 25 May 2011 22:28:46 -0000
@@ -32,7 +32,7 @@
#ifndef _INT_BUS_DMA_H
#define _INT_BUS_DMA_H
-#include <machine/bus.h>
+#include <sys/bus.h>
#define CM_ALIAS_TO_LOCAL(addr) (addr & 0x0fffffff)
#define LOCAL_TO_CM_ALIAS(addr) (addr | 0x80000000)
Index: sys/arch/evbarm/integrator/integrator_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/integrator/integrator_machdep.c,v
retrieving revision 1.66
diff -u -p -r1.66 integrator_machdep.c
--- sys/arch/evbarm/integrator/integrator_machdep.c 26 Dec 2009 16:01:24
-0000 1.66
+++ sys/arch/evbarm/integrator/integrator_machdep.c 25 May 2011 22:28:46
-0000
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: integrator_m
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
Index: sys/arch/evbarm/iq31244/iq31244_7seg.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq31244/iq31244_7seg.c,v
retrieving revision 1.4
diff -u -p -r1.4 iq31244_7seg.c
--- sys/arch/evbarm/iq31244/iq31244_7seg.c 24 Dec 2005 20:06:59 -0000
1.4
+++ sys/arch/evbarm/iq31244/iq31244_7seg.c 25 May 2011 22:28:46 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq31244_7seg
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/iq31244/iq31244_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq31244/iq31244_pci.c,v
retrieving revision 1.4
diff -u -p -r1.4 iq31244_pci.c
--- sys/arch/evbarm/iq31244/iq31244_pci.c 4 Apr 2011 20:37:48 -0000
1.4
+++ sys/arch/evbarm/iq31244/iq31244_pci.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq31244_pci.
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/iq31244/wdc_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq31244/wdc_obio.c,v
retrieving revision 1.5
diff -u -p -r1.5 wdc_obio.c
--- sys/arch/evbarm/iq31244/wdc_obio.c 28 Apr 2008 20:23:16 -0000 1.5
+++ sys/arch/evbarm/iq31244/wdc_obio.c 25 May 2011 22:28:46 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/evbarm/iq80310/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/com_obio.c,v
retrieving revision 1.13
diff -u -p -r1.13 com_obio.c
--- sys/arch/evbarm/iq80310/com_obio.c 28 Apr 2008 20:23:16 -0000 1.13
+++ sys/arch/evbarm/iq80310/com_obio.c 25 May 2011 22:28:46 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310var.h>
#include <evbarm/iq80310/obiovar.h>
Index: sys/arch/evbarm/iq80310/i80312_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/i80312_mainbus.c,v
retrieving revision 1.13
diff -u -p -r1.13 i80312_mainbus.c
--- sys/arch/evbarm/iq80310/i80312_mainbus.c 11 Dec 2005 12:17:09 -0000
1.13
+++ sys/arch/evbarm/iq80310/i80312_mainbus.c 25 May 2011 22:28:46 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80312_mainb
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: sys/arch/evbarm/iq80310/iq80310_7seg.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/iq80310_7seg.c,v
retrieving revision 1.9
diff -u -p -r1.9 iq80310_7seg.c
--- sys/arch/evbarm/iq80310/iq80310_7seg.c 11 Dec 2005 12:17:09 -0000
1.9
+++ sys/arch/evbarm/iq80310/iq80310_7seg.c 25 May 2011 22:28:46 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_7seg
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: sys/arch/evbarm/iq80310/iq80310_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/iq80310_intr.c,v
retrieving revision 1.28
diff -u -p -r1.28 iq80310_intr.c
--- sys/arch/evbarm/iq80310/iq80310_intr.c 31 Jan 2011 23:56:14 -0000
1.28
+++ sys/arch/evbarm/iq80310/iq80310_intr.c 25 May 2011 22:28:46 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_intr
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/evbarm/iq80310/iq80310_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/iq80310_machdep.c,v
retrieving revision 1.78
diff -u -p -r1.78 iq80310_machdep.c
--- sys/arch/evbarm/iq80310/iq80310_machdep.c 26 Dec 2009 16:01:24 -0000
1.78
+++ sys/arch/evbarm/iq80310/iq80310_machdep.c 25 May 2011 22:28:46 -0000
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_mach
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/iq80310/iq80310_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/iq80310_pci.c,v
retrieving revision 1.10
diff -u -p -r1.10 iq80310_pci.c
--- sys/arch/evbarm/iq80310/iq80310_pci.c 4 Apr 2011 20:37:48 -0000
1.10
+++ sys/arch/evbarm/iq80310/iq80310_pci.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_pci.
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: sys/arch/evbarm/iq80310/iq80310_timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/iq80310_timer.c,v
retrieving revision 1.21
diff -u -p -r1.21 iq80310_timer.c
--- sys/arch/evbarm/iq80310/iq80310_timer.c 20 Jan 2008 16:28:24 -0000
1.21
+++ sys/arch/evbarm/iq80310/iq80310_timer.c 25 May 2011 22:28:46 -0000
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80310_time
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <evbarm/iq80310/iq80310reg.h>
Index: sys/arch/evbarm/iq80310/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/obio.c,v
retrieving revision 1.18
diff -u -p -r1.18 obio.c
--- sys/arch/evbarm/iq80310/obio.c 11 Dec 2005 12:17:09 -0000 1.18
+++ sys/arch/evbarm/iq80310/obio.c 25 May 2011 22:28:46 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.1
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80310/iq80310reg.h>
#include <evbarm/iq80310/iq80310var.h>
Index: sys/arch/evbarm/iq80310/obio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80310/obio_space.c,v
retrieving revision 1.13
diff -u -p -r1.13 obio_space.c
--- sys/arch/evbarm/iq80310/obio_space.c 7 Nov 2009 07:27:42 -0000
1.13
+++ sys/arch/evbarm/iq80310/obio_space.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_space.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(obio);
Index: sys/arch/evbarm/iq80321/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/com_obio.c,v
retrieving revision 1.12
diff -u -p -r1.12 com_obio.c
--- sys/arch/evbarm/iq80321/com_obio.c 28 Apr 2008 20:23:17 -0000 1.12
+++ sys/arch/evbarm/iq80321/com_obio.c 25 May 2011 22:28:46 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/evbarm/iq80321/i80321_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/i80321_mainbus.c,v
retrieving revision 1.16
diff -u -p -r1.16 i80321_mainbus.c
--- sys/arch/evbarm/iq80321/i80321_mainbus.c 15 Dec 2005 01:44:00 -0000
1.16
+++ sys/arch/evbarm/iq80321/i80321_mainbus.c 25 May 2011 22:28:46 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_mainb
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/iq80321/iq80321_7seg.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/iq80321_7seg.c,v
retrieving revision 1.6
diff -u -p -r1.6 iq80321_7seg.c
--- sys/arch/evbarm/iq80321/iq80321_7seg.c 24 Dec 2005 20:06:59 -0000
1.6
+++ sys/arch/evbarm/iq80321/iq80321_7seg.c 25 May 2011 22:28:46 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80321_7seg
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/iq80321/iq80321_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/iq80321_machdep.c,v
retrieving revision 1.48
diff -u -p -r1.48 iq80321_machdep.c
--- sys/arch/evbarm/iq80321/iq80321_machdep.c 26 Dec 2009 16:01:24 -0000
1.48
+++ sys/arch/evbarm/iq80321/iq80321_machdep.c 25 May 2011 22:28:46 -0000
@@ -99,7 +99,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80321_mach
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/iq80321/iq80321_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/iq80321_pci.c,v
retrieving revision 1.6
diff -u -p -r1.6 iq80321_pci.c
--- sys/arch/evbarm/iq80321/iq80321_pci.c 4 Apr 2011 20:37:48 -0000
1.6
+++ sys/arch/evbarm/iq80321/iq80321_pci.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: iq80321_pci.
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/iq80321/iq80321reg.h>
#include <evbarm/iq80321/iq80321var.h>
Index: sys/arch/evbarm/iq80321/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/obio.c,v
retrieving revision 1.14
diff -u -p -r1.14 obio.c
--- sys/arch/evbarm/iq80321/obio.c 11 Dec 2005 12:17:09 -0000 1.14
+++ sys/arch/evbarm/iq80321/obio.c 25 May 2011 22:28:46 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.1
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
Index: sys/arch/evbarm/iq80321/obio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/iq80321/obio_space.c,v
retrieving revision 1.10
diff -u -p -r1.10 obio_space.c
--- sys/arch/evbarm/iq80321/obio_space.c 7 Nov 2009 07:27:42 -0000
1.10
+++ sys/arch/evbarm/iq80321/obio_space.c 25 May 2011 22:28:46 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_space.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(obio);
Index: sys/arch/evbarm/ixdp425/ixdp425_led.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixdp425/ixdp425_led.c,v
retrieving revision 1.4
diff -u -p -r1.4 ixdp425_led.c
--- sys/arch/evbarm/ixdp425/ixdp425_led.c 21 Oct 2009 14:15:51 -0000
1.4
+++ sys/arch/evbarm/ixdp425/ixdp425_led.c 25 May 2011 22:28:46 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_led.
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425_sipvar.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/evbarm/ixdp425/ixdp425_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixdp425/ixdp425_machdep.c,v
retrieving revision 1.27
diff -u -p -r1.27 ixdp425_machdep.c
--- sys/arch/evbarm/ixdp425/ixdp425_machdep.c 26 Dec 2009 16:01:24 -0000
1.27
+++ sys/arch/evbarm/ixdp425/ixdp425_machdep.c 25 May 2011 22:28:47 -0000
@@ -90,7 +90,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_mach
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/ixdp425/ixdp425_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c,v
retrieving revision 1.6
diff -u -p -r1.6 ixdp425_mainbus.c
--- sys/arch/evbarm/ixdp425/ixdp425_mainbus.c 21 Oct 2009 14:15:51 -0000
1.6
+++ sys/arch/evbarm/ixdp425/ixdp425_mainbus.c 25 May 2011 22:28:47 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_main
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/evbarm/ixdp425/ixdp425_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixdp425/ixdp425_pci.c,v
retrieving revision 1.7
diff -u -p -r1.7 ixdp425_pci.c
--- sys/arch/evbarm/ixdp425/ixdp425_pci.c 4 Apr 2011 20:37:48 -0000
1.7
+++ sys/arch/evbarm/ixdp425/ixdp425_pci.c 25 May 2011 22:28:47 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixdp425_pci.
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/ixdp425/ixdp425reg.h>
#include <evbarm/ixdp425/ixdp425var.h>
Index: sys/arch/evbarm/ixm1200/ixm1200_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixm1200/ixm1200_machdep.c,v
retrieving revision 1.47
diff -u -p -r1.47 ixm1200_machdep.c
--- sys/arch/evbarm/ixm1200/ixm1200_machdep.c 28 Dec 2009 03:22:20 -0000
1.47
+++ sys/arch/evbarm/ixm1200/ixm1200_machdep.c 25 May 2011 22:28:47 -0000
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_mach
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/ixm1200/ixm1200_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixm1200/ixm1200_pci.c,v
retrieving revision 1.8
diff -u -p -r1.8 ixm1200_pci.c
--- sys/arch/evbarm/ixm1200/ixm1200_pci.c 4 Apr 2011 20:37:48 -0000
1.8
+++ sys/arch/evbarm/ixm1200/ixm1200_pci.c 25 May 2011 22:28:47 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_pci.
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/ixm1200/ixm1200reg.h>
#include <evbarm/ixm1200/ixm1200var.h>
Index: sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c,v
retrieving revision 1.8
diff -u -p -r1.8 ixp12x0_mainbus.c
--- sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c 21 Oct 2009 14:15:51 -0000
1.8
+++ sys/arch/evbarm/ixm1200/ixp12x0_mainbus.c 25 May 2011 22:28:47 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_main
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/ixm1200/ixm1200reg.h>
#include <evbarm/ixm1200/ixm1200var.h>
Index: sys/arch/evbarm/ixm1200/ixpcom_ixm.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixm1200/ixpcom_ixm.c,v
retrieving revision 1.8
diff -u -p -r1.8 ixpcom_ixm.c
--- sys/arch/evbarm/ixm1200/ixpcom_ixm.c 21 Oct 2009 14:15:51 -0000
1.8
+++ sys/arch/evbarm/ixm1200/ixpcom_ixm.c 25 May 2011 22:28:47 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixpcom_ixm.c
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0_comreg.h>
#include <arm/ixp12x0/ixp12x0_comvar.h>
Index: sys/arch/evbarm/ixm1200/nappi_nppb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixm1200/nappi_nppb.c,v
retrieving revision 1.7
diff -u -p -r1.7 nappi_nppb.c
--- sys/arch/evbarm/ixm1200/nappi_nppb.c 21 Oct 2009 14:15:51 -0000
1.7
+++ sys/arch/evbarm/ixm1200/nappi_nppb.c 25 May 2011 22:28:47 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: nappi_nppb.c
#include <sys/extent.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/evbarm/ixm1200/nappi_nr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/ixm1200/nappi_nr.c,v
retrieving revision 1.8
diff -u -p -r1.8 nappi_nr.c
--- sys/arch/evbarm/ixm1200/nappi_nr.c 28 Apr 2008 20:23:17 -0000 1.8
+++ sys/arch/evbarm/ixm1200/nappi_nr.c 25 May 2011 22:28:47 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: nappi_nr.c,v
#include <sys/kernel.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixpsipvar.h>
Index: sys/arch/evbarm/lubbock/if_sm_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/if_sm_obio.c,v
retrieving revision 1.3
diff -u -p -r1.3 if_sm_obio.c
--- sys/arch/evbarm/lubbock/if_sm_obio.c 29 May 2009 14:15:44 -0000
1.3
+++ sys/arch/evbarm/lubbock/if_sm_obio.c 25 May 2011 22:28:47 -0000
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sm_obio.c
#include <net/if_media.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
Index: sys/arch/evbarm/lubbock/lubbock_lcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/lubbock_lcd.c,v
retrieving revision 1.11
diff -u -p -r1.11 lubbock_lcd.c
--- sys/arch/evbarm/lubbock/lubbock_lcd.c 13 Mar 2010 11:15:52 -0000
1.11
+++ sys/arch/evbarm/lubbock/lubbock_lcd.c 25 May 2011 22:28:47 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_lcd.
#include <dev/wscons/wsdisplayvar.h>
#include <dev/wscons/wscons_callbacks.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0var.h>
#include <arm/xscale/pxa2x0reg.h>
#include <arm/xscale/pxa2x0_lcd.h>
Index: sys/arch/evbarm/lubbock/lubbock_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/lubbock_machdep.c,v
retrieving revision 1.26
diff -u -p -r1.26 lubbock_machdep.c
--- sys/arch/evbarm/lubbock/lubbock_machdep.c 28 Nov 2010 08:23:24 -0000
1.26
+++ sys/arch/evbarm/lubbock/lubbock_machdep.c 25 May 2011 22:28:47 -0000
@@ -147,7 +147,7 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_mach
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/lubbock/lubbock_pcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/lubbock/lubbock_pcic.c,v
retrieving revision 1.6
diff -u -p -r1.6 lubbock_pcic.c
--- sys/arch/evbarm/lubbock/lubbock_pcic.c 13 Mar 2010 11:13:31 -0000
1.6
+++ sys/arch/evbarm/lubbock/lubbock_pcic.c 25 May 2011 22:28:47 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: lubbock_pcic
#include <sys/kthread.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciachip.h>
#include <dev/pcmcia/pcmciavar.h>
Index: sys/arch/cobalt/cobalt/console.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/cobalt/console.c,v
retrieving revision 1.11
diff -u -p -r1.11 console.c
--- sys/arch/cobalt/cobalt/console.c 27 Mar 2008 15:21:46 -0000 1.11
+++ sys/arch/cobalt/cobalt/console.c 25 May 2011 22:28:45 -0000
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: console.c,v
#include <sys/device.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/nvram.h>
#include <machine/bootinfo.h>
Index: sys/arch/cobalt/cobalt/interrupt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/cobalt/interrupt.c,v
retrieving revision 1.6
diff -u -p -r1.6 interrupt.c
--- sys/arch/cobalt/cobalt/interrupt.c 20 Feb 2011 07:54:10 -0000 1.6
+++ sys/arch/cobalt/cobalt/interrupt.c 25 May 2011 22:28:45 -0000
@@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: interrupt.c,
#include <sys/intr.h>
#include <mips/mips3_clock.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/i8259reg.h>
#include <dev/isa/isareg.h>
Index: sys/arch/cobalt/dev/com_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/dev/com_mainbus.c,v
retrieving revision 1.17
diff -u -p -r1.17 com_mainbus.c
--- sys/arch/cobalt/dev/com_mainbus.c 27 Mar 2008 15:21:46 -0000 1.17
+++ sys/arch/cobalt/dev/com_mainbus.c 25 May 2011 22:28:45 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_mainbus.
#include <machine/autoconf.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/cobalt/dev/gt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/dev/gt.c,v
retrieving revision 1.25
diff -u -p -r1.25 gt.c
--- sys/arch/cobalt/dev/gt.c 17 May 2011 17:34:48 -0000 1.25
+++ sys/arch/cobalt/dev/gt.c 25 May 2011 22:28:45 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.25
#include <sys/extent.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <mips/cache.h>
Index: sys/arch/cobalt/dev/mcclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/dev/mcclock.c,v
retrieving revision 1.4
diff -u -p -r1.4 mcclock.c
--- sys/arch/cobalt/dev/mcclock.c 29 Mar 2008 05:42:45 -0000 1.4
+++ sys/arch/cobalt/dev/mcclock.c 25 May 2011 22:28:45 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock.c,v
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: sys/arch/cobalt/dev/panel.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/dev/panel.c,v
retrieving revision 1.21
diff -u -p -r1.21 panel.c
--- sys/arch/cobalt/dev/panel.c 3 May 2011 09:15:20 -0000 1.21
+++ sys/arch/cobalt/dev/panel.c 25 May 2011 22:28:45 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: panel.c,v 1.
#include <sys/select.h>
#include <sys/reboot.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/ic/hd44780reg.h>
Index: sys/arch/cobalt/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/include/autoconf.h,v
retrieving revision 1.5
diff -u -p -r1.5 autoconf.h
--- sys/arch/cobalt/include/autoconf.h 17 Dec 2009 15:29:47 -0000 1.5
+++ sys/arch/cobalt/include/autoconf.h 25 May 2011 22:28:45 -0000
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct mainbus_attach_args {
const char *ma_name;
cvs diff: cannot find sys/arch/cobalt/include/bus.h
Index: sys/arch/cobalt/pci/pchb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/pci/pchb.c,v
retrieving revision 1.10
diff -u -p -r1.10 pchb.c
--- sys/arch/cobalt/pci/pchb.c 9 May 2008 10:59:55 -0000 1.10
+++ sys/arch/cobalt/pci/pchb.c 25 May 2011 22:28:45 -0000
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: pchb.c,v 1.1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/cobalt/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/pci/pci_machdep.c,v
retrieving revision 1.30
diff -u -p -r1.30 pci_machdep.c
--- sys/arch/cobalt/pci/pci_machdep.c 3 May 2011 09:15:20 -0000 1.30
+++ sys/arch/cobalt/pci/pci_machdep.c 25 May 2011 22:28:45 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/extent.h>
#define _COBALT_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/cobalt/pci/pcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cobalt/pci/pcib.c,v
retrieving revision 1.19
diff -u -p -r1.19 pcib.c
--- sys/arch/cobalt/pci/pcib.c 9 May 2008 10:59:55 -0000 1.19
+++ sys/arch/cobalt/pci/pcib.c 25 May 2011 22:28:45 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.1
#include <sys/malloc.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/evbarm/adi_brh/becc_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/adi_brh/becc_mainbus.c,v
retrieving revision 1.3
diff -u -p -r1.3 becc_mainbus.c
--- sys/arch/evbarm/adi_brh/becc_mainbus.c 11 Dec 2005 12:17:06 -0000
1.3
+++ sys/arch/evbarm/adi_brh/becc_mainbus.c 25 May 2011 22:28:45 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: becc_mainbus
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/adi_brh/brhreg.h>
#include <evbarm/adi_brh/brhvar.h>
Index: sys/arch/evbarm/adi_brh/brh_7seg.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/adi_brh/brh_7seg.c,v
retrieving revision 1.4
diff -u -p -r1.4 brh_7seg.c
--- sys/arch/evbarm/adi_brh/brh_7seg.c 24 Dec 2005 20:06:59 -0000 1.4
+++ sys/arch/evbarm/adi_brh/brh_7seg.c 25 May 2011 22:28:45 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: brh_7seg.c,v
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <evbarm/adi_brh/brhreg.h>
#include <evbarm/adi_brh/brhvar.h>
Index: sys/arch/evbarm/adi_brh/brh_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/adi_brh/brh_machdep.c,v
retrieving revision 1.36
diff -u -p -r1.36 brh_machdep.c
--- sys/arch/evbarm/adi_brh/brh_machdep.c 26 Dec 2009 16:01:23 -0000
1.36
+++ sys/arch/evbarm/adi_brh/brh_machdep.c 25 May 2011 22:28:45 -0000
@@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: brh_machdep.
#include <ddb/db_extern.h>
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/adi_brh/com_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/adi_brh/com_obio.c,v
retrieving revision 1.6
diff -u -p -r1.6 com_obio.c
--- sys/arch/evbarm/adi_brh/com_obio.c 28 Apr 2008 20:23:16 -0000 1.6
+++ sys/arch/evbarm/adi_brh/com_obio.c 25 May 2011 22:28:45 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_obio.c,v
#include <sys/device.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/beccreg.h>
#include <arm/xscale/beccvar.h>
Index: sys/arch/evbarm/adi_brh/obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/adi_brh/obio.c,v
retrieving revision 1.9
diff -u -p -r1.9 obio.c
--- sys/arch/evbarm/adi_brh/obio.c 11 Dec 2005 12:17:06 -0000 1.9
+++ sys/arch/evbarm/adi_brh/obio.c 25 May 2011 22:28:45 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.9
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/beccreg.h>
#include <arm/xscale/beccvar.h>
Index: sys/arch/evbarm/adi_brh/obio_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/adi_brh/obio_space.c,v
retrieving revision 1.6
diff -u -p -r1.6 obio_space.c
--- sys/arch/evbarm/adi_brh/obio_space.c 7 Nov 2009 07:27:42 -0000
1.6
+++ sys/arch/evbarm/adi_brh/obio_space.c 25 May 2011 22:28:45 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_space.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(obio);
Index: sys/arch/evbarm/armadillo/armadillo9_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/armadillo/armadillo9_com.c,v
retrieving revision 1.3
diff -u -p -r1.3 armadillo9_com.c
--- sys/arch/evbarm/armadillo/armadillo9_com.c 21 Oct 2009 14:15:51 -0000
1.3
+++ sys/arch/evbarm/armadillo/armadillo9_com.c 25 May 2011 22:28:45 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_c
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epcomreg.h>
#include <arm/ep93xx/epcomvar.h>
Index: sys/arch/evbarm/armadillo/armadillo9_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/armadillo/armadillo9_machdep.c,v
retrieving revision 1.19
diff -u -p -r1.19 armadillo9_machdep.c
--- sys/arch/evbarm/armadillo/armadillo9_machdep.c 22 Jan 2010 08:56:04
-0000 1.19
+++ sys/arch/evbarm/armadillo/armadillo9_machdep.c 25 May 2011 22:28:45
-0000
@@ -141,7 +141,7 @@ __KERNEL_RCSID(0, "$NetBSD: armadillo9_m
#define DRAM_BLOCKS 4
#include <machine/bootconfig.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/evbarm/beagle/beagle_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/evbarm/beagle/beagle_machdep.c,v
retrieving revision 1.11
diff -u -p -r1.11 beagle_machdep.c
--- sys/arch/evbarm/beagle/beagle_machdep.c 28 Nov 2010 08:23:22 -0000
1.11
+++ sys/arch/evbarm/beagle/beagle_machdep.c 25 May 2011 22:28:46 -0000
@@ -161,7 +161,7 @@ __KERNEL_RCSID(0, "$NetBSD: beagle_machd
#endif
#include <machine/bootconfig.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/armreg.h>
Index: sys/arch/arm/xscale/i80321_timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_timer.c,v
retrieving revision 1.19
diff -u -p -r1.19 i80321_timer.c
--- sys/arch/arm/xscale/i80321_timer.c 27 Apr 2008 18:58:45 -0000 1.19
+++ sys/arch/arm/xscale/i80321_timer.c 25 May 2011 22:28:44 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_timer
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/xscale/i80321reg.h>
Index: sys/arch/arm/xscale/i80321_wdog.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_wdog.c,v
retrieving revision 1.8
diff -u -p -r1.8 i80321_wdog.c
--- sys/arch/arm/xscale/i80321_wdog.c 24 Dec 2005 20:06:52 -0000 1.8
+++ sys/arch/arm/xscale/i80321_wdog.c 25 May 2011 22:28:44 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_wdog.
#include <sys/device.h>
#include <sys/wdog.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/xscale/i80321reg.h>
Index: sys/arch/arm/xscale/iopi2c.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/iopi2c.c,v
retrieving revision 1.5
diff -u -p -r1.5 iopi2c.c
--- sys/arch/arm/xscale/iopi2c.c 6 Dec 2007 17:00:32 -0000 1.5
+++ sys/arch/arm/xscale/iopi2c.c 25 May 2011 22:28:44 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: iopi2c.c,v 1
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/i2c/i2cvar.h>
Index: sys/arch/arm/xscale/ixp425.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425.c,v
retrieving revision 1.14
diff -u -p -r1.14 ixp425.c
--- sys/arch/arm/xscale/ixp425.c 17 May 2011 17:34:48 -0000 1.14
+++ sys/arch/arm/xscale/ixp425.c 25 May 2011 22:28:44 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425.c,v 1
#include <sys/device.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/arm/xscale/ixp425_a4x_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_a4x_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 ixp425_a4x_space.c
--- sys/arch/arm/xscale/ixp425_a4x_space.c 11 Dec 2005 12:16:51 -0000
1.2
+++ sys/arch/arm/xscale/ixp425_a4x_space.c 25 May 2011 22:28:44 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_a4x_s
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(ixp425);
Index: sys/arch/arm/xscale/ixp425_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_com.c,v
retrieving revision 1.17
diff -u -p -r1.17 ixp425_com.c
--- sys/arch/arm/xscale/ixp425_com.c 14 Mar 2008 15:09:09 -0000 1.17
+++ sys/arch/arm/xscale/ixp425_com.c 25 May 2011 22:28:44 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_com.c
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/arm/xscale/ixp425_if_npe.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_if_npe.c,v
retrieving revision 1.19
diff -u -p -r1.19 ixp425_if_npe.c
--- sys/arch/arm/xscale/ixp425_if_npe.c 5 Apr 2010 07:19:29 -0000 1.19
+++ sys/arch/arm/xscale/ixp425_if_npe.c 25 May 2011 22:28:44 -0000
@@ -61,7 +61,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_if_np
#include <sys/ioctl.h>
#include <sys/syslog.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <net/if.h>
#include <net/if_dl.h>
Index: sys/arch/arm/xscale/ixp425_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_intr.c,v
retrieving revision 1.22
diff -u -p -r1.22 ixp425_intr.c
--- sys/arch/arm/xscale/ixp425_intr.c 20 Dec 2010 00:25:29 -0000 1.22
+++ sys/arch/arm/xscale/ixp425_intr.c 25 May 2011 22:28:44 -0000
@@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_intr.
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/xscale/ixp425_ixme.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_ixme.c,v
retrieving revision 1.2
diff -u -p -r1.2 ixp425_ixme.c
--- sys/arch/arm/xscale/ixp425_ixme.c 28 Apr 2008 20:23:14 -0000 1.2
+++ sys/arch/arm/xscale/ixp425_ixme.c 25 May 2011 22:28:44 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_ixme.
#include <sys/device.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425var.h>
#include <arm/xscale/ixp425_qmgr.h>
Index: sys/arch/arm/xscale/ixp425_npe.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_npe.c,v
retrieving revision 1.7
diff -u -p -r1.7 ixp425_npe.c
--- sys/arch/arm/xscale/ixp425_npe.c 13 May 2011 22:28:40 -0000 1.7
+++ sys/arch/arm/xscale/ixp425_npe.c 25 May 2011 22:28:44 -0000
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_npe.c
#include <dev/firmload.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
Index: sys/arch/arm/xscale/ixp425_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_pci.c,v
retrieving revision 1.6
diff -u -p -r1.6 ixp425_pci.c
--- sys/arch/arm/xscale/ixp425_pci.c 21 Oct 2009 14:15:50 -0000 1.6
+++ sys/arch/arm/xscale/ixp425_pci.c 25 May 2011 22:28:44 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_pci.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/arm/xscale/ixp425_pci_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_pci_dma.c,v
retrieving revision 1.4
diff -u -p -r1.4 ixp425_pci_dma.c
--- sys/arch/arm/xscale/ixp425_pci_dma.c 21 Oct 2009 14:15:50 -0000
1.4
+++ sys/arch/arm/xscale/ixp425_pci_dma.c 25 May 2011 22:28:44 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_pci_d
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/arm/xscale/ixp425_pci_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_pci_space.c,v
retrieving revision 1.8
diff -u -p -r1.8 ixp425_pci_space.c
--- sys/arch/arm/xscale/ixp425_pci_space.c 7 Nov 2009 07:27:42 -0000
1.8
+++ sys/arch/arm/xscale/ixp425_pci_space.c 25 May 2011 22:28:44 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_pci_s
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/arm/xscale/ixp425_qmgr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_qmgr.c,v
retrieving revision 1.6
diff -u -p -r1.6 ixp425_qmgr.c
--- sys/arch/arm/xscale/ixp425_qmgr.c 5 Mar 2009 01:48:58 -0000 1.6
+++ sys/arch/arm/xscale/ixp425_qmgr.c 25 May 2011 22:28:44 -0000
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.
#include <sys/malloc.h>
#include <sys/resource.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
Index: sys/arch/arm/xscale/ixp425_sip.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_sip.c,v
retrieving revision 1.11
diff -u -p -r1.11 ixp425_sip.c
--- sys/arch/arm/xscale/ixp425_sip.c 21 Oct 2009 14:15:50 -0000 1.11
+++ sys/arch/arm/xscale/ixp425_sip.c 25 May 2011 22:28:44 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_sip.c
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425var.h>
#include <arm/xscale/ixp425_sipvar.h>
Index: sys/arch/arm/xscale/ixp425_sipvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_sipvar.h,v
retrieving revision 1.5
diff -u -p -r1.5 ixp425_sipvar.h
--- sys/arch/arm/xscale/ixp425_sipvar.h 21 Oct 2009 14:15:50 -0000 1.5
+++ sys/arch/arm/xscale/ixp425_sipvar.h 25 May 2011 22:28:44 -0000
@@ -33,7 +33,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct ixpsip_softc {
struct device sc_dev;
Index: sys/arch/arm/xscale/ixp425_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_space.c,v
retrieving revision 1.7
diff -u -p -r1.7 ixp425_space.c
--- sys/arch/arm/xscale/ixp425_space.c 21 Oct 2009 14:15:51 -0000 1.7
+++ sys/arch/arm/xscale/ixp425_space.c 25 May 2011 22:28:44 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_space
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/arm/xscale/ixp425_timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_timer.c,v
retrieving revision 1.15
diff -u -p -r1.15 ixp425_timer.c
--- sys/arch/arm/xscale/ixp425_timer.c 21 Oct 2009 14:15:51 -0000 1.15
+++ sys/arch/arm/xscale/ixp425_timer.c 25 May 2011 22:28:44 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_timer
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/xscale/ixp425_wdog.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425_wdog.c,v
retrieving revision 1.2
diff -u -p -r1.2 ixp425_wdog.c
--- sys/arch/arm/xscale/ixp425_wdog.c 28 Apr 2008 20:23:14 -0000 1.2
+++ sys/arch/arm/xscale/ixp425_wdog.c 25 May 2011 22:28:44 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_wdog.
#include <dev/sysmon/sysmonvar.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/ixp425reg.h>
#include <arm/xscale/ixp425var.h>
Index: sys/arch/arm/xscale/ixp425var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/ixp425var.h,v
retrieving revision 1.12
diff -u -p -r1.12 ixp425var.h
--- sys/arch/arm/xscale/ixp425var.h 21 Oct 2009 14:15:51 -0000 1.12
+++ sys/arch/arm/xscale/ixp425var.h 25 May 2011 22:28:44 -0000
@@ -34,7 +34,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/arm/xscale/pxa2x0.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0.c,v
retrieving revision 1.18
diff -u -p -r1.18 pxa2x0.c
--- sys/arch/arm/xscale/pxa2x0.c 9 Aug 2009 06:12:33 -0000 1.18
+++ sys/arch/arm/xscale/pxa2x0.c 25 May 2011 22:28:44 -0000
@@ -116,7 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0.c,v 1
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/xscale/pxa2x0_a4x_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_a4x_space.c,v
retrieving revision 1.4
diff -u -p -r1.4 pxa2x0_a4x_space.c
--- sys/arch/arm/xscale/pxa2x0_a4x_space.c 28 Jul 2006 08:15:29 -0000
1.4
+++ sys/arch/arm/xscale/pxa2x0_a4x_space.c 25 May 2011 22:28:44 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_a4x_s
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(pxa2x0);
Index: sys/arch/arm/xscale/pxa2x0_ac97.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_ac97.c,v
retrieving revision 1.7
diff -u -p -r1.7 pxa2x0_ac97.c
--- sys/arch/arm/xscale/pxa2x0_ac97.c 17 Oct 2007 19:53:44 -0000 1.7
+++ sys/arch/arm/xscale/pxa2x0_ac97.c 25 May 2011 22:28:44 -0000
@@ -44,7 +44,7 @@
#include <sys/audioio.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/audio_if.h>
#include <dev/audiovar.h>
Index: sys/arch/arm/xscale/pxa2x0_apm.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_apm.h,v
retrieving revision 1.1
diff -u -p -r1.1 pxa2x0_apm.h
--- sys/arch/arm/xscale/pxa2x0_apm.h 6 Dec 2008 22:11:19 -0000 1.1
+++ sys/arch/arm/xscale/pxa2x0_apm.h 25 May 2011 22:28:44 -0000
@@ -22,7 +22,7 @@
#include <sys/event.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/apmvar.h>
struct pxa2x0_apm_softc {
Index: sys/arch/arm/xscale/pxa2x0_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_com.c,v
retrieving revision 1.12
diff -u -p -r1.12 pxa2x0_com.c
--- sys/arch/arm/xscale/pxa2x0_com.c 6 Dec 2009 12:27:33 -0000 1.12
+++ sys/arch/arm/xscale/pxa2x0_com.c 25 May 2011 22:28:44 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_com.c
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/arm/xscale/pxa2x0_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_dma.c,v
retrieving revision 1.4
diff -u -p -r1.4 pxa2x0_dma.c
--- sys/arch/arm/xscale/pxa2x0_dma.c 11 Dec 2005 12:16:51 -0000 1.4
+++ sys/arch/arm/xscale/pxa2x0_dma.c 25 May 2011 22:28:44 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_dma.c
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arm32_bus_dma_tag pxa2x0_bus_dma_tag = {
0,
Index: sys/arch/arm/xscale/pxa2x0_dmac.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_dmac.c,v
retrieving revision 1.6
diff -u -p -r1.6 pxa2x0_dmac.c
--- sys/arch/arm/xscale/pxa2x0_dmac.c 16 Mar 2009 11:42:31 -0000 1.6
+++ sys/arch/arm/xscale/pxa2x0_dmac.c 25 May 2011 22:28:44 -0000
@@ -47,7 +47,7 @@
#include <uvm/uvm_param.h> /* For PAGE_SIZE */
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/dmover/dmovervar.h>
Index: sys/arch/arm/xscale/pxa2x0_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_gpio.c,v
retrieving revision 1.13
diff -u -p -r1.13 pxa2x0_gpio.c
--- sys/arch/arm/xscale/pxa2x0_gpio.c 4 Aug 2009 12:11:33 -0000 1.13
+++ sys/arch/arm/xscale/pxa2x0_gpio.c 25 May 2011 22:28:44 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_gpio.
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0cpu.h>
#include <arm/xscale/pxa2x0reg.h>
Index: sys/arch/arm/xscale/pxa2x0_i2c.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_i2c.c,v
retrieving revision 1.4
diff -u -p -r1.4 pxa2x0_i2c.c
--- sys/arch/arm/xscale/pxa2x0_i2c.c 20 Apr 2009 12:55:02 -0000 1.4
+++ sys/arch/arm/xscale/pxa2x0_i2c.c 25 May 2011 22:28:44 -0000
@@ -24,7 +24,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2c.c
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0reg.h>
#include <arm/xscale/pxa2x0var.h>
Index: sys/arch/arm/xscale/pxa2x0_i2c.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_i2c.h,v
retrieving revision 1.2
diff -u -p -r1.2 pxa2x0_i2c.h
--- sys/arch/arm/xscale/pxa2x0_i2c.h 20 Apr 2009 12:55:02 -0000 1.2
+++ sys/arch/arm/xscale/pxa2x0_i2c.h 25 May 2011 22:28:44 -0000
@@ -20,7 +20,7 @@
#ifndef _PXA2X0_I2C_H_
#define _PXA2X0_I2C_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct pxa2x0_i2c_softc {
struct device sc_dev;
Index: sys/arch/arm/xscale/pxa2x0_i2s.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_i2s.c,v
retrieving revision 1.8
diff -u -p -r1.8 pxa2x0_i2s.c
--- sys/arch/arm/xscale/pxa2x0_i2s.c 13 Mar 2009 13:55:18 -0000 1.8
+++ sys/arch/arm/xscale/pxa2x0_i2s.c 25 May 2011 22:28:44 -0000
@@ -25,7 +25,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_i2s.c
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0reg.h>
#include <arm/xscale/pxa2x0var.h>
Index: sys/arch/arm/xscale/pxa2x0_i2s.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_i2s.h,v
retrieving revision 1.1
diff -u -p -r1.1 pxa2x0_i2s.h
--- sys/arch/arm/xscale/pxa2x0_i2s.h 17 Dec 2006 16:03:33 -0000 1.1
+++ sys/arch/arm/xscale/pxa2x0_i2s.h 25 May 2011 22:28:44 -0000
@@ -20,7 +20,7 @@
#ifndef _PXA2X0_I2S_H_
#define _PXA2X0_I2S_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct pxa2x0_i2s_dma;
struct audio_params;
Index: sys/arch/arm/xscale/pxa2x0_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_intr.c,v
retrieving revision 1.17
diff -u -p -r1.17 pxa2x0_intr.c
--- sys/arch/arm/xscale/pxa2x0_intr.c 13 Jun 2010 02:11:23 -0000 1.17
+++ sys/arch/arm/xscale/pxa2x0_intr.c 25 May 2011 22:28:44 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/lock.h>
Index: sys/arch/arm/xscale/pxa2x0_lcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_lcd.c,v
retrieving revision 1.31
diff -u -p -r1.31 pxa2x0_lcd.c
--- sys/arch/arm/xscale/pxa2x0_lcd.c 14 May 2011 14:00:03 -0000 1.31
+++ sys/arch/arm/xscale/pxa2x0_lcd.c 25 May 2011 22:28:44 -0000
@@ -58,7 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_lcd.c
#include <dev/rasops/rasops.h>
#include <dev/wsfont/wsfont.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/xscale/pxa2x0_lcd.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_lcd.h,v
retrieving revision 1.9
diff -u -p -r1.9 pxa2x0_lcd.h
--- sys/arch/arm/xscale/pxa2x0_lcd.h 29 Jan 2009 12:28:15 -0000 1.9
+++ sys/arch/arm/xscale/pxa2x0_lcd.h 25 May 2011 22:28:44 -0000
@@ -37,7 +37,7 @@
#define _ARM_XSCALE_PXA2X0_LCD_H
#include <dev/rasops/rasops.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* LCD Contoroller */
Index: sys/arch/arm/xscale/pxa2x0_ohci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_ohci.c,v
retrieving revision 1.7
diff -u -p -r1.7 pxa2x0_ohci.c
--- sys/arch/arm/xscale/pxa2x0_ohci.c 10 Aug 2009 23:08:12 -0000 1.7
+++ sys/arch/arm/xscale/pxa2x0_ohci.c 25 May 2011 22:28:44 -0000
@@ -23,7 +23,7 @@
#include <sys/kernel.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
Index: sys/arch/arm/xscale/pxa2x0_pcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_pcic.c,v
retrieving revision 1.8
diff -u -p -r1.8 pxa2x0_pcic.c
--- sys/arch/arm/xscale/pxa2x0_pcic.c 2 Mar 2009 10:17:58 -0000 1.8
+++ sys/arch/arm/xscale/pxa2x0_pcic.c 25 May 2011 22:28:44 -0000
@@ -29,7 +29,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_pcic.
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pcmcia/pcmciareg.h>
Index: sys/arch/arm/xscale/pxa2x0_rtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_rtc.c,v
retrieving revision 1.4
diff -u -p -r1.4 pxa2x0_rtc.c
--- sys/arch/arm/xscale/pxa2x0_rtc.c 14 May 2011 15:01:50 -0000 1.4
+++ sys/arch/arm/xscale/pxa2x0_rtc.c 25 May 2011 22:28:44 -0000
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_rtc.c
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0cpu.h>
#include <arm/xscale/pxa2x0reg.h>
Index: sys/arch/arm/xscale/pxa2x0_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_space.c,v
retrieving revision 1.9
diff -u -p -r1.9 pxa2x0_space.c
--- sys/arch/arm/xscale/pxa2x0_space.c 7 Nov 2009 07:27:42 -0000 1.9
+++ sys/arch/arm/xscale/pxa2x0_space.c 25 May 2011 22:28:44 -0000
@@ -83,7 +83,7 @@ __KERNEL_RCSID(0, "$NetBSD: pxa2x0_space
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(pxa2x0);
Index: sys/arch/arm/xscale/pxa2x0_udc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/pxa2x0_udc.c,v
retrieving revision 1.3
diff -u -p -r1.3 pxa2x0_udc.c
--- sys/arch/arm/xscale/pxa2x0_udc.c 9 Aug 2009 06:24:03 -0000 1.3
+++ sys/arch/arm/xscale/pxa2x0_udc.c 25 May 2011 22:28:45 -0000
@@ -23,7 +23,7 @@
#include <sys/kernel.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/pxa2x0cpu.h>
#include <arm/xscale/pxa2x0reg.h>
Index: sys/arch/atari/atari/be_bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/be_bus.c,v
retrieving revision 1.14
diff -u -p -r1.14 be_bus.c
--- sys/arch/atari/atari/be_bus.c 31 Mar 2010 13:15:52 -0000 1.14
+++ sys/arch/atari/atari/be_bus.c 25 May 2011 22:28:45 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1
#include <sys/systm.h>
#include <sys/malloc.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* This file contains the common functions for using a big endian (linear)
Index: sys/arch/atari/atari/bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/bus.c,v
retrieving revision 1.55
diff -u -p -r1.55 bus.c
--- sys/arch/atari/atari/bus.c 6 Nov 2010 11:46:00 -0000 1.55
+++ sys/arch/atari/atari/bus.c 25 May 2011 22:28:45 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.55
#include <machine/cpu.h>
#include <m68k/cacheops.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
int bus_dmamem_alloc_range(bus_dma_tag_t tag, bus_size_t size,
bus_size_t alignment, bus_size_t boundary,
Index: sys/arch/atari/atari/le_bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/le_bus.c,v
retrieving revision 1.17
diff -u -p -r1.17 le_bus.c
--- sys/arch/atari/atari/le_bus.c 18 Mar 2009 16:00:10 -0000 1.17
+++ sys/arch/atari/atari/le_bus.c 25 May 2011 22:28:45 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1
#include <sys/malloc.h>
#include <sys/bswap.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* This file contains the common functions for using a litte endian (linear)
Index: sys/arch/atari/atari/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/atari/mainbus.c,v
retrieving revision 1.10
diff -u -p -r1.10 mainbus.c
--- sys/arch/atari/atari/mainbus.c 8 Mar 2009 05:25:31 -0000 1.10
+++ sys/arch/atari/atari/mainbus.c 25 May 2011 22:28:45 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/systm.h>
#include <sys/malloc.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
static int mb_bus_space_peek_1(bus_space_tag_t,
bus_space_handle_t, bus_size_t);
Index: sys/arch/atari/dev/hdfd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/hdfd.c,v
retrieving revision 1.73
diff -u -p -r1.73 hdfd.c
--- sys/arch/atari/dev/hdfd.c 13 Apr 2010 11:31:11 -0000 1.73
+++ sys/arch/atari/dev/hdfd.c 25 May 2011 22:28:45 -0000
@@ -117,7 +117,7 @@ __KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.7
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <machine/intr.h>
Index: sys/arch/atari/dev/wdc_mb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/dev/wdc_mb.c,v
retrieving revision 1.34
diff -u -p -r1.34 wdc_mb.c
--- sys/arch/atari/dev/wdc_mb.c 8 Mar 2009 05:25:31 -0000 1.34
+++ sys/arch/atari/dev/wdc_mb.c 25 May 2011 22:28:45 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1
#include <sys/bswap.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
#include <machine/dma.h>
cvs diff: cannot find sys/arch/atari/include/bus.h
Index: sys/arch/atari/include/isa_machdep.h
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/include/isa_machdep.h,v
retrieving revision 1.15
diff -u -p -r1.15 isa_machdep.h
--- sys/arch/atari/include/isa_machdep.h 20 Oct 2009 19:10:11 -0000
1.15
+++ sys/arch/atari/include/isa_machdep.h 25 May 2011 22:28:45 -0000
@@ -57,7 +57,7 @@
#ifndef _ATARI_ISA_MACHDEP_H_
#define _ATARI_ISA_MACHDEP_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/atari/isa/fdcisa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/isa/fdcisa.c,v
retrieving revision 1.13
diff -u -p -r1.13 fdcisa.c
--- sys/arch/atari/isa/fdcisa.c 28 Apr 2008 20:23:15 -0000 1.13
+++ sys/arch/atari/isa/fdcisa.c 25 May 2011 22:28:45 -0000
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdcisa.c,v 1
#include <sys/callout.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isadmavar.h>
Index: sys/arch/atari/isa/isa_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/isa/isa_dma.c,v
retrieving revision 1.9
diff -u -p -r1.9 isa_dma.c
--- sys/arch/atari/isa/isa_dma.c 14 Mar 2009 21:04:06 -0000 1.9
+++ sys/arch/atari/isa/isa_dma.c 25 May 2011 22:28:45 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_dma.c,v
#include <sys/mbuf.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/atari/isa/isa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/isa/isa_machdep.c,v
retrieving revision 1.37
diff -u -p -r1.37 isa_machdep.c
--- sys/arch/atari/isa/isa_machdep.c 13 Apr 2010 11:31:11 -0000 1.37
+++ sys/arch/atari/isa/isa_machdep.c 25 May 2011 22:28:45 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.
#include <sys/device.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
#include <dev/isa/isareg.h>
Index: sys/arch/atari/isa/isapnp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/isa/isapnp_machdep.c,v
retrieving revision 1.9
diff -u -p -r1.9 isapnp_machdep.c
--- sys/arch/atari/isa/isapnp_machdep.c 21 Oct 2009 21:57:39 -0000 1.9
+++ sys/arch/atari/isa/isapnp_machdep.c 25 May 2011 22:28:45 -0000
@@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp_machd
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/atari/pci/pci_hades.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/pci/pci_hades.c,v
retrieving revision 1.11
diff -u -p -r1.11 pci_hades.c
--- sys/arch/atari/pci/pci_hades.c 16 Mar 2009 23:11:10 -0000 1.11
+++ sys/arch/atari/pci/pci_hades.c 25 May 2011 22:28:45 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_hades.c,
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/atari/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/pci/pci_machdep.c,v
retrieving revision 1.50
diff -u -p -r1.50 pci_machdep.c
--- sys/arch/atari/pci/pci_machdep.c 17 May 2011 17:34:48 -0000 1.50
+++ sys/arch/atari/pci/pci_machdep.c 25 May 2011 22:28:45 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <sys/malloc.h>
#define _ATARI_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/atari/vme/if_le_vme.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/vme/if_le_vme.c,v
retrieving revision 1.30
diff -u -p -r1.30 if_le_vme.c
--- sys/arch/atari/vme/if_le_vme.c 13 Apr 2010 11:31:11 -0000 1.30
+++ sys/arch/atari/vme/if_le_vme.c 25 May 2011 22:28:45 -0000
@@ -95,7 +95,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_vme.c,
#endif
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/scu.h>
#include <machine/intr.h>
Index: sys/arch/atari/vme/leo.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/vme/leo.c,v
retrieving revision 1.17
diff -u -p -r1.17 leo.c
--- sys/arch/atari/vme/leo.c 13 Apr 2010 09:51:07 -0000 1.17
+++ sys/arch/atari/vme/leo.c 25 May 2011 22:28:45 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: leo.c,v 1.17
#include <sys/conf.h>
#include <sys/ioctl.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/iomap.h>
#include <machine/scu.h>
#include <atari/vme/vmevar.h>
Index: sys/arch/atari/vme/vme_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/vme/vme_machdep.c,v
retrieving revision 1.19
diff -u -p -r1.19 vme_machdep.c
--- sys/arch/atari/vme/vme_machdep.c 13 Apr 2010 11:31:11 -0000 1.19
+++ sys/arch/atari/vme/vme_machdep.c 25 May 2011 22:28:45 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: vme_machdep.
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/iomap.h>
#include <machine/mfp.h>
Index: sys/arch/atari/vme/vmevar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/vme/vmevar.h,v
retrieving revision 1.6
diff -u -p -r1.6 vmevar.h
--- sys/arch/atari/vme/vmevar.h 28 Apr 2008 20:23:15 -0000 1.6
+++ sys/arch/atari/vme/vmevar.h 25 May 2011 22:28:45 -0000
@@ -30,7 +30,7 @@
* Definitions for VME autoconfiguration.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Structures and definitions needed by the machine-dependent header.
Index: sys/arch/bebox/bebox/cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/bebox/bebox/cpu.c,v
retrieving revision 1.9
diff -u -p -r1.9 cpu.c
--- sys/arch/bebox/bebox/cpu.c 28 Apr 2008 20:23:15 -0000 1.9
+++ sys/arch/bebox/bebox/cpu.c 25 May 2011 22:28:45 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.9
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
int cpumatch(struct device *, struct cfdata *, void *);
Index: sys/arch/bebox/bebox/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/bebox/bebox/machdep.c,v
retrieving revision 1.99
diff -u -p -r1.99 machdep.c
--- sys/arch/bebox/bebox/machdep.c 30 Oct 2010 06:11:18 -0000 1.99
+++ sys/arch/bebox/bebox/machdep.c 25 May 2011 22:28:45 -0000
@@ -63,7 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/bootinfo.h>
#include <machine/autoconf.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pmap.h>
#include <machine/powerpc.h>
Index: sys/arch/bebox/bebox/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/bebox/bebox/mainbus.c,v
retrieving revision 1.25
diff -u -p -r1.25 mainbus.c
--- sys/arch/bebox/bebox/mainbus.c 17 May 2011 17:34:48 -0000 1.25
+++ sys/arch/bebox/bebox/mainbus.c 25 May 2011 22:28:45 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include "pci.h"
#include "opt_pci.h"
cvs diff: cannot find sys/arch/bebox/include/bus.h
Index: sys/arch/bebox/isa/mcclock_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/bebox/isa/mcclock_isa.c,v
retrieving revision 1.4
diff -u -p -r1.4 mcclock_isa.c
--- sys/arch/bebox/isa/mcclock_isa.c 29 Mar 2008 05:42:45 -0000 1.4
+++ sys/arch/bebox/isa/mcclock_isa.c 25 May 2011 22:28:45 -0000
@@ -125,7 +125,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_isa.
#include <sys/device.h>
#include <sys/time.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/isa/isareg.h>
Index: sys/arch/bebox/pci/pci_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/bebox/pci/pci_machdep.c,v
retrieving revision 1.18
diff -u -p -r1.18 pci_machdep.c
--- sys/arch/bebox/pci/pci_machdep.c 3 Nov 2010 05:23:11 -0000 1.18
+++ sys/arch/bebox/pci/pci_machdep.c 25 May 2011 22:28:45 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include <uvm/uvm_extern.h>
#define _POWERPC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <powerpc/pio.h>
Index: sys/arch/cats/cats/cats_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cats/cats/cats_machdep.c,v
retrieving revision 1.69
diff -u -p -r1.69 cats_machdep.c
--- sys/arch/cats/cats/cats_machdep.c 28 Dec 2009 03:22:19 -0000 1.69
+++ sys/arch/cats/cats/cats_machdep.c 25 May 2011 22:28:45 -0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: cats_machdep
#include <machine/bootconfig.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <machine/intr.h>
cvs diff: cannot find sys/arch/cats/include/bus.h
Index: sys/arch/cats/pci/pcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/cats/pci/pcib.c,v
retrieving revision 1.13
diff -u -p -r1.13 pcib.c
--- sys/arch/cats/pci/pcib.c 14 Jan 2010 10:32:49 -0000 1.13
+++ sys/arch/cats/pci/pcib.c 25 May 2011 22:28:45 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/algor/algor/algor_p4032_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p4032_dma.c,v
retrieving revision 1.6
diff -u -p -r1.6 algor_p4032_dma.c
--- sys/arch/algor/algor/algor_p4032_dma.c 28 Apr 2008 20:23:10 -0000
1.6
+++ sys/arch/algor/algor/algor_p4032_dma.c 25 May 2011 22:28:38 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p4032_
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p4032reg.h>
#include <algor/algor/algor_p4032var.h>
Index: sys/arch/algor/algor/algor_p4032_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p4032_intr.c,v
retrieving revision 1.22
diff -u -p -r1.22 algor_p4032_intr.c
--- sys/arch/algor/algor/algor_p4032_intr.c 7 Apr 2011 04:01:40 -0000
1.22
+++ sys/arch/algor/algor/algor_p4032_intr.c 25 May 2011 22:28:38 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p4032_
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/algor/algor/algor_p4032var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p4032var.h,v
retrieving revision 1.6
diff -u -p -r1.6 algor_p4032var.h
--- sys/arch/algor/algor/algor_p4032var.h 20 Feb 2011 07:51:21 -0000
1.6
+++ sys/arch/algor/algor/algor_p4032var.h 25 May 2011 22:28:38 -0000
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
struct p4032_config {
Index: sys/arch/algor/algor/algor_p5064_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p5064_dma.c,v
retrieving revision 1.4
diff -u -p -r1.4 algor_p5064_dma.c
--- sys/arch/algor/algor/algor_p5064_dma.c 28 Apr 2008 20:23:10 -0000
1.4
+++ sys/arch/algor/algor/algor_p5064_dma.c 25 May 2011 22:28:38 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p5064_
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p5064reg.h>
#include <algor/algor/algor_p5064var.h>
Index: sys/arch/algor/algor/algor_p5064_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p5064_intr.c,v
retrieving revision 1.25
diff -u -p -r1.25 algor_p5064_intr.c
--- sys/arch/algor/algor/algor_p5064_intr.c 6 Apr 2011 01:25:18 -0000
1.25
+++ sys/arch/algor/algor/algor_p5064_intr.c 25 May 2011 22:28:38 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p5064_
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/algor/algor/algor_p5064var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p5064var.h,v
retrieving revision 1.7
diff -u -p -r1.7 algor_p5064var.h
--- sys/arch/algor/algor/algor_p5064var.h 20 Feb 2011 07:51:21 -0000
1.7
+++ sys/arch/algor/algor/algor_p5064var.h 25 May 2011 22:28:38 -0000
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
Index: sys/arch/algor/algor/algor_p6032_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p6032_dma.c,v
retrieving revision 1.5
diff -u -p -r1.5 algor_p6032_dma.c
--- sys/arch/algor/algor/algor_p6032_dma.c 26 Oct 2009 00:59:39 -0000
1.5
+++ sys/arch/algor/algor/algor_p6032_dma.c 25 May 2011 22:28:38 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p6032_
#include <sys/param.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <algor/algor/algor_p6032reg.h>
#include <algor/algor/algor_p6032var.h>
Index: sys/arch/algor/algor/algor_p6032_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p6032_intr.c,v
retrieving revision 1.19
diff -u -p -r1.19 algor_p6032_intr.c
--- sys/arch/algor/algor/algor_p6032_intr.c 7 Apr 2011 04:01:40 -0000
1.19
+++ sys/arch/algor/algor/algor_p6032_intr.c 25 May 2011 22:28:38 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: algor_p6032_
#include <sys/kernel.h>
#include <sys/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/algor/algor/algor_p6032var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/algor_p6032var.h,v
retrieving revision 1.3
diff -u -p -r1.3 algor_p6032var.h
--- sys/arch/algor/algor/algor_p6032var.h 5 Mar 2011 14:04:02 -0000
1.3
+++ sys/arch/algor/algor/algor_p6032var.h 25 May 2011 22:28:38 -0000
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/isa/isavar.h>
Index: sys/arch/algor/algor/autoconf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/autoconf.c,v
retrieving revision 1.18
diff -u -p -r1.18 autoconf.c
--- sys/arch/algor/algor/autoconf.c 22 Jan 2010 08:56:04 -0000 1.18
+++ sys/arch/algor/algor/autoconf.c 25 May 2011 22:28:38 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include <net/if.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/intr.h>
Index: sys/arch/algor/algor/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/bus_dma.c,v
retrieving revision 1.22
diff -u -p -r1.22 bus_dma.c
--- sys/arch/algor/algor/bus_dma.c 14 Dec 2009 00:45:59 -0000 1.22
+++ sys/arch/algor/algor/bus_dma.c 25 May 2011 22:28:38 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <mips/cache.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/locore.h>
Index: sys/arch/algor/algor/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/algor/machdep.c,v
retrieving revision 1.49
diff -u -p -r1.49 machdep.c
--- sys/arch/algor/algor/machdep.c 20 Feb 2011 07:51:21 -0000 1.49
+++ sys/arch/algor/algor/machdep.c 25 May 2011 22:28:38 -0000
@@ -107,7 +107,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <ddb/db_extern.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/pmon.h>
#include <machine/pcb.h>
Index: sys/arch/algor/dev/bonito_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/dev/bonito_mainbus.c,v
retrieving revision 1.12
diff -u -p -r1.12 bonito_mainbus.c
--- sys/arch/algor/dev/bonito_mainbus.c 17 May 2011 17:34:47 -0000 1.12
+++ sys/arch/algor/dev/bonito_mainbus.c 25 May 2011 22:28:38 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: bonito_mainb
#include <sys/reboot.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <mips/bonito/bonitoreg.h>
Index: sys/arch/algor/dev/com_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/dev/com_mainbus.c,v
retrieving revision 1.12
diff -u -p -r1.12 com_mainbus.c
--- sys/arch/algor/dev/com_mainbus.c 27 Nov 2009 03:23:03 -0000 1.12
+++ sys/arch/algor/dev/com_mainbus.c 25 May 2011 22:28:39 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_mainbus.
#include <machine/autoconf.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/algor/dev/lpt_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/dev/lpt_mainbus.c,v
retrieving revision 1.10
diff -u -p -r1.10 lpt_mainbus.c
--- sys/arch/algor/dev/lpt_mainbus.c 27 Nov 2009 03:23:04 -0000 1.10
+++ sys/arch/algor/dev/lpt_mainbus.c 25 May 2011 22:28:39 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_mainbus.
#include <machine/autoconf.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: sys/arch/algor/dev/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/dev/mainbus.c,v
retrieving revision 1.21
diff -u -p -r1.21 mainbus.c
--- sys/arch/algor/dev/mainbus.c 20 Feb 2011 07:51:21 -0000 1.21
+++ sys/arch/algor/dev/mainbus.c 25 May 2011 22:28:39 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#include <sys/malloc.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <mips/cache.h>
Index: sys/arch/algor/dev/mcclock_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/dev/mcclock_mainbus.c,v
retrieving revision 1.10
diff -u -p -r1.10 mcclock_mainbus.c
--- sys/arch/algor/dev/mcclock_mainbus.c 29 Mar 2008 05:42:45 -0000
1.10
+++ sys/arch/algor/dev/mcclock_mainbus.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_main
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: sys/arch/algor/dev/vtpbc_mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/dev/vtpbc_mainbus.c,v
retrieving revision 1.16
diff -u -p -r1.16 vtpbc_mainbus.c
--- sys/arch/algor/dev/vtpbc_mainbus.c 17 May 2011 17:34:47 -0000 1.16
+++ sys/arch/algor/dev/vtpbc_mainbus.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: vtpbc_mainbu
#include <sys/reboot.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <algor/pci/vtpbcvar.h>
Index: sys/arch/algor/include/autoconf.h
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/include/autoconf.h,v
retrieving revision 1.5
diff -u -p -r1.5 autoconf.h
--- sys/arch/algor/include/autoconf.h 20 Feb 2011 07:51:21 -0000 1.5
+++ sys/arch/algor/include/autoconf.h 25 May 2011 22:28:39 -0000
@@ -30,7 +30,7 @@
#ifndef _ALGOR_AUTOCONF_H_
#define _ALGOR_AUTOCONF_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Machine-dependent structures for autoconfiguration
cvs diff: cannot find sys/arch/algor/include/bus.h
Index: sys/arch/algor/isa/isadma_bounce.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/isa/isadma_bounce.c,v
retrieving revision 1.9
diff -u -p -r1.9 isadma_bounce.c
--- sys/arch/algor/isa/isadma_bounce.c 20 Feb 2011 07:51:22 -0000 1.9
+++ sys/arch/algor/isa/isadma_bounce.c 25 May 2011 22:28:39 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounc
#include <mips/cache.h>
#define _ALGOR_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/locore.h>
#include <dev/isa/isareg.h>
Index: sys/arch/algor/isa/mcclock_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/isa/mcclock_isa.c,v
retrieving revision 1.12
diff -u -p -r1.12 mcclock_isa.c
--- sys/arch/algor/isa/mcclock_isa.c 29 Mar 2008 05:42:45 -0000 1.12
+++ sys/arch/algor/isa/mcclock_isa.c 25 May 2011 22:28:39 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_isa.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
#include <dev/ic/mc146818reg.h>
Index: sys/arch/algor/pci/pcib.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/pci/pcib.c,v
retrieving revision 1.21
diff -u -p -r1.21 pcib.c
--- sys/arch/algor/pci/pcib.c 19 Aug 2009 15:17:00 -0000 1.21
+++ sys/arch/algor/pci/pcib.c 25 May 2011 22:28:39 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: pcib.c,v 1.2
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/algor/pci/vtpbc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/algor/pci/vtpbc.c,v
retrieving revision 1.7
diff -u -p -r1.7 vtpbc.c
--- sys/arch/algor/pci/vtpbc.c 28 Apr 2008 20:23:10 -0000 1.7
+++ sys/arch/algor/pci/vtpbc.c 25 May 2011 22:28:39 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: vtpbc.c,v 1.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/locore.h>
Index: sys/arch/alpha/alpha/api_up1000.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/api_up1000.c,v
retrieving revision 1.26
diff -u -p -r1.26 api_up1000.c
--- sys/arch/alpha/alpha/api_up1000.c 18 Mar 2009 07:42:36 -0000 1.26
+++ sys/arch/alpha/alpha/api_up1000.c 25 May 2011 22:28:39 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: api_up1000.c
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/alpha/dec_1000a.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_1000a.c,v
retrieving revision 1.29
diff -u -p -r1.29 dec_1000a.c
--- sys/arch/alpha/alpha/dec_1000a.c 14 Sep 2009 02:46:29 -0000 1.29
+++ sys/arch/alpha/alpha/dec_1000a.c 25 May 2011 22:28:39 -0000
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_1000a.c,
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/alpha/dec_2100_a50.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_2100_a50.c,v
retrieving revision 1.63
diff -u -p -r1.63 dec_2100_a50.c
--- sys/arch/alpha/alpha/dec_2100_a50.c 14 Mar 2009 15:35:59 -0000 1.63
+++ sys/arch/alpha/alpha/dec_2100_a50.c 25 May 2011 22:28:39 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_2100_a50
#include <machine/alpha.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/alpha/dec_2100_a500.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_2100_a500.c,v
retrieving revision 1.19
diff -u -p -r1.19 dec_2100_a500.c
--- sys/arch/alpha/alpha/dec_2100_a500.c 14 Sep 2009 02:46:29 -0000
1.19
+++ sys/arch/alpha/alpha/dec_2100_a500.c 25 May 2011 22:28:39 -0000
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_2100_a50
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/alpha.h>
#include <dev/ic/comreg.h>
Index: sys/arch/alpha/alpha/dec_550.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_550.c,v
retrieving revision 1.32
diff -u -p -r1.32 dec_550.c
--- sys/arch/alpha/alpha/dec_550.c 14 Mar 2009 15:35:59 -0000 1.32
+++ sys/arch/alpha/alpha/dec_550.c 25 May 2011 22:28:39 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_550.c,v
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/alpha/dec_6600.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_6600.c,v
retrieving revision 1.30
diff -u -p -r1.30 dec_6600.c
--- sys/arch/alpha/alpha/dec_6600.c 7 Oct 2010 19:55:02 -0000 1.30
+++ sys/arch/alpha/alpha/dec_6600.c 25 May 2011 22:28:39 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_6600.c,v
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/alpha.h>
#include <machine/logout.h>
Index: sys/arch/alpha/alpha/dec_alphabook1.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_alphabook1.c,v
retrieving revision 1.23
diff -u -p -r1.23 dec_alphabook1.c
--- sys/arch/alpha/alpha/dec_alphabook1.c 14 Mar 2009 15:35:59 -0000
1.23
+++ sys/arch/alpha/alpha/dec_alphabook1.c 25 May 2011 22:28:39 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_alphaboo
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/alpha/dec_eb164.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_eb164.c,v
retrieving revision 1.58
diff -u -p -r1.58 dec_eb164.c
--- sys/arch/alpha/alpha/dec_eb164.c 14 Mar 2009 15:35:59 -0000 1.58
+++ sys/arch/alpha/alpha/dec_eb164.c 25 May 2011 22:28:39 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb164.c,
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/alpha/dec_eb66.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_eb66.c,v
retrieving revision 1.24
diff -u -p -r1.24 dec_eb66.c
--- sys/arch/alpha/alpha/dec_eb66.c 14 Mar 2009 15:35:59 -0000 1.24
+++ sys/arch/alpha/alpha/dec_eb66.c 25 May 2011 22:28:39 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_eb66.c,v
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/alpha/dec_kn20aa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/dec_kn20aa.c,v
retrieving revision 1.61
diff -u -p -r1.61 dec_kn20aa.c
--- sys/arch/alpha/alpha/dec_kn20aa.c 14 Mar 2009 15:35:59 -0000 1.61
+++ sys/arch/alpha/alpha/dec_kn20aa.c 25 May 2011 22:28:39 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_kn20aa.c
#include <machine/rpb.h>
#include <machine/autoconf.h>
#include <machine/cpuconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/alpha.h>
#include <machine/logout.h>
Index: sys/arch/alpha/alpha/kgdb_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/kgdb_machdep.c,v
retrieving revision 1.7
diff -u -p -r1.7 kgdb_machdep.c
--- sys/arch/alpha/alpha/kgdb_machdep.c 15 Dec 2010 01:32:31 -0000 1.7
+++ sys/arch/alpha/alpha/kgdb_machdep.c 25 May 2011 22:28:39 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: kgdb_machdep
#include <sys/systm.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/db_machdep.h>
#if NCOM > 0
Index: sys/arch/alpha/alpha/mcclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/alpha/mcclock.c,v
retrieving revision 1.16
diff -u -p -r1.16 mcclock.c
--- sys/arch/alpha/alpha/mcclock.c 5 Mar 2009 01:48:58 -0000 1.16
+++ sys/arch/alpha/alpha/mcclock.c 25 May 2011 22:28:39 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock.c,v
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu_counter.h>
#include <dev/clock_subr.h>
Index: sys/arch/alpha/common/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/common/bus_dma.c,v
retrieving revision 1.67
diff -u -p -r1.67 bus_dma.c
--- sys/arch/alpha/common/bus_dma.c 21 Aug 2009 03:39:41 -0000 1.67
+++ sys/arch/alpha/common/bus_dma.c 25 May 2011 22:28:39 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <uvm/uvm_extern.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <common/bus_dma/bus_dmamem_common.h>
Index: sys/arch/alpha/common/comlogout.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/common/comlogout.c,v
retrieving revision 1.4
diff -u -p -r1.4 comlogout.c
--- sys/arch/alpha/common/comlogout.c 3 Jan 2001 21:40:25 -0000 1.4
+++ sys/arch/alpha/common/comlogout.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: comlogout.c,
#include <machine/rpb.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/frame.h>
#include <machine/cpuconf.h>
#include <machine/logout.h>
Index: sys/arch/alpha/common/sgmap_common.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/common/sgmap_common.c,v
retrieving revision 1.24
diff -u -p -r1.24 sgmap_common.c
--- sys/arch/alpha/common/sgmap_common.c 28 Apr 2008 20:23:11 -0000
1.24
+++ sys/arch/alpha/common/sgmap_common.c 25 May 2011 22:28:39 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: sgmap_common
#include <uvm/uvm_extern.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/common/sgmapvar.h>
Index: sys/arch/alpha/common/sgmapvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/common/sgmapvar.h,v
retrieving revision 1.15
diff -u -p -r1.15 sgmapvar.h
--- sys/arch/alpha/common/sgmapvar.h 28 Apr 2008 20:23:11 -0000 1.15
+++ sys/arch/alpha/common/sgmapvar.h 25 May 2011 22:28:39 -0000
@@ -34,7 +34,7 @@
#define _ALPHA_COMMON_SGMAPVAR_H
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Bits n:13 of the DMA address are the index of the PTE into
Index: sys/arch/alpha/include/alpha.h
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/include/alpha.h,v
retrieving revision 1.25
diff -u -p -r1.25 alpha.h
--- sys/arch/alpha/include/alpha.h 8 Feb 2011 20:20:07 -0000 1.25
+++ sys/arch/alpha/include/alpha.h 25 May 2011 22:28:39 -0000
@@ -57,7 +57,7 @@ typedef union alpha_t_float {
#ifdef _KERNEL
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/stdarg.h>
struct pcb;
cvs diff: cannot find sys/arch/alpha/include/bus.h
Index: sys/arch/alpha/include/pio.h
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/include/pio.h,v
retrieving revision 1.7
diff -u -p -r1.7 pio.h
--- sys/arch/alpha/include/pio.h 28 Apr 2008 20:23:11 -0000 1.7
+++ sys/arch/alpha/include/pio.h 25 May 2011 22:28:39 -0000
@@ -33,7 +33,7 @@
#define _ALPHA_PIO_H_
#include <sys/cdefs.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef _KERNEL
#error This file is for userspace only.
Index: sys/arch/alpha/include/sysarch.h
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/include/sysarch.h,v
retrieving revision 1.13
diff -u -p -r1.13 sysarch.h
--- sys/arch/alpha/include/sysarch.h 28 Apr 2008 20:23:11 -0000 1.13
+++ sys/arch/alpha/include/sysarch.h 25 May 2011 22:28:39 -0000
@@ -32,7 +32,7 @@
#ifndef _ALPHA_SYSARCH_H_
#define _ALPHA_SYSARCH_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/ieeefp.h>
/*
Index: sys/arch/alpha/isa/isadma_bounce.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/isa/isadma_bounce.c,v
retrieving revision 1.10
diff -u -p -r1.10 isadma_bounce.c
--- sys/arch/alpha/isa/isadma_bounce.c 15 Dec 2010 01:29:37 -0000 1.10
+++ sys/arch/alpha/isa/isadma_bounce.c 25 May 2011 22:28:39 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounc
#include <sys/mbuf.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/alpha/isa/isapnp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/isa/isapnp_machdep.c,v
retrieving revision 1.7
diff -u -p -r1.7 isapnp_machdep.c
--- sys/arch/alpha/isa/isapnp_machdep.c 14 Mar 2009 15:35:59 -0000 1.7
+++ sys/arch/alpha/isa/isapnp_machdep.c 25 May 2011 22:28:39 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp_machd
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/alpha/isa/mcclock_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/isa/mcclock_isa.c,v
retrieving revision 1.19
diff -u -p -r1.19 mcclock_isa.c
--- sys/arch/alpha/isa/mcclock_isa.c 29 Mar 2008 05:42:45 -0000 1.19
+++ sys/arch/alpha/isa/mcclock_isa.c 25 May 2011 22:28:39 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_isa.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
Index: sys/arch/alpha/jensenio/com_jensenio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/jensenio/com_jensenio.c,v
retrieving revision 1.11
diff -u -p -r1.11 com_jensenio.c
--- sys/arch/alpha/jensenio/com_jensenio.c 21 Nov 2009 05:35:41 -0000
1.11
+++ sys/arch/alpha/jensenio/com_jensenio.c 25 May 2011 22:28:39 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_jensenio
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/jensenio/jensenio_bus_intio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/jensenio/jensenio_bus_intio.c,v
retrieving revision 1.2
diff -u -p -r1.2 jensenio_bus_intio.c
--- sys/arch/alpha/jensenio/jensenio_bus_intio.c 28 Apr 2008 20:23:11
-0000 1.2
+++ sys/arch/alpha/jensenio/jensenio_bus_intio.c 25 May 2011 22:28:39
-0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: jensenio_bus
#include <sys/device.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: sys/arch/alpha/jensenio/jensenio_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/jensenio/jensenio_bus_io.c,v
retrieving revision 1.2
diff -u -p -r1.2 jensenio_bus_io.c
--- sys/arch/alpha/jensenio/jensenio_bus_io.c 28 Apr 2008 20:23:11 -0000
1.2
+++ sys/arch/alpha/jensenio/jensenio_bus_io.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(1, "$NetBSD: jensenio_bus
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: sys/arch/alpha/jensenio/jensenio_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/jensenio/jensenio_bus_mem.c,v
retrieving revision 1.2
diff -u -p -r1.2 jensenio_bus_mem.c
--- sys/arch/alpha/jensenio/jensenio_bus_mem.c 28 Apr 2008 20:23:11 -0000
1.2
+++ sys/arch/alpha/jensenio/jensenio_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(1, "$NetBSD: jensenio_bus
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: sys/arch/alpha/jensenio/jensenio_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/jensenio/jensenio_dma.c,v
retrieving revision 1.3
diff -u -p -r1.3 jensenio_dma.c
--- sys/arch/alpha/jensenio/jensenio_dma.c 2 Feb 2010 20:40:07 -0000
1.3
+++ sys/arch/alpha/jensenio/jensenio_dma.c 25 May 2011 22:28:39 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: jensenio_dma
#include <sys/mbuf.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/eisa/eisavar.h>
Index: sys/arch/alpha/jensenio/lpt_jensenio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/jensenio/lpt_jensenio.c,v
retrieving revision 1.10
diff -u -p -r1.10 lpt_jensenio.c
--- sys/arch/alpha/jensenio/lpt_jensenio.c 21 Nov 2009 05:35:41 -0000
1.10
+++ sys/arch/alpha/jensenio/lpt_jensenio.c 25 May 2011 22:28:39 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_jensenio
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: sys/arch/alpha/jensenio/mcclock_jensenio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/jensenio/mcclock_jensenio.c,v
retrieving revision 1.9
diff -u -p -r1.9 mcclock_jensenio.c
--- sys/arch/alpha/jensenio/mcclock_jensenio.c 28 Apr 2008 20:23:11 -0000
1.9
+++ sys/arch/alpha/jensenio/mcclock_jensenio.c 25 May 2011 22:28:39 -0000
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_jens
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
Index: sys/arch/alpha/pci/a12c_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/a12c_bus_mem.c,v
retrieving revision 1.7
diff -u -p -r1.7 a12c_bus_mem.c
--- sys/arch/alpha/pci/a12c_bus_mem.c 14 Mar 2009 21:04:02 -0000 1.7
+++ sys/arch/alpha/pci/a12c_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -40,7 +40,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/a12creg.h>
#include <alpha/pci/a12cvar.h>
Index: sys/arch/alpha/pci/a12c_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/a12c_dma.c,v
retrieving revision 1.7
diff -u -p -r1.7 a12c_dma.c
--- sys/arch/alpha/pci/a12c_dma.c 15 Dec 2010 01:27:18 -0000 1.7
+++ sys/arch/alpha/pci/a12c_dma.c 25 May 2011 22:28:39 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: a12c_dma.c,v
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/agp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/agp_machdep.c,v
retrieving revision 1.3
diff -u -p -r1.3 agp_machdep.c
--- sys/arch/alpha/pci/agp_machdep.c 11 Dec 2005 12:16:17 -0000 1.3
+++ sys/arch/alpha/pci/agp_machdep.c 25 May 2011 22:28:39 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: agp_machdep.
#include <sys/device.h>
#include <machine/alpha_cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/alpha/pci/apecs_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/apecs_bus_io.c,v
retrieving revision 1.10
diff -u -p -r1.10 apecs_bus_io.c
--- sys/arch/alpha/pci/apecs_bus_io.c 15 Dec 2010 01:27:18 -0000 1.10
+++ sys/arch/alpha/pci/apecs_bus_io.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: apecs_bus_io
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
Index: sys/arch/alpha/pci/apecs_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/apecs_bus_mem.c,v
retrieving revision 1.10
diff -u -p -r1.10 apecs_bus_mem.c
--- sys/arch/alpha/pci/apecs_bus_mem.c 15 Dec 2010 01:27:18 -0000 1.10
+++ sys/arch/alpha/pci/apecs_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: apecs_bus_me
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/apecsreg.h>
#include <alpha/pci/apecsvar.h>
Index: sys/arch/alpha/pci/apecs_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/apecs_dma.c,v
retrieving revision 1.19
diff -u -p -r1.19 apecs_dma.c
--- sys/arch/alpha/pci/apecs_dma.c 15 Dec 2010 01:27:18 -0000 1.19
+++ sys/arch/alpha/pci/apecs_dma.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: apecs_dma.c,
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/cia_bwx_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/cia_bwx_bus_io.c,v
retrieving revision 1.4
diff -u -p -r1.4 cia_bwx_bus_io.c
--- sys/arch/alpha/pci/cia_bwx_bus_io.c 15 Dec 2010 01:27:18 -0000 1.4
+++ sys/arch/alpha/pci/cia_bwx_bus_io.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: sys/arch/alpha/pci/cia_bwx_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/cia_bwx_bus_mem.c,v
retrieving revision 1.4
diff -u -p -r1.4 cia_bwx_bus_mem.c
--- sys/arch/alpha/pci/cia_bwx_bus_mem.c 15 Dec 2010 01:27:18 -0000
1.4
+++ sys/arch/alpha/pci/cia_bwx_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: cia_bwx_bus_
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: sys/arch/alpha/pci/cia_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/cia_dma.c,v
retrieving revision 1.26
diff -u -p -r1.26 cia_dma.c
--- sys/arch/alpha/pci/cia_dma.c 15 Dec 2010 01:27:18 -0000 1.26
+++ sys/arch/alpha/pci/cia_dma.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: cia_dma.c,v
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/cia_swiz_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/cia_swiz_bus_io.c,v
retrieving revision 1.16
diff -u -p -r1.16 cia_swiz_bus_io.c
--- sys/arch/alpha/pci/cia_swiz_bus_io.c 15 Dec 2010 01:27:18 -0000
1.16
+++ sys/arch/alpha/pci/cia_swiz_bus_io.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: sys/arch/alpha/pci/cia_swiz_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/cia_swiz_bus_mem.c,v
retrieving revision 1.17
diff -u -p -r1.17 cia_swiz_bus_mem.c
--- sys/arch/alpha/pci/cia_swiz_bus_mem.c 15 Dec 2010 01:27:18 -0000
1.17
+++ sys/arch/alpha/pci/cia_swiz_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: cia_swiz_bus
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ciareg.h>
#include <alpha/pci/ciavar.h>
Index: sys/arch/alpha/pci/dwlpx_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/dwlpx_bus_io.c,v
retrieving revision 1.13
diff -u -p -r1.13 dwlpx_bus_io.c
--- sys/arch/alpha/pci/dwlpx_bus_io.c 15 Dec 2010 01:27:18 -0000 1.13
+++ sys/arch/alpha/pci/dwlpx_bus_io.c 25 May 2011 22:28:39 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_io
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/dwlpxreg.h>
#include <alpha/pci/dwlpxvar.h>
Index: sys/arch/alpha/pci/dwlpx_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/dwlpx_bus_mem.c,v
retrieving revision 1.13
diff -u -p -r1.13 dwlpx_bus_mem.c
--- sys/arch/alpha/pci/dwlpx_bus_mem.c 15 Dec 2010 01:27:18 -0000 1.13
+++ sys/arch/alpha/pci/dwlpx_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(1, "$NetBSD: dwlpx_bus_me
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/dwlpxreg.h>
#include <alpha/pci/dwlpxvar.h>
Index: sys/arch/alpha/pci/dwlpx_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/dwlpx_dma.c,v
retrieving revision 1.20
diff -u -p -r1.20 dwlpx_dma.c
--- sys/arch/alpha/pci/dwlpx_dma.c 15 Dec 2010 01:27:18 -0000 1.20
+++ sys/arch/alpha/pci/dwlpx_dma.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: dwlpx_dma.c,
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/irongate_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/irongate_bus_io.c,v
retrieving revision 1.6
diff -u -p -r1.6 irongate_bus_io.c
--- sys/arch/alpha/pci/irongate_bus_io.c 15 Dec 2010 01:27:18 -0000
1.6
+++ sys/arch/alpha/pci/irongate_bus_io.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(1, "$NetBSD: irongate_bus
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
Index: sys/arch/alpha/pci/irongate_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/irongate_bus_mem.c,v
retrieving revision 1.9
diff -u -p -r1.9 irongate_bus_mem.c
--- sys/arch/alpha/pci/irongate_bus_mem.c 15 Dec 2010 01:27:18 -0000
1.9
+++ sys/arch/alpha/pci/irongate_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(1, "$NetBSD: irongate_bus
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/irongatereg.h>
#include <alpha/pci/irongatevar.h>
Index: sys/arch/alpha/pci/irongate_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/irongate_dma.c,v
retrieving revision 1.5
diff -u -p -r1.5 irongate_dma.c
--- sys/arch/alpha/pci/irongate_dma.c 15 Dec 2010 01:27:18 -0000 1.5
+++ sys/arch/alpha/pci/irongate_dma.c 25 May 2011 22:28:39 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: irongate_dma
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/lca_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/lca_bus_io.c,v
retrieving revision 1.10
diff -u -p -r1.10 lca_bus_io.c
--- sys/arch/alpha/pci/lca_bus_io.c 15 Dec 2010 01:27:19 -0000 1.10
+++ sys/arch/alpha/pci/lca_bus_io.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: lca_bus_io.c
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/lcareg.h>
#include <alpha/pci/lcavar.h>
Index: sys/arch/alpha/pci/lca_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/lca_bus_mem.c,v
retrieving revision 1.10
diff -u -p -r1.10 lca_bus_mem.c
--- sys/arch/alpha/pci/lca_bus_mem.c 15 Dec 2010 01:27:19 -0000 1.10
+++ sys/arch/alpha/pci/lca_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(1, "$NetBSD: lca_bus_mem.
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/lcareg.h>
#include <alpha/pci/lcavar.h>
Index: sys/arch/alpha/pci/lca_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/lca_dma.c,v
retrieving revision 1.21
diff -u -p -r1.21 lca_dma.c
--- sys/arch/alpha/pci/lca_dma.c 15 Dec 2010 01:27:19 -0000 1.21
+++ sys/arch/alpha/pci/lca_dma.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: lca_dma.c,v
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/mcpcia_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/mcpcia_bus_io.c,v
retrieving revision 1.4
diff -u -p -r1.4 mcpcia_bus_io.c
--- sys/arch/alpha/pci/mcpcia_bus_io.c 15 Dec 2010 01:27:19 -0000 1.4
+++ sys/arch/alpha/pci/mcpcia_bus_io.c 25 May 2011 22:28:39 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_i
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/mcpciareg.h>
#include <alpha/pci/mcpciavar.h>
Index: sys/arch/alpha/pci/mcpcia_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/mcpcia_bus_mem.c,v
retrieving revision 1.4
diff -u -p -r1.4 mcpcia_bus_mem.c
--- sys/arch/alpha/pci/mcpcia_bus_mem.c 15 Dec 2010 01:27:19 -0000 1.4
+++ sys/arch/alpha/pci/mcpcia_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(1, "$NetBSD: mcpcia_bus_m
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/mcpciareg.h>
#include <alpha/pci/mcpciavar.h>
Index: sys/arch/alpha/pci/mcpcia_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/mcpcia_dma.c,v
retrieving revision 1.19
diff -u -p -r1.19 mcpcia_dma.c
--- sys/arch/alpha/pci/mcpcia_dma.c 15 Dec 2010 01:27:19 -0000 1.19
+++ sys/arch/alpha/pci/mcpcia_dma.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcpcia_dma.c
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/pci_2100_a50.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_2100_a50.c,v
retrieving revision 1.38
diff -u -p -r1.38 pci_2100_a50.c
--- sys/arch/alpha/pci/pci_2100_a50.c 4 Apr 2011 20:37:44 -0000 1.38
+++ sys/arch/alpha/pci/pci_2100_a50.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_2100_a50
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: sys/arch/alpha/pci/pci_6600.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_6600.c,v
retrieving revision 1.21
diff -u -p -r1.21 pci_6600.c
--- sys/arch/alpha/pci/pci_6600.c 4 Apr 2011 20:37:44 -0000 1.21
+++ sys/arch/alpha/pci/pci_6600.c 25 May 2011 22:28:39 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v
#include <machine/autoconf.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rpb.h>
#include <machine/alpha.h>
Index: sys/arch/alpha/pci/pci_axppci_33.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_axppci_33.c,v
retrieving revision 1.35
diff -u -p -r1.35 pci_axppci_33.c
--- sys/arch/alpha/pci/pci_axppci_33.c 4 Apr 2011 20:37:44 -0000 1.35
+++ sys/arch/alpha/pci/pci_axppci_33.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_axppci_3
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: sys/arch/alpha/pci/pci_sgmap_pte32.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_sgmap_pte32.c,v
retrieving revision 1.7
diff -u -p -r1.7 pci_sgmap_pte32.c
--- sys/arch/alpha/pci/pci_sgmap_pte32.c 15 Dec 2010 01:27:19 -0000
1.7
+++ sys/arch/alpha/pci/pci_sgmap_pte32.c 25 May 2011 22:28:39 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pt
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/pci_sgmap_pte32.h>
Index: sys/arch/alpha/pci/pci_sgmap_pte64.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_sgmap_pte64.c,v
retrieving revision 1.7
diff -u -p -r1.7 pci_sgmap_pte64.c
--- sys/arch/alpha/pci/pci_sgmap_pte64.c 15 Dec 2010 01:27:19 -0000
1.7
+++ sys/arch/alpha/pci/pci_sgmap_pte64.c 25 May 2011 22:28:39 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(1, "$NetBSD: pci_sgmap_pt
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/pci_sgmap_pte64.h>
Index: sys/arch/alpha/pci/pci_up1000.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/pci_up1000.c,v
retrieving revision 1.12
diff -u -p -r1.12 pci_up1000.c
--- sys/arch/alpha/pci/pci_up1000.c 4 Apr 2011 20:37:45 -0000 1.12
+++ sys/arch/alpha/pci/pci_up1000.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: pci_up1000.c
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: sys/arch/alpha/pci/sio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/sio.c,v
retrieving revision 1.49
diff -u -p -r1.49 sio.c
--- sys/arch/alpha/pci/sio.c 12 Jan 2010 20:24:45 -0000 1.49
+++ sys/arch/alpha/pci/sio.c 25 May 2011 22:28:39 -0000
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: sio.c,v 1.49
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rpb.h>
#include <dev/isa/isavar.h>
Index: sys/arch/alpha/pci/sio_pic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/sio_pic.c,v
retrieving revision 1.40
diff -u -p -r1.40 sio_pic.c
--- sys/arch/alpha/pci/sio_pic.c 16 Mar 2009 23:11:09 -0000 1.40
+++ sys/arch/alpha/pci/sio_pic.c 25 May 2011 22:28:39 -0000
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v
#include <sys/syslog.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/pci/tsp_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/tsp_bus_io.c,v
retrieving revision 1.7
diff -u -p -r1.7 tsp_bus_io.c
--- sys/arch/alpha/pci/tsp_bus_io.c 15 Dec 2010 01:27:19 -0000 1.7
+++ sys/arch/alpha/pci/tsp_bus_io.c 25 May 2011 22:28:39 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(1, "$NetBSD: tsp_bus_io.c
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/rpb.h>
Index: sys/arch/alpha/pci/tsp_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/tsp_bus_mem.c,v
retrieving revision 1.10
diff -u -p -r1.10 tsp_bus_mem.c
--- sys/arch/alpha/pci/tsp_bus_mem.c 15 Dec 2010 01:27:19 -0000 1.10
+++ sys/arch/alpha/pci/tsp_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: tsp_bus_mem.
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/autoconf.h>
#include <machine/rpb.h>
Index: sys/arch/alpha/pci/tsp_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/tsp_dma.c,v
retrieving revision 1.10
diff -u -p -r1.10 tsp_dma.c
--- sys/arch/alpha/pci/tsp_dma.c 15 Dec 2010 01:27:19 -0000 1.10
+++ sys/arch/alpha/pci/tsp_dma.c 25 May 2011 22:28:39 -0000
@@ -72,7 +72,7 @@ __KERNEL_RCSID(0, "$NetBSD: tsp_dma.c,v
#include <machine/autoconf.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rpb.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/alpha/pci/ttwoga_bus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/ttwoga_bus_io.c,v
retrieving revision 1.2
diff -u -p -r1.2 ttwoga_bus_io.c
--- sys/arch/alpha/pci/ttwoga_bus_io.c 28 Apr 2008 20:23:11 -0000 1.2
+++ sys/arch/alpha/pci/ttwoga_bus_io.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(1, "$NetBSD: ttwoga_bus_i
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ttwogareg.h>
#include <alpha/pci/ttwogavar.h>
Index: sys/arch/alpha/pci/ttwoga_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/ttwoga_bus_mem.c,v
retrieving revision 1.2
diff -u -p -r1.2 ttwoga_bus_mem.c
--- sys/arch/alpha/pci/ttwoga_bus_mem.c 28 Apr 2008 20:23:11 -0000 1.2
+++ sys/arch/alpha/pci/ttwoga_bus_mem.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(1, "$NetBSD: ttwoga_bus_m
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/pci/ttwogareg.h>
#include <alpha/pci/ttwogavar.h>
Index: sys/arch/alpha/pci/ttwoga_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/pci/ttwoga_dma.c,v
retrieving revision 1.5
diff -u -p -r1.5 ttwoga_dma.c
--- sys/arch/alpha/pci/ttwoga_dma.c 15 Dec 2010 01:27:19 -0000 1.5
+++ sys/arch/alpha/pci/ttwoga_dma.c 25 May 2011 22:28:39 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ttwoga_dma.c
#include <sys/device.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/alpha/sableio/com_sableio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/sableio/com_sableio.c,v
retrieving revision 1.10
diff -u -p -r1.10 com_sableio.c
--- sys/arch/alpha/sableio/com_sableio.c 4 Dec 2009 11:13:04 -0000
1.10
+++ sys/arch/alpha/sableio/com_sableio.c 25 May 2011 22:28:40 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_sableio.
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/alpha/sableio/fdc_sableio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/sableio/fdc_sableio.c,v
retrieving revision 1.10
diff -u -p -r1.10 fdc_sableio.c
--- sys/arch/alpha/sableio/fdc_sableio.c 4 Dec 2009 11:13:04 -0000
1.10
+++ sys/arch/alpha/sableio/fdc_sableio.c 25 May 2011 22:28:40 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_sableio.
#include <sys/rnd.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/isa/isavar.h>
Index: sys/arch/alpha/sableio/lpt_sableio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/sableio/lpt_sableio.c,v
retrieving revision 1.7
diff -u -p -r1.7 lpt_sableio.c
--- sys/arch/alpha/sableio/lpt_sableio.c 21 Nov 2009 05:35:41 -0000
1.7
+++ sys/arch/alpha/sableio/lpt_sableio.c 25 May 2011 22:28:40 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_sableio.
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/lptreg.h>
#include <dev/ic/lptvar.h>
Index: sys/arch/alpha/tc/ioasic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tc/ioasic.c,v
retrieving revision 1.42
diff -u -p -r1.42 ioasic.c
--- sys/arch/alpha/tc/ioasic.c 14 Mar 2009 21:04:03 -0000 1.42
+++ sys/arch/alpha/tc/ioasic.c 25 May 2011 22:28:40 -0000
@@ -70,7 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: ioasic.c,v 1
#include <sys/malloc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pte.h>
#include <machine/rpb.h>
Index: sys/arch/alpha/tc/mcclock_ioasic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tc/mcclock_ioasic.c,v
retrieving revision 1.15
diff -u -p -r1.15 mcclock_ioasic.c
--- sys/arch/alpha/tc/mcclock_ioasic.c 29 Mar 2008 05:42:45 -0000 1.15
+++ sys/arch/alpha/tc/mcclock_ioasic.c 25 May 2011 22:28:40 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_ioas
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
Index: sys/arch/alpha/tc/tc_bus_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tc/tc_bus_mem.c,v
retrieving revision 1.31
diff -u -p -r1.31 tc_bus_mem.c
--- sys/arch/alpha/tc/tc_bus_mem.c 15 Dec 2010 01:29:37 -0000 1.31
+++ sys/arch/alpha/tc/tc_bus_mem.c 25 May 2011 22:28:40 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: tc_bus_mem.c
#include <sys/syslog.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
#define __C(A,B) __CONCAT(A,B)
Index: sys/arch/alpha/tc/tc_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tc/tc_dma.c,v
retrieving revision 1.12
diff -u -p -r1.12 tc_dma.c
--- sys/arch/alpha/tc/tc_dma.c 18 Mar 2009 10:22:23 -0000 1.12
+++ sys/arch/alpha/tc/tc_dma.c 25 May 2011 22:28:40 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: tc_dma.c,v 1
#include <sys/device.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
Index: sys/arch/alpha/tc/tc_dma_3000_300.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tc/tc_dma_3000_300.c,v
retrieving revision 1.5
diff -u -p -r1.5 tc_dma_3000_300.c
--- sys/arch/alpha/tc/tc_dma_3000_300.c 14 Mar 2009 15:36:00 -0000 1.5
+++ sys/arch/alpha/tc/tc_dma_3000_300.c 25 May 2011 22:28:40 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_
#include <sys/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/tc/tc_dma_3000_300.h>
Index: sys/arch/alpha/tc/tc_dma_3000_500.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tc/tc_dma_3000_500.c,v
retrieving revision 1.16
diff -u -p -r1.16 tc_dma_3000_500.c
--- sys/arch/alpha/tc/tc_dma_3000_500.c 15 Dec 2010 01:29:38 -0000 1.16
+++ sys/arch/alpha/tc/tc_dma_3000_500.c 25 May 2011 22:28:40 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: tc_dma_3000_
#include <sys/malloc.h>
#define _ALPHA_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/tc/tcvar.h>
#include <alpha/tc/tc_sgmap.h>
Index: sys/arch/alpha/tc/tc_sgmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tc/tc_sgmap.c,v
retrieving revision 1.7
diff -u -p -r1.7 tc_sgmap.c
--- sys/arch/alpha/tc/tc_sgmap.c 15 Dec 2010 01:29:38 -0000 1.7
+++ sys/arch/alpha/tc/tc_sgmap.c 25 May 2011 22:28:40 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(1, "$NetBSD: tc_sgmap.c,v
#include <sys/mbuf.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/tc/tc_sgmap.h>
Index: sys/arch/alpha/tlsb/gbusvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tlsb/gbusvar.h,v
retrieving revision 1.2
diff -u -p -r1.2 gbusvar.h
--- sys/arch/alpha/tlsb/gbusvar.h 28 Apr 2008 20:23:12 -0000 1.2
+++ sys/arch/alpha/tlsb/gbusvar.h 25 May 2011 22:28:40 -0000
@@ -34,7 +34,7 @@
* Autoconfiguration definitions for the Gbus found on TurboLaser CPU modules.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
struct gbus_attach_args {
const char *ga_name; /* name of device */
Index: sys/arch/alpha/tlsb/mcclock_tlsb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/alpha/tlsb/mcclock_tlsb.c,v
retrieving revision 1.16
diff -u -p -r1.16 mcclock_tlsb.c
--- sys/arch/alpha/tlsb/mcclock_tlsb.c 29 Mar 2008 05:42:45 -0000 1.16
+++ sys/arch/alpha/tlsb/mcclock_tlsb.c 25 May 2011 22:28:40 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_tlsb
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <alpha/tlsb/gbusvar.h>
Index: sys/arch/amd64/amd64/fpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/fpu.c,v
retrieving revision 1.34
diff -u -p -r1.34 fpu.c
--- sys/arch/amd64/amd64/fpu.c 7 Mar 2011 02:24:57 -0000 1.34
+++ sys/arch/amd64/amd64/fpu.c 25 May 2011 22:28:40 -0000
@@ -114,7 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.34
#include <sys/vmmeter.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/cpufunc.h>
Index: sys/arch/amd64/amd64/genassym.cf
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/genassym.cf,v
retrieving revision 1.46
diff -u -p -r1.46 genassym.cf
--- sys/arch/amd64/amd64/genassym.cf 20 Dec 2010 00:25:24 -0000 1.46
+++ sys/arch/amd64/amd64/genassym.cf 25 May 2011 22:28:40 -0000
@@ -122,7 +122,7 @@ ifdef XEN
include <xen/xen3-public/xen.h>
endif
-include <x86/bus.h>
+include <sys/bus.h>
define LSRUN LSRUN
define LSONPROC LSONPROC
Index: sys/arch/amd64/amd64/rbus_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/amd64/rbus_machdep.c,v
retrieving revision 1.4
diff -u -p -r1.4 rbus_machdep.c
--- sys/arch/amd64/amd64/rbus_machdep.c 20 Dec 2010 00:25:24 -0000 1.4
+++ sys/arch/amd64/amd64/rbus_machdep.c 25 May 2011 22:28:40 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: rbus_machdep
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/rbus.h>
#include <sys/device.h>
cvs diff: cannot find sys/arch/amd64/include/bus.h
Index: sys/arch/arc/arc/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/bus_dma.c,v
retrieving revision 1.32
diff -u -p -r1.32 bus_dma.c
--- sys/arch/arc/arc/bus_dma.c 20 Feb 2011 07:52:42 -0000 1.32
+++ sys/arch/arc/arc/bus_dma.c 25 May 2011 22:28:40 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <mips/cache.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
paddr_t kvtophys(vaddr_t); /* XXX */
Index: sys/arch/arc/arc/bus_space_large.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/bus_space_large.c,v
retrieving revision 1.7
diff -u -p -r1.7 bus_space_large.c
--- sys/arch/arc/arc/bus_space_large.c 28 Apr 2008 20:23:13 -0000 1.7
+++ sys/arch/arc/arc/bus_space_large.c 25 May 2011 22:28:40 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_space_la
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/wired_map.h>
static int arc_large_bus_space_compose_handle(bus_space_tag_t, bus_addr_t,
Index: sys/arch/arc/arc/bus_space_sparse.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/bus_space_sparse.c,v
retrieving revision 1.17
diff -u -p -r1.17 bus_space_sparse.c
--- sys/arch/arc/arc/bus_space_sparse.c 20 Feb 2011 07:52:42 -0000 1.17
+++ sys/arch/arc/arc/bus_space_sparse.c 25 May 2011 22:28:40 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_space_sp
#include <mips/cpuregs.h>
#include <mips/pte.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
extern paddr_t kvtophys(vaddr_t); /* XXX */
Index: sys/arch/arc/arc/c_jazz_eisa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/c_jazz_eisa.c,v
retrieving revision 1.12
diff -u -p -r1.12 c_jazz_eisa.c
--- sys/arch/arc/arc/c_jazz_eisa.c 11 Dec 2005 12:16:37 -0000 1.12
+++ sys/arch/arc/arc/c_jazz_eisa.c 25 May 2011 22:28:40 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: c_jazz_eisa.
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
Index: sys/arch/arc/arc/c_magnum.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/c_magnum.c,v
retrieving revision 1.21
diff -u -p -r1.21 c_magnum.c
--- sys/arch/arc/arc/c_magnum.c 20 Feb 2011 07:52:42 -0000 1.21
+++ sys/arch/arc/arc/c_magnum.c 25 May 2011 22:28:40 -0000
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: c_magnum.c,v
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
#include <machine/wired_map.h>
Index: sys/arch/arc/arc/c_nec_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/c_nec_pci.c,v
retrieving revision 1.18
diff -u -p -r1.18 c_nec_pci.c
--- sys/arch/arc/arc/c_nec_pci.c 20 Feb 2011 07:52:42 -0000 1.18
+++ sys/arch/arc/arc/c_nec_pci.c 25 May 2011 22:28:40 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: c_nec_pci.c,
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
#include <machine/wired_map.h>
Index: sys/arch/arc/arc/machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/machdep.c,v
retrieving revision 1.123
diff -u -p -r1.123 machdep.c
--- sys/arch/arc/arc/machdep.c 20 Feb 2011 07:52:42 -0000 1.123
+++ sys/arch/arc/arc/machdep.c 25 May 2011 22:28:40 -0000
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v
#include <machine/cpu.h>
#include <machine/reg.h>
#include <machine/pio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/trap.h>
#include <machine/autoconf.h>
#include <machine/platform.h>
Index: sys/arch/arc/arc/p_dti_arcstation.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/arc/p_dti_arcstation.c,v
retrieving revision 1.16
diff -u -p -r1.16 p_dti_arcstation.c
--- sys/arch/arc/arc/p_dti_arcstation.c 20 Feb 2011 07:52:42 -0000 1.16
+++ sys/arch/arc/arc/p_dti_arcstation.c 25 May 2011 22:28:40 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: p_dti_arcsta
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/platform.h>
#include <machine/wired_map.h>
Index: sys/arch/arc/dev/opms.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/dev/opms.c,v
retrieving revision 1.18
diff -u -p -r1.18 opms.c
--- sys/arch/arc/dev/opms.c 13 Jun 2008 08:27:38 -0000 1.18
+++ sys/arch/arc/dev/opms.c 25 May 2011 22:28:40 -0000
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: opms.c,v 1.1
#include <sys/proc.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/kbdreg.h>
#include <machine/mouse.h>
Index: sys/arch/arc/dev/pccons.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/dev/pccons.c,v
retrieving revision 1.58
diff -u -p -r1.58 pccons.c
--- sys/arch/arc/dev/pccons.c 24 Apr 2011 16:26:53 -0000 1.58
+++ sys/arch/arc/dev/pccons.c 25 May 2011 22:28:40 -0000
@@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1
#include <sys/proc.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/pcdisplay.h>
#include <machine/pccons.h>
Index: sys/arch/arc/dti/arcsisabr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/dti/arcsisabr.c,v
retrieving revision 1.4
diff -u -p -r1.4 arcsisabr.c
--- sys/arch/arc/dti/arcsisabr.c 5 Jul 2008 08:46:25 -0000 1.4
+++ sys/arch/arc/dti/arcsisabr.c 25 May 2011 22:28:40 -0000
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: arcsisabr.c,
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/platform.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/dti/tyneisabr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/dti/tyneisabr.c,v
retrieving revision 1.11
diff -u -p -r1.11 tyneisabr.c
--- sys/arch/arc/dti/tyneisabr.c 5 Jul 2008 08:46:25 -0000 1.11
+++ sys/arch/arc/dti/tyneisabr.c 25 May 2011 22:28:40 -0000
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: tyneisabr.c,
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/platform.h>
#include <dev/isa/isavar.h>
cvs diff: cannot find sys/arch/arc/include/bus.h
Index: sys/arch/arc/isa/isadma_bounce.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/isa/isadma_bounce.c,v
retrieving revision 1.12
diff -u -p -r1.12 isadma_bounce.c
--- sys/arch/arc/isa/isadma_bounce.c 20 Feb 2011 07:52:42 -0000 1.12
+++ sys/arch/arc/isa/isadma_bounce.c 25 May 2011 22:28:40 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_bounc
#include <sys/mbuf.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/isa/isapnp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/isa/isapnp_machdep.c,v
retrieving revision 1.8
diff -u -p -r1.8 isapnp_machdep.c
--- sys/arch/arc/isa/isapnp_machdep.c 28 Apr 2008 20:23:13 -0000 1.8
+++ sys/arch/arc/isa/isapnp_machdep.c 25 May 2011 22:28:40 -0000
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp_machd
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/isa/mcclock_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/isa/mcclock_isa.c,v
retrieving revision 1.14
diff -u -p -r1.14 mcclock_isa.c
--- sys/arch/arc/isa/mcclock_isa.c 8 Feb 2011 20:20:09 -0000 1.14
+++ sys/arch/arc/isa/mcclock_isa.c 25 May 2011 22:28:40 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_isa.
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/isa/opms_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/isa/opms_isa.c,v
retrieving revision 1.11
diff -u -p -r1.11 opms_isa.c
--- sys/arch/arc/isa/opms_isa.c 6 Mar 2011 14:58:43 -0000 1.11
+++ sys/arch/arc/isa/opms_isa.c 25 May 2011 22:28:40 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: opms_isa.c,v
#include <sys/tty.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/isa/pccons_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/isa/pccons_isa.c,v
retrieving revision 1.11
diff -u -p -r1.11 pccons_isa.c
--- sys/arch/arc/isa/pccons_isa.c 6 Mar 2011 14:58:43 -0000 1.11
+++ sys/arch/arc/isa/pccons_isa.c 25 May 2011 22:28:40 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: pccons_isa.c
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/isa/timer_isa.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/isa/timer_isa.c,v
retrieving revision 1.13
diff -u -p -r1.13 timer_isa.c
--- sys/arch/arc/isa/timer_isa.c 8 Feb 2011 20:20:09 -0000 1.13
+++ sys/arch/arc/isa/timer_isa.c 25 May 2011 22:28:40 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: timer_isa.c,
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/jazz/asc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/asc.c,v
retrieving revision 1.23
diff -u -p -r1.23 asc.c
--- sys/arch/arc/jazz/asc.c 14 May 2008 13:29:27 -0000 1.23
+++ sys/arch/arc/jazz/asc.c 25 May 2011 22:28:40 -0000
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: asc.c,v 1.23
#include <sys/buf.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: sys/arch/arc/jazz/bus_dma_jazz.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/bus_dma_jazz.c,v
retrieving revision 1.16
diff -u -p -r1.16 bus_dma_jazz.c
--- sys/arch/arc/jazz/bus_dma_jazz.c 15 Nov 2010 06:13:16 -0000 1.16
+++ sys/arch/arc/jazz/bus_dma_jazz.c 25 May 2011 22:28:40 -0000
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma_jazz
#include <uvm/uvm_extern.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/jazzdmatlbvar.h>
Index: sys/arch/arc/jazz/com_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/com_jazzio.c,v
retrieving revision 1.11
diff -u -p -r1.11 com_jazzio.c
--- sys/arch/arc/jazz/com_jazzio.c 28 Apr 2008 20:23:13 -0000 1.11
+++ sys/arch/arc/jazz/com_jazzio.c 25 May 2011 22:28:40 -0000
@@ -71,7 +71,7 @@ __KERNEL_RCSID(0, "$NetBSD: com_jazzio.c
#include <sys/tty.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arc/jazz/jazziovar.h>
Index: sys/arch/arc/jazz/fd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/fd.c,v
retrieving revision 1.40
diff -u -p -r1.40 fd.c
--- sys/arch/arc/jazz/fd.c 27 Sep 2009 05:29:20 -0000 1.40
+++ sys/arch/arc/jazz/fd.c 25 May 2011 22:28:40 -0000
@@ -88,7 +88,7 @@ __KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.40
#include <dev/cons.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arc/jazz/fdreg.h>
Index: sys/arch/arc/jazz/fdc_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/fdc_jazzio.c,v
retrieving revision 1.14
diff -u -p -r1.14 fdc_jazzio.c
--- sys/arch/arc/jazz/fdc_jazzio.c 5 Jul 2008 08:46:25 -0000 1.14
+++ sys/arch/arc/jazz/fdc_jazzio.c 25 May 2011 22:28:40 -0000
@@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: fdc_jazzio.c
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/fdreg.h>
Index: sys/arch/arc/jazz/if_sn_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/if_sn_jazzio.c,v
retrieving revision 1.12
diff -u -p -r1.12 if_sn_jazzio.c
--- sys/arch/arc/jazz/if_sn_jazzio.c 19 Jan 2010 22:06:19 -0000 1.12
+++ sys/arch/arc/jazz/if_sn_jazzio.c 25 May 2011 22:28:40 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_sn_jazzio
#include <net/if_ether.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ic/dp83932reg.h>
Index: sys/arch/arc/jazz/jazzdmatlb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/jazzdmatlb.c,v
retrieving revision 1.14
diff -u -p -r1.14 jazzdmatlb.c
--- sys/arch/arc/jazz/jazzdmatlb.c 1 Mar 2006 12:38:10 -0000 1.14
+++ sys/arch/arc/jazz/jazzdmatlb.c 25 May 2011 22:28:40 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: jazzdmatlb.c
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/jazz/jazzdmatlbreg.h>
#include <arc/jazz/jazzdmatlbvar.h>
Index: sys/arch/arc/jazz/jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/jazzio.c,v
retrieving revision 1.21
diff -u -p -r1.21 jazzio.c
--- sys/arch/arc/jazz/jazzio.c 6 Mar 2011 14:58:44 -0000 1.21
+++ sys/arch/arc/jazz/jazzio.c 25 May 2011 22:28:40 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: jazzio.c,v 1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/autoconf.h>
#include <machine/platform.h>
Index: sys/arch/arc/jazz/jazziovar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/jazziovar.h,v
retrieving revision 1.7
diff -u -p -r1.7 jazziovar.h
--- sys/arch/arc/jazz/jazziovar.h 4 Mar 2007 05:59:36 -0000 1.7
+++ sys/arch/arc/jazz/jazziovar.h 25 May 2011 22:28:40 -0000
@@ -29,7 +29,7 @@
#ifndef __JAZZIOVAR_H
#define __JAZZIOVAR_H
-#include <machine/bus.h>
+#include <sys/bus.h>
struct jazzio_attach_args {
const char *ja_name;
Index: sys/arch/arc/jazz/jazzisabr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/jazzisabr.c,v
retrieving revision 1.12
diff -u -p -r1.12 jazzisabr.c
--- sys/arch/arc/jazz/jazzisabr.c 5 Jul 2008 08:46:25 -0000 1.12
+++ sys/arch/arc/jazz/jazzisabr.c 25 May 2011 22:28:40 -0000
@@ -82,7 +82,7 @@ __KERNEL_RCSID(0, "$NetBSD: jazzisabr.c,
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/platform.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arc/jazz/lpt_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/lpt_jazzio.c,v
retrieving revision 1.9
diff -u -p -r1.9 lpt_jazzio.c
--- sys/arch/arc/jazz/lpt_jazzio.c 6 Mar 2011 14:58:44 -0000 1.9
+++ sys/arch/arc/jazz/lpt_jazzio.c 25 May 2011 22:28:40 -0000
@@ -62,7 +62,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpt_jazzio.c
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/ic/lptreg.h>
Index: sys/arch/arc/jazz/mcclock_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/mcclock_jazzio.c,v
retrieving revision 1.12
diff -u -p -r1.12 mcclock_jazzio.c
--- sys/arch/arc/jazz/mcclock_jazzio.c 8 Feb 2011 20:20:09 -0000 1.12
+++ sys/arch/arc/jazz/mcclock_jazzio.c 25 May 2011 22:28:40 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: mcclock_jazz
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/clock_subr.h>
Index: sys/arch/arc/jazz/oosiop_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/oosiop_jazzio.c,v
retrieving revision 1.6
diff -u -p -r1.6 oosiop_jazzio.c
--- sys/arch/arc/jazz/oosiop_jazzio.c 29 Mar 2008 09:11:35 -0000 1.6
+++ sys/arch/arc/jazz/oosiop_jazzio.c 25 May 2011 22:28:40 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: oosiop_jazzi
#include <machine/cpu.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/oosiopreg.h>
#include <dev/ic/oosiopvar.h>
Index: sys/arch/arc/jazz/opms_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/opms_jazzio.c,v
retrieving revision 1.10
diff -u -p -r1.10 opms_jazzio.c
--- sys/arch/arc/jazz/opms_jazzio.c 6 Mar 2011 14:58:44 -0000 1.10
+++ sys/arch/arc/jazz/opms_jazzio.c 25 May 2011 22:28:40 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: opms_jazzio.
#include <sys/tty.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arc/dev/pcconsvar.h>
#include <arc/dev/opmsvar.h>
Index: sys/arch/arc/jazz/osiop_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/osiop_jazzio.c,v
retrieving revision 1.9
diff -u -p -r1.9 osiop_jazzio.c
--- sys/arch/arc/jazz/osiop_jazzio.c 14 May 2008 13:29:27 -0000 1.9
+++ sys/arch/arc/jazz/osiop_jazzio.c 25 May 2011 22:28:40 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: osiop_jazzio
#include <machine/cpu.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/osiopreg.h>
#include <dev/ic/osiopvar.h>
Index: sys/arch/arc/jazz/pccons_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/pccons_jazzio.c,v
retrieving revision 1.10
diff -u -p -r1.10 pccons_jazzio.c
--- sys/arch/arc/jazz/pccons_jazzio.c 6 Mar 2011 14:58:44 -0000 1.10
+++ sys/arch/arc/jazz/pccons_jazzio.c 25 May 2011 22:28:40 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: pccons_jazzi
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/wired_map.h>
#include <mips/pte.h>
Index: sys/arch/arc/jazz/vga_jazzio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/jazz/vga_jazzio.c,v
retrieving revision 1.16
diff -u -p -r1.16 vga_jazzio.c
--- sys/arch/arc/jazz/vga_jazzio.c 6 Mar 2011 14:58:44 -0000 1.16
+++ sys/arch/arc/jazz/vga_jazzio.c 25 May 2011 22:28:40 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: vga_jazzio.c
#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/wired_map.h>
#include <mips/pte.h>
Index: sys/arch/arc/pci/necpb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arc/pci/necpb.c,v
retrieving revision 1.36
diff -u -p -r1.36 necpb.c
--- sys/arch/arc/pci/necpb.c 17 May 2011 17:34:47 -0000 1.36
+++ sys/arch/arc/pci/necpb.c 25 May 2011 22:28:40 -0000
@@ -77,7 +77,7 @@ __KERNEL_RCSID(0, "$NetBSD: necpb.c,v 1.
#include <uvm/uvm_extern.h>
#define _ARC_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
Index: sys/arch/arm/arm32/bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/bus_dma.c,v
retrieving revision 1.53
diff -u -p -r1.53 bus_dma.c
--- sys/arch/arm/arm32/bus_dma.c 6 Nov 2010 11:46:00 -0000 1.53
+++ sys/arch/arm/arm32/bus_dma.c 25 May 2011 22:28:40 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/arm32/pmap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/arm32/pmap.c,v
retrieving revision 1.221
diff -u -p -r1.221 pmap.c
--- sys/arch/arm/arm32/pmap.c 10 Mar 2011 07:47:14 -0000 1.221
+++ sys/arch/arm/arm32/pmap.c 25 May 2011 22:28:41 -0000
@@ -205,7 +205,7 @@
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
#include <machine/pcb.h>
#include <machine/param.h>
Index: sys/arch/arm/at91/at91_bus_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91_bus_dma.c,v
retrieving revision 1.3
diff -u -p -r1.3 at91_bus_dma.c
--- sys/arch/arm/at91/at91_bus_dma.c 23 Oct 2009 00:39:29 -0000 1.3
+++ sys/arch/arm/at91/at91_bus_dma.c 25 May 2011 22:28:41 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91_bus_dma
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91var.h>
Index: sys/arch/arm/at91/at91_bus_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91_bus_space.c,v
retrieving revision 1.3
diff -u -p -r1.3 at91_bus_space.c
--- sys/arch/arm/at91/at91_bus_space.c 23 Oct 2009 06:53:12 -0000 1.3
+++ sys/arch/arm/at91/at91_bus_space.c 25 May 2011 22:28:41 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91_bus_spa
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91var.h>
//#include <arm/ep93xx/ep93xxreg.h>
Index: sys/arch/arm/at91/at91aic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91aic.c,v
retrieving revision 1.5
diff -u -p -r1.5 at91aic.c
--- sys/arch/arm/at91/at91aic.c 20 Dec 2010 00:25:27 -0000 1.5
+++ sys/arch/arm/at91/at91aic.c 25 May 2011 22:28:41 -0000
@@ -49,7 +49,7 @@
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/at91/at91bus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91bus.c,v
retrieving revision 1.10
diff -u -p -r1.10 at91bus.c
--- sys/arch/arm/at91/at91bus.c 26 Dec 2009 16:01:23 -0000 1.10
+++ sys/arch/arm/at91/at91bus.c 25 May 2011 22:28:41 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91bus.c,v
#include <ddb/db_sym.h>
#include <ddb/db_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/frame.h>
#include <arm/undefined.h>
Index: sys/arch/arm/at91/at91busvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91busvar.h,v
retrieving revision 1.3
diff -u -p -r1.3 at91busvar.h
--- sys/arch/arm/at91/at91busvar.h 23 Oct 2009 06:53:13 -0000 1.3
+++ sys/arch/arm/at91/at91busvar.h 25 May 2011 22:28:41 -0000
@@ -34,7 +34,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91piovar.h>
Index: sys/arch/arm/at91/at91cf.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91cf.c,v
retrieving revision 1.2
diff -u -p -r1.2 at91cf.c
--- sys/arch/arm/at91/at91cf.c 3 Jul 2008 01:15:38 -0000 1.2
+++ sys/arch/arm/at91/at91cf.c 25 May 2011 22:28:41 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1
#include <sys/device.h>
#include <sys/kthread.h>
#include <uvm/uvm_param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
Index: sys/arch/arm/at91/at91dbgu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91dbgu.c,v
retrieving revision 1.5
diff -u -p -r1.5 at91dbgu.c
--- sys/arch/arm/at91/at91dbgu.c 24 Apr 2011 16:26:53 -0000 1.5
+++ sys/arch/arm/at91/at91dbgu.c 25 May 2011 22:28:41 -0000
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v
#include <sys/kauth.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91reg.h>
#include <arm/at91/at91var.h>
Index: sys/arch/arm/at91/at91emac.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91emac.c,v
retrieving revision 1.9
diff -u -p -r1.9 at91emac.c
--- sys/arch/arm/at91/at91emac.c 5 Apr 2010 07:19:29 -0000 1.9
+++ sys/arch/arm/at91/at91emac.c 25 May 2011 22:28:41 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91emac.c,v
#include <sys/device.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/at91/at91ohci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91ohci.c,v
retrieving revision 1.3
diff -u -p -r1.3 at91ohci.c
--- sys/arch/arm/at91/at91ohci.c 14 Mar 2009 15:36:01 -0000 1.3
+++ sys/arch/arm/at91/at91ohci.c 25 May 2011 22:28:41 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91ohci.c,v
#include <sys/mbuf.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
Index: sys/arch/arm/at91/at91pdc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91pdc.c,v
retrieving revision 1.2
diff -u -p -r1.2 at91pdc.c
--- sys/arch/arm/at91/at91pdc.c 3 Jul 2008 01:15:38 -0000 1.2
+++ sys/arch/arm/at91/at91pdc.c 25 May 2011 22:28:41 -0000
@@ -1,7 +1,7 @@
/* $Id: at91pdc.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91pdcvar.h>
int at91pdc_alloc_fifo(bus_dma_tag_t dmat, at91pdc_fifo_t *fifo, int size,
Index: sys/arch/arm/at91/at91pio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91pio.c,v
retrieving revision 1.3
diff -u -p -r1.3 at91pio.c
--- sys/arch/arm/at91/at91pio.c 19 Jun 2010 19:47:34 -0000 1.3
+++ sys/arch/arm/at91/at91pio.c 25 May 2011 22:28:41 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91pio.c,v
#include <sys/kernel.h>
#include <sys/device.h>
#include <sys/gpio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/gpio/gpiovar.h>
#include <arm/at91/at91var.h>
Index: sys/arch/arm/at91/at91pmc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91pmc.c,v
retrieving revision 1.3
diff -u -p -r1.3 at91pmc.c
--- sys/arch/arm/at91/at91pmc.c 23 Oct 2009 06:53:13 -0000 1.3
+++ sys/arch/arm/at91/at91pmc.c 25 May 2011 22:28:41 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD");
#include <sys/time.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/at91/at91spi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91spi.c,v
retrieving revision 1.2
diff -u -p -r1.2 at91spi.c
--- sys/arch/arm/at91/at91spi.c 3 Jul 2008 01:15:38 -0000 1.2
+++ sys/arch/arm/at91/at91spi.c 25 May 2011 22:28:41 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91spi.c,v
#include <sys/errno.h>
#include <sys/proc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/vmparam.h>
#include <sys/inttypes.h>
Index: sys/arch/arm/at91/at91st.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91st.c,v
retrieving revision 1.3
diff -u -p -r1.3 at91st.c
--- sys/arch/arm/at91/at91st.c 27 Oct 2009 03:42:31 -0000 1.3
+++ sys/arch/arm/at91/at91st.c 25 May 2011 22:28:41 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91st.c,v 1
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/at91/at91tctmr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91tctmr.c,v
retrieving revision 1.4
diff -u -p -r1.4 at91tctmr.c
--- sys/arch/arm/at91/at91tctmr.c 19 Jun 2010 19:47:34 -0000 1.4
+++ sys/arch/arm/at91/at91tctmr.c 25 May 2011 22:28:41 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91tctmr.c,
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/at91/at91twi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91twi.c,v
retrieving revision 1.4
diff -u -p -r1.4 at91twi.c
--- sys/arch/arm/at91/at91twi.c 14 Mar 2009 21:04:05 -0000 1.4
+++ sys/arch/arm/at91/at91twi.c 25 May 2011 22:28:41 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91twi.c,v
#include <sys/device.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/lock.h>
#include <arm/at91/at91var.h>
Index: sys/arch/arm/at91/at91usart.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/at91/at91usart.c,v
retrieving revision 1.4
diff -u -p -r1.4 at91usart.c
--- sys/arch/arm/at91/at91usart.c 24 Apr 2011 16:26:53 -0000 1.4
+++ sys/arch/arm/at91/at91usart.c 25 May 2011 22:28:41 -0000
@@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: at91usart.c,
#include <sys/kauth.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/at91/at91reg.h>
#include <arm/at91/at91var.h>
Index: sys/arch/arm/ep93xx/ep93xx_busdma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/ep93xx_busdma.c,v
retrieving revision 1.3
diff -u -p -r1.3 ep93xx_busdma.c
--- sys/arch/arm/ep93xx/ep93xx_busdma.c 23 Oct 2009 00:39:30 -0000 1.3
+++ sys/arch/arm/ep93xx/ep93xx_busdma.c 25 May 2011 22:28:41 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ep93xx_busdm
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxvar.h>
Index: sys/arch/arm/ep93xx/ep93xx_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/ep93xx_intr.c,v
retrieving revision 1.15
diff -u -p -r1.15 ep93xx_intr.c
--- sys/arch/arm/ep93xx/ep93xx_intr.c 20 Dec 2010 00:25:27 -0000 1.15
+++ sys/arch/arm/ep93xx/ep93xx_intr.c 25 May 2011 22:28:41 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.
#include <sys/malloc.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/ep93xx/ep93xx_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/ep93xx_space.c,v
retrieving revision 1.4
diff -u -p -r1.4 ep93xx_space.c
--- sys/arch/arm/ep93xx/ep93xx_space.c 23 Oct 2009 00:39:30 -0000 1.4
+++ sys/arch/arm/ep93xx/ep93xx_space.c 25 May 2011 22:28:41 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ep93xx_space
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxreg.h>
#include <arm/ep93xx/ep93xxvar.h>
Index: sys/arch/arm/ep93xx/ep93xxvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/ep93xxvar.h,v
retrieving revision 1.3
diff -u -p -r1.3 ep93xxvar.h
--- sys/arch/arm/ep93xx/ep93xxvar.h 23 Oct 2009 00:39:30 -0000 1.3
+++ sys/arch/arm/ep93xx/ep93xxvar.h 25 May 2011 22:28:41 -0000
@@ -32,7 +32,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct ep93xx_softc {
struct device sc_dev;
Index: sys/arch/arm/ep93xx/epclk.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epclk.c,v
retrieving revision 1.17
diff -u -p -r1.17 epclk.c
--- sys/arch/arm/ep93xx/epclk.c 23 Oct 2009 00:39:30 -0000 1.17
+++ sys/arch/arm/ep93xx/epclk.c 25 May 2011 22:28:41 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: epclk.c,v 1.
#include <sys/timetc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/ep93xx/epcom.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epcom.c,v
retrieving revision 1.20
diff -u -p -r1.20 epcom.c
--- sys/arch/arm/ep93xx/epcom.c 24 Apr 2011 16:26:53 -0000 1.20
+++ sys/arch/arm/ep93xx/epcom.c 25 May 2011 22:28:41 -0000
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: epcom.c,v 1.
#include <sys/kauth.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epcomreg.h>
#include <arm/ep93xx/epcomvar.h>
Index: sys/arch/arm/ep93xx/epe.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epe.c,v
retrieving revision 1.25
diff -u -p -r1.25 epe.c
--- sys/arch/arm/ep93xx/epe.c 5 Apr 2010 07:19:29 -0000 1.25
+++ sys/arch/arm/ep93xx/epe.c 25 May 2011 22:28:41 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: epe.c,v 1.25
#include <sys/device.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/ep93xx/epgpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epgpio.c,v
retrieving revision 1.3
diff -u -p -r1.3 epgpio.c
--- sys/arch/arm/ep93xx/epgpio.c 3 Aug 2009 06:57:09 -0000 1.3
+++ sys/arch/arm/ep93xx/epgpio.c 25 May 2011 22:28:41 -0000
@@ -32,7 +32,7 @@ __KERNEL_RCSID(0, "$NetBSD: epgpio.c,v 1
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <sys/gpio.h>
#include <dev/gpio/gpiovar.h>
Index: sys/arch/arm/ep93xx/epled.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epled.c,v
retrieving revision 1.2
diff -u -p -r1.2 epled.c
--- sys/arch/arm/ep93xx/epled.c 26 Mar 2006 04:38:52 -0000 1.2
+++ sys/arch/arm/ep93xx/epled.c 25 May 2011 22:28:41 -0000
@@ -32,7 +32,7 @@ __KERNEL_RCSID(0, "$NetBSD: epled.c,v 1.
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/epgpiovar.h>
#include <arm/ep93xx/epledvar.h>
Index: sys/arch/arm/ep93xx/epohci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epohci.c,v
retrieving revision 1.4
diff -u -p -r1.4 epohci.c
--- sys/arch/arm/ep93xx/epohci.c 14 Mar 2009 15:36:01 -0000 1.4
+++ sys/arch/arm/ep93xx/epohci.c 25 May 2011 22:28:41 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: epohci.c,v 1
#include <sys/mbuf.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
Index: sys/arch/arm/ep93xx/eppcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/eppcic.c,v
retrieving revision 1.4
diff -u -p -r1.4 eppcic.c
--- sys/arch/arm/ep93xx/eppcic.c 29 Jun 2008 05:53:39 -0000 1.4
+++ sys/arch/arm/ep93xx/eppcic.c 25 May 2011 22:28:41 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1
#include <sys/device.h>
#include <sys/kthread.h>
#include <uvm/uvm_param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciareg.h>
#include <dev/pcmcia/pcmciavar.h>
#include <dev/pcmcia/pcmciachip.h>
Index: sys/arch/arm/ep93xx/eprtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/eprtc.c,v
retrieving revision 1.4
diff -u -p -r1.4 eprtc.c
--- sys/arch/arm/ep93xx/eprtc.c 5 Jan 2010 13:14:56 -0000 1.4
+++ sys/arch/arm/ep93xx/eprtc.c 25 May 2011 22:28:41 -0000
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: eprtc.c,v 1.
#include <sys/kernel.h>
#include <sys/device.h>
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <arm/ep93xx/epsocvar.h>
#include <arm/ep93xx/eprtcreg.h>
Index: sys/arch/arm/ep93xx/epsoc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epsoc.c,v
retrieving revision 1.10
diff -u -p -r1.10 epsoc.c
--- sys/arch/arm/ep93xx/epsoc.c 23 Oct 2009 00:39:30 -0000 1.10
+++ sys/arch/arm/ep93xx/epsoc.c 25 May 2011 22:28:41 -0000
@@ -36,7 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: epsoc.c,v 1.
#include <sys/time.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/ep93xx/epsocvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epsocvar.h,v
retrieving revision 1.3
diff -u -p -r1.3 epsocvar.h
--- sys/arch/arm/ep93xx/epsocvar.h 23 Oct 2009 00:39:30 -0000 1.3
+++ sys/arch/arm/ep93xx/epsocvar.h 25 May 2011 22:28:41 -0000
@@ -32,7 +32,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct epgpio_softc;
Index: sys/arch/arm/ep93xx/epwdog.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ep93xx/epwdog.c,v
retrieving revision 1.3
diff -u -p -r1.3 epwdog.c
--- sys/arch/arm/ep93xx/epwdog.c 21 Aug 2006 15:01:54 -0000 1.3
+++ sys/arch/arm/ep93xx/epwdog.c 25 May 2011 22:28:41 -0000
@@ -32,7 +32,7 @@ __KERNEL_RCSID(0, "$NetBSD: epwdog.c,v 1
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ep93xx/ep93xxvar.h>
#include <arm/ep93xx/epsocvar.h>
#include <arm/ep93xx/epwdogreg.h>
Index: sys/arch/arm/footbridge/footbridge.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/footbridge.c,v
retrieving revision 1.24
diff -u -p -r1.24 footbridge.c
--- sys/arch/arm/footbridge/footbridge.c 17 May 2011 17:34:47 -0000
1.24
+++ sys/arch/arm/footbridge/footbridge.c 25 May 2011 22:28:41 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge.c
#include <dev/pci/pcivar.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/bootconfig.h>
Index: sys/arch/arm/footbridge/footbridge.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/footbridge.h,v
retrieving revision 1.3
diff -u -p -r1.3 footbridge.h
--- sys/arch/arm/footbridge/footbridge.h 14 Mar 2009 14:45:55 -0000
1.3
+++ sys/arch/arm/footbridge/footbridge.h 25 May 2011 22:28:41 -0000
@@ -4,7 +4,7 @@
#define _FOOTBRIDGE_H_
#include <sys/termios.h>
-#include <arm/bus.h>
+#include <sys/bus.h>
void footbridge_pci_bs_tag_init(void);
void footbridge_sa110_cc_setup(void);
void footbridge_create_io_bs_tag(struct bus_space *, void *);
Index: sys/arch/arm/footbridge/footbridge_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/footbridge_com.c,v
retrieving revision 1.33
diff -u -p -r1.33 footbridge_com.c
--- sys/arch/arm/footbridge/footbridge_com.c 24 Apr 2011 16:26:53 -0000
1.33
+++ sys/arch/arm/footbridge/footbridge_com.c 25 May 2011 22:28:41 -0000
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge_c
#include <sys/malloc.h>
#include <sys/termios.h>
#include <sys/kauth.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/footbridge/dc21285mem.h>
#include <arm/footbridge/dc21285reg.h>
Index: sys/arch/arm/footbridge/footbridge_com_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/footbridge_com_io.c,v
retrieving revision 1.6
diff -u -p -r1.6 footbridge_com_io.c
--- sys/arch/arm/footbridge/footbridge_com_io.c 14 Mar 2009 21:04:05 -0000
1.6
+++ sys/arch/arm/footbridge/footbridge_com_io.c 25 May 2011 22:28:41 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge_c
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Proto types for all the bus_space structure functions */
Index: sys/arch/arm/footbridge/footbridge_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/footbridge_io.c,v
retrieving revision 1.19
diff -u -p -r1.19 footbridge_io.c
--- sys/arch/arm/footbridge/footbridge_io.c 22 Nov 2010 07:27:28 -0000
1.19
+++ sys/arch/arm/footbridge/footbridge_io.c 25 May 2011 22:28:41 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge_i
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/footbridge/footbridge.h>
#include <arm/footbridge/dc21285mem.h>
#include <uvm/uvm_extern.h>
Index: sys/arch/arm/footbridge/footbridge_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/footbridge_pci.c,v
retrieving revision 1.19
diff -u -p -r1.19 footbridge_pci.c
--- sys/arch/arm/footbridge/footbridge_pci.c 4 Apr 2011 20:37:45 -0000
1.19
+++ sys/arch/arm/footbridge/footbridge_pci.c 25 May 2011 22:28:41 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: footbridge_p
#include <sys/device.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pci/pcireg.h>
Index: sys/arch/arm/footbridge/footbridgevar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/footbridgevar.h,v
retrieving revision 1.6
diff -u -p -r1.6 footbridgevar.h
--- sys/arch/arm/footbridge/footbridgevar.h 21 Jul 2009 07:35:55 -0000
1.6
+++ sys/arch/arm/footbridge/footbridgevar.h 25 May 2011 22:28:41 -0000
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/rtc.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/arm/footbridge/isa/isa_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/isa/isa_io.c,v
retrieving revision 1.5
diff -u -p -r1.5 isa_io.c
--- sys/arch/arm/footbridge/isa/isa_io.c 14 Mar 2009 21:04:05 -0000
1.5
+++ sys/arch/arm/footbridge/isa/isa_io.c 25 May 2011 22:28:41 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_io.c,v 1
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pio.h>
#include <machine/isa_machdep.h>
Index: sys/arch/arm/footbridge/isa/isa_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/isa/isa_machdep.c,v
retrieving revision 1.17
diff -u -p -r1.17 isa_machdep.c
--- sys/arch/arm/footbridge/isa/isa_machdep.c 13 Jun 2010 02:11:22 -0000
1.17
+++ sys/arch/arm/footbridge/isa/isa_machdep.c 25 May 2011 22:28:41 -0000
@@ -78,7 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: isa_machdep.
#include <sys/proc.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/pio.h>
Index: sys/arch/arm/footbridge/isa/isadma_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/isa/isadma_machdep.c,v
retrieving revision 1.13
diff -u -p -r1.13 isadma_machdep.c
--- sys/arch/arm/footbridge/isa/isadma_machdep.c 18 Mar 2009 10:22:23
-0000 1.13
+++ sys/arch/arm/footbridge/isa/isadma_machdep.c 25 May 2011 22:28:42
-0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: isadma_machd
#include <sys/mbuf.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isareg.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arm/footbridge/isa/isapnp_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/footbridge/isa/isapnp_machdep.c,v
retrieving revision 1.5
diff -u -p -r1.5 isapnp_machdep.c
--- sys/arch/arm/footbridge/isa/isapnp_machdep.c 21 Oct 2009 21:57:39
-0000 1.5
+++ sys/arch/arm/footbridge/isa/isapnp_machdep.c 25 May 2011 22:28:42
-0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: isapnp_machd
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isavar.h>
Index: sys/arch/arm/gemini/gemini_a4x_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_a4x_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 gemini_a4x_space.c
--- sys/arch/arm/gemini/gemini_a4x_space.c 24 Oct 2008 04:23:18 -0000
1.1
+++ sys/arch/arm/gemini/gemini_a4x_space.c 25 May 2011 22:28:42 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_a4x_s
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(gemini);
Index: sys/arch/arm/gemini/gemini_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_com.c,v
retrieving revision 1.2
diff -u -p -r1.2 gemini_com.c
--- sys/arch/arm/gemini/gemini_com.c 8 Nov 2008 09:39:27 -0000 1.2
+++ sys/arch/arm/gemini/gemini_com.c 25 May 2011 22:28:42 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_com.c
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/pic/picvar.h>
Index: sys/arch/arm/gemini/gemini_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_dma.c,v
retrieving revision 1.1
diff -u -p -r1.1 gemini_dma.c
--- sys/arch/arm/gemini/gemini_dma.c 24 Oct 2008 04:23:18 -0000 1.1
+++ sys/arch/arm/gemini/gemini_dma.c 25 May 2011 22:28:42 -0000
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_dma.c
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arm32_bus_dma_tag gemini_bus_dma_tag = {
0,
Index: sys/arch/arm/gemini/gemini_gmac.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_gmac.c,v
retrieving revision 1.6
diff -u -p -r1.6 gemini_gmac.c
--- sys/arch/arm/gemini/gemini_gmac.c 5 Apr 2010 07:19:29 -0000 1.6
+++ sys/arch/arm/gemini/gemini_gmac.c 25 May 2011 22:28:42 -0000
@@ -37,7 +37,7 @@
#include <net/if.h>
#include <net/if_ether.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_reg.h>
#include <arm/gemini/gemini_obiovar.h>
Index: sys/arch/arm/gemini/gemini_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_gpio.c,v
retrieving revision 1.2
diff -u -p -r1.2 gemini_gpio.c
--- sys/arch/arm/gemini/gemini_gpio.c 14 Dec 2008 01:55:15 -0000 1.2
+++ sys/arch/arm/gemini/gemini_gpio.c 25 May 2011 22:28:42 -0000
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_gpio.
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_reg.h>
#include <arm/gemini/gemini_obiovar.h>
Index: sys/arch/arm/gemini/gemini_icu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_icu.c,v
retrieving revision 1.4
diff -u -p -r1.4 gemini_icu.c
--- sys/arch/arm/gemini/gemini_icu.c 20 Dec 2010 00:25:27 -0000 1.4
+++ sys/arch/arm/gemini/gemini_icu.c 25 May 2011 22:28:42 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_icu.c
#include <uvm/uvm_extern.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: sys/arch/arm/gemini/gemini_lpchc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_lpchc.c,v
retrieving revision 1.1
diff -u -p -r1.1 gemini_lpchc.c
--- sys/arch/arm/gemini/gemini_lpchc.c 9 Nov 2008 09:15:42 -0000 1.1
+++ sys/arch/arm/gemini/gemini_lpchc.c 25 May 2011 22:28:42 -0000
@@ -18,7 +18,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_lpchc
#include <sys/malloc.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_lpchcvar.h>
#include <arm/gemini/gemini_lpcvar.h>
Index: sys/arch/arm/gemini/gemini_lpchcvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_lpchcvar.h,v
retrieving revision 1.3
diff -u -p -r1.3 gemini_lpchcvar.h
--- sys/arch/arm/gemini/gemini_lpchcvar.h 20 Nov 2008 20:23:04 -0000
1.3
+++ sys/arch/arm/gemini/gemini_lpchcvar.h 25 May 2011 22:28:42 -0000
@@ -5,7 +5,7 @@
#include <sys/types.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/arm/gemini/gemini_lpcvar.h>
Index: sys/arch/arm/gemini/gemini_lpcvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_lpcvar.h,v
retrieving revision 1.2
diff -u -p -r1.2 gemini_lpcvar.h
--- sys/arch/arm/gemini/gemini_lpcvar.h 15 Nov 2008 05:48:34 -0000 1.2
+++ sys/arch/arm/gemini/gemini_lpcvar.h 25 May 2011 22:28:42 -0000
@@ -5,7 +5,7 @@
#include <sys/types.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#define GEMINI_LPC_LDN_ALL -1 /* "global" LDN */
Index: sys/arch/arm/gemini/gemini_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_obio.c,v
retrieving revision 1.9
diff -u -p -r1.9 gemini_obio.c
--- sys/arch/arm/gemini/gemini_obio.c 17 May 2011 17:34:48 -0000 1.9
+++ sys/arch/arm/gemini/gemini_obio.c 25 May 2011 22:28:42 -0000
@@ -118,7 +118,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_obio.
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/gemini/gemini_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_pci.c,v
retrieving revision 1.9
diff -u -p -r1.9 gemini_pci.c
--- sys/arch/arm/gemini/gemini_pci.c 4 Apr 2011 20:37:45 -0000 1.9
+++ sys/arch/arm/gemini/gemini_pci.c 25 May 2011 22:28:42 -0000
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_pci.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/pic/picvar.h>
Index: sys/arch/arm/gemini/gemini_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 gemini_space.c
--- sys/arch/arm/gemini/gemini_space.c 7 Nov 2009 07:27:41 -0000 1.2
+++ sys/arch/arm/gemini/gemini_space.c 25 May 2011 22:28:42 -0000
@@ -86,7 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_space
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(gemini);
Index: sys/arch/arm/gemini/gemini_timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_timer.c,v
retrieving revision 1.4
diff -u -p -r1.4 gemini_timer.c
--- sys/arch/arm/gemini/gemini_timer.c 5 Jan 2010 13:14:56 -0000 1.4
+++ sys/arch/arm/gemini/gemini_timer.c 25 May 2011 22:28:42 -0000
@@ -96,7 +96,7 @@ __KERNEL_RCSID(0, "$NetBSD: gemini_timer
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/gemini/gemini_var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_var.h,v
retrieving revision 1.1
diff -u -p -r1.1 gemini_var.h
--- sys/arch/arm/gemini/gemini_var.h 24 Oct 2008 04:23:18 -0000 1.1
+++ sys/arch/arm/gemini/gemini_var.h 25 May 2011 22:28:42 -0000
@@ -2,7 +2,7 @@
#define _ARM_GEMINI_VAR_H_
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* GEMINI generic */
Index: sys/arch/arm/gemini/gemini_wdt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_wdt.c,v
retrieving revision 1.2
diff -u -p -r1.2 gemini_wdt.c
--- sys/arch/arm/gemini/gemini_wdt.c 1 Nov 2008 07:43:19 -0000 1.2
+++ sys/arch/arm/gemini/gemini_wdt.c 25 May 2011 22:28:42 -0000
@@ -42,7 +42,7 @@
#include <sys/wdog.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#include <arm/gemini/gemini_wdtvar.h>
Index: sys/arch/arm/gemini/gemini_wdtvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/gemini_wdtvar.h,v
retrieving revision 1.3
diff -u -p -r1.3 gemini_wdtvar.h
--- sys/arch/arm/gemini/gemini_wdtvar.h 20 Nov 2008 20:23:05 -0000 1.3
+++ sys/arch/arm/gemini/gemini_wdtvar.h 25 May 2011 22:28:42 -0000
@@ -34,7 +34,7 @@
#define _ARM_GEMINI_WDTVAR_H
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
typedef struct geminiwdt_softc {
Index: sys/arch/arm/gemini/if_gmc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/if_gmc.c,v
retrieving revision 1.3
diff -u -p -r1.3 if_gmc.c
--- sys/arch/arm/gemini/if_gmc.c 23 Dec 2008 02:15:11 -0000 1.3
+++ sys/arch/arm/gemini/if_gmc.c 25 May 2011 22:28:42 -0000
@@ -36,7 +36,7 @@
#include <sys/kmem.h>
#include <sys/mbuf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/gemini/gemini_reg.h>
Index: sys/arch/arm/gemini/if_gpn.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/if_gpn.c,v
retrieving revision 1.3
diff -u -p -r1.3 if_gpn.c
--- sys/arch/arm/gemini/if_gpn.c 5 Apr 2010 07:19:29 -0000 1.3
+++ sys/arch/arm/gemini/if_gpn.c 25 May 2011 22:28:42 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_gpn.c,v 1
#include <net/bpf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_var.h>
#include <arm/gemini/gemini_ipm.h>
Index: sys/arch/arm/gemini/lpc_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/lpc_com.c,v
retrieving revision 1.3
diff -u -p -r1.3 lpc_com.c
--- sys/arch/arm/gemini/lpc_com.c 15 Nov 2008 05:48:34 -0000 1.3
+++ sys/arch/arm/gemini/lpc_com.c 25 May 2011 22:28:42 -0000
@@ -55,7 +55,7 @@ __KERNEL_RCSID(0, "$NetBSD: lpc_com.c,v
#include <sys/kernel.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/arm/gemini/obio_lpchc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/obio_lpchc.c,v
retrieving revision 1.2
diff -u -p -r1.2 obio_lpchc.c
--- sys/arch/arm/gemini/obio_lpchc.c 20 Nov 2008 20:23:05 -0000 1.2
+++ sys/arch/arm/gemini/obio_lpchc.c 25 May 2011 22:28:42 -0000
@@ -17,7 +17,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_lpchc.c
#include <sys/systm.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/gemini/gemini_obiovar.h>
#include <arm/gemini/gemini_lpcvar.h>
Index: sys/arch/arm/gemini/obio_timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/obio_timer.c,v
retrieving revision 1.4
diff -u -p -r1.4 obio_timer.c
--- sys/arch/arm/gemini/obio_timer.c 4 Dec 2008 00:38:07 -0000 1.4
+++ sys/arch/arm/gemini/obio_timer.c 25 May 2011 22:28:42 -0000
@@ -120,7 +120,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_timer.c
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/gemini/gemini_reg.h>
Index: sys/arch/arm/gemini/obio_wdc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/obio_wdc.c,v
retrieving revision 1.2
diff -u -p -r1.2 obio_wdc.c
--- sys/arch/arm/gemini/obio_wdc.c 17 Nov 2008 23:51:30 -0000 1.2
+++ sys/arch/arm/gemini/obio_wdc.c 25 May 2011 22:28:42 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_wdc.c,v
#include <sys/device.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/gemini/gemini_var.h>
Index: sys/arch/arm/gemini/obio_wdt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/gemini/obio_wdt.c,v
retrieving revision 1.5
diff -u -p -r1.5 obio_wdt.c
--- sys/arch/arm/gemini/obio_wdt.c 20 Nov 2008 20:23:05 -0000 1.5
+++ sys/arch/arm/gemini/obio_wdt.c 25 May 2011 22:28:42 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v
#include <sys/wdog.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#include <arm/gemini/gemini_obiovar.h>
Index: sys/arch/arm/imx/imx31_ahb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx31_ahb.c,v
retrieving revision 1.4
diff -u -p -r1.4 imx31_ahb.c
--- sys/arch/arm/imx/imx31_ahb.c 13 Nov 2010 05:00:31 -0000 1.4
+++ sys/arch/arm/imx/imx31_ahb.c 25 May 2011 22:28:42 -0000
@@ -112,7 +112,7 @@ __KERNEL_RCSID(0, "$Id: imx31_ahb.c,v 1.
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/imx/imx31_aips.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx31_aips.c,v
retrieving revision 1.3
diff -u -p -r1.3 imx31_aips.c
--- sys/arch/arm/imx/imx31_aips.c 2 May 2008 22:00:29 -0000 1.3
+++ sys/arch/arm/imx/imx31_aips.c 25 May 2011 22:28:42 -0000
@@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$Id: imx31_aips.c,v 1
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/imx/imx31_clock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx31_clock.c,v
retrieving revision 1.2
diff -u -p -r1.2 imx31_clock.c
--- sys/arch/arm/imx/imx31_clock.c 15 Nov 2010 18:19:19 -0000 1.2
+++ sys/arch/arm/imx/imx31_clock.c 25 May 2011 22:28:42 -0000
@@ -37,7 +37,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: sys/arch/arm/imx/imx31_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx31_gpio.c,v
retrieving revision 1.5
diff -u -p -r1.5 imx31_gpio.c
--- sys/arch/arm/imx/imx31_gpio.c 15 Nov 2010 18:18:39 -0000 1.5
+++ sys/arch/arm/imx/imx31_gpio.c 25 May 2011 22:28:42 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx31_gpio.c
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx31reg.h>
#include <arm/imx/imx31var.h>
Index: sys/arch/arm/imx/imx31_icu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx31_icu.c,v
retrieving revision 1.5
diff -u -p -r1.5 imx31_icu.c
--- sys/arch/arm/imx/imx31_icu.c 19 Nov 2008 06:28:14 -0000 1.5
+++ sys/arch/arm/imx/imx31_icu.c 25 May 2011 22:28:42 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx31_icu.c,
#include <arm/cpufunc.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx31reg.h>
#include <arm/imx/imx31var.h>
Index: sys/arch/arm/imx/imx51_clock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx51_clock.c,v
retrieving revision 1.1
diff -u -p -r1.1 imx51_clock.c
--- sys/arch/arm/imx/imx51_clock.c 13 Nov 2010 06:51:37 -0000 1.1
+++ sys/arch/arm/imx/imx51_clock.c 25 May 2011 22:28:42 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_clock.
#include <dev/clock_subr.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/imx/imx51_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx51_gpio.c,v
retrieving revision 1.1
diff -u -p -r1.1 imx51_gpio.c
--- sys/arch/arm/imx/imx51_gpio.c 30 Nov 2010 13:05:27 -0000 1.1
+++ sys/arch/arm/imx/imx51_gpio.c 25 May 2011 22:28:42 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_gpio.c
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx51reg.h>
#include <arm/imx/imx51var.h>
Index: sys/arch/arm/imx/imx51_iomux.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx51_iomux.c,v
retrieving revision 1.1
diff -u -p -r1.1 imx51_iomux.c
--- sys/arch/arm/imx/imx51_iomux.c 30 Nov 2010 13:05:27 -0000 1.1
+++ sys/arch/arm/imx/imx51_iomux.c 25 May 2011 22:28:42 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_iomux.
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx51reg.h>
#include <arm/imx/imx51var.h>
Index: sys/arch/arm/imx/imx51_tzic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx51_tzic.c,v
retrieving revision 1.2
diff -u -p -r1.2 imx51_tzic.c
--- sys/arch/arm/imx/imx51_tzic.c 20 Dec 2010 00:25:28 -0000 1.2
+++ sys/arch/arm/imx/imx51_tzic.c 25 May 2011 22:28:42 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx51_tzic.c
#include <sys/atomic.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: sys/arch/arm/imx/imx_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx_dma.c,v
retrieving revision 1.1
diff -u -p -r1.1 imx_dma.c
--- sys/arch/arm/imx/imx_dma.c 13 Nov 2010 07:11:03 -0000 1.1
+++ sys/arch/arm/imx/imx_dma.c 25 May 2011 22:28:42 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx_dma.c,v
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arm32_bus_dma_tag imx_bus_dma_tag = {
0,
Index: sys/arch/arm/imx/imx_pcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx_pcic.c,v
retrieving revision 1.3
diff -u -p -r1.3 imx_pcic.c
--- sys/arch/arm/imx/imx_pcic.c 30 Jun 2008 00:46:41 -0000 1.3
+++ sys/arch/arm/imx/imx_pcic.c 25 May 2011 22:28:42 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$Id: imx_pcic.c,v 1.3
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/pcmcia/pcmciareg.h>
Index: sys/arch/arm/imx/imx_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imx_space.c,v
retrieving revision 1.2
diff -u -p -r1.2 imx_space.c
--- sys/arch/arm/imx/imx_space.c 13 Nov 2010 05:00:31 -0000 1.2
+++ sys/arch/arm/imx/imx_space.c 25 May 2011 22:28:42 -0000
@@ -80,7 +80,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
bs_protos(imx);
bs_protos(generic);
Index: sys/arch/arm/imx/imxclock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imxclock.c,v
retrieving revision 1.3
diff -u -p -r1.3 imxclock.c
--- sys/arch/arm/imx/imxclock.c 13 Nov 2010 06:51:37 -0000 1.3
+++ sys/arch/arm/imx/imxclock.c 25 May 2011 22:28:42 -0000
@@ -41,7 +41,7 @@
#include <sys/device.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: sys/arch/arm/imx/imxgpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/imx/imxgpio.c,v
retrieving revision 1.1
diff -u -p -r1.1 imxgpio.c
--- sys/arch/arm/imx/imxgpio.c 30 Nov 2010 13:05:27 -0000 1.1
+++ sys/arch/arm/imx/imxgpio.c 25 May 2011 22:28:42 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: imxgpio.c,v
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/imx/imx31reg.h>
#include <arm/imx/imx31var.h>
cvs diff: cannot find sys/arch/arm/include/bus.h
Index: sys/arch/arm/include/isa_machdep.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/include/isa_machdep.h,v
retrieving revision 1.7
diff -u -p -r1.7 isa_machdep.h
--- sys/arch/arm/include/isa_machdep.h 19 Aug 2009 15:01:07 -0000 1.7
+++ sys/arch/arm/include/isa_machdep.h 25 May 2011 22:28:42 -0000
@@ -33,7 +33,7 @@
#ifndef _ARM32_ISA_MACHDEP_H_
#define _ARM32_ISA_MACHDEP_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/isa/isadmavar.h>
/*
Index: sys/arch/arm/include/pio.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/include/pio.h,v
retrieving revision 1.1
diff -u -p -r1.1 pio.h
--- sys/arch/arm/include/pio.h 23 Feb 2001 21:23:48 -0000 1.1
+++ sys/arch/arm/include/pio.h 25 May 2011 22:28:42 -0000
@@ -36,7 +36,7 @@
#ifndef _ARM32_PIO_H_
#define _ARM32_PIO_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
extern struct bus_space isa_io_bs_tag;
Index: sys/arch/arm/iomd/iomd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/iomd.c,v
retrieving revision 1.15
diff -u -p -r1.15 iomd.c
--- sys/arch/arm/iomd/iomd.c 5 Aug 2006 18:22:57 -0000 1.15
+++ sys/arch/arm/iomd/iomd.c 25 May 2011 22:28:42 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: iomd.c,v 1.1
#include <sys/conf.h>
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <arm/iomd/iomdreg.h>
Index: sys/arch/arm/iomd/iomd_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/iomd_io.c,v
retrieving revision 1.5
diff -u -p -r1.5 iomd_io.c
--- sys/arch/arm/iomd/iomd_io.c 5 Aug 2006 18:22:57 -0000 1.5
+++ sys/arch/arm/iomd/iomd_io.c 25 May 2011 22:28:42 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: iomd_io.c,v
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Proto types for all the bus_space structure functions */
Index: sys/arch/arm/iomd/iomdkbc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/iomdkbc.c,v
retrieving revision 1.3
diff -u -p -r1.3 iomdkbc.c
--- sys/arch/arm/iomd/iomdkbc.c 21 Oct 2006 22:45:03 -0000 1.3
+++ sys/arch/arm/iomd/iomdkbc.c 25 May 2011 22:28:42 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: iomdkbc.c,v
#include <dev/pckbport/pckbportvar.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arch/arm/iomd/iomdreg.h>
Index: sys/arch/arm/iomd/iomdvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/iomdvar.h,v
retrieving revision 1.2
diff -u -p -r1.2 iomdvar.h
--- sys/arch/arm/iomd/iomdvar.h 19 Apr 2002 01:04:39 -0000 1.2
+++ sys/arch/arm/iomd/iomdvar.h 25 May 2011 22:28:42 -0000
@@ -39,7 +39,7 @@
* Created : 02/02/97
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* Attach args for iomd_clock device
Index: sys/arch/arm/iomd/qms.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/qms.c,v
retrieving revision 1.15
diff -u -p -r1.15 qms.c
--- sys/arch/arm/iomd/qms.c 10 May 2008 15:31:04 -0000 1.15
+++ sys/arch/arm/iomd/qms.c 25 May 2011 22:28:42 -0000
@@ -56,7 +56,7 @@ __KERNEL_RCSID(0, "$NetBSD: qms.c,v 1.15
#include <sys/systm.h>
#include <sys/select.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/iomd/iomdvar.h>
Index: sys/arch/arm/iomd/vidc20.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/vidc20.c,v
retrieving revision 1.15
diff -u -p -r1.15 vidc20.c
--- sys/arch/arm/iomd/vidc20.c 5 Aug 2006 18:22:57 -0000 1.15
+++ sys/arch/arm/iomd/vidc20.c 25 May 2011 22:28:42 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: vidc20.c,v 1
#include <sys/systm.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/iomd/vidc.h>
#include <machine/io.h>
#include <arm/iomd/iomdreg.h>
Index: sys/arch/arm/iomd/vidcvideo.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/vidcvideo.c,v
retrieving revision 1.38
diff -u -p -r1.38 vidcvideo.c
--- sys/arch/arm/iomd/vidcvideo.c 21 Oct 2009 00:30:43 -0000 1.38
+++ sys/arch/arm/iomd/vidcvideo.c 25 May 2011 22:28:42 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,
#include <sys/ioctl.h>
#include <arm/mainbus/mainbus.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <dev/wscons/wsconsio.h>
Index: sys/arch/arm/iomd/console/consinit.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/iomd/console/consinit.c,v
retrieving revision 1.7
diff -u -p -r1.7 consinit.c
--- sys/arch/arm/iomd/console/consinit.c 16 Aug 2006 07:59:44 -0000
1.7
+++ sys/arch/arm/iomd/console/consinit.c 25 May 2011 22:28:42 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cons.h>
Index: sys/arch/arm/ixp12x0/ixp12x0.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0.c,v
retrieving revision 1.17
diff -u -p -r1.17 ixp12x0.c
--- sys/arch/arm/ixp12x0/ixp12x0.c 17 May 2011 17:34:48 -0000 1.17
+++ sys/arch/arm/ixp12x0/ixp12x0.c 25 May 2011 22:28:42 -0000
@@ -34,7 +34,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0.c,v
#include <sys/device.h>
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0reg.h>
#include <arm/ixp12x0/ixp12x0var.h>
Index: sys/arch/arm/ixp12x0/ixp12x0_clk.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0_clk.c,v
retrieving revision 1.14
diff -u -p -r1.14 ixp12x0_clk.c
--- sys/arch/arm/ixp12x0/ixp12x0_clk.c 10 May 2008 15:31:04 -0000 1.14
+++ sys/arch/arm/ixp12x0/ixp12x0_clk.c 25 May 2011 22:28:42 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_clk.
#include <sys/timetc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/ixp12x0/ixp12x0_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0_com.c,v
retrieving revision 1.38
diff -u -p -r1.38 ixp12x0_com.c
--- sys/arch/arm/ixp12x0/ixp12x0_com.c 24 Apr 2011 16:26:54 -0000 1.38
+++ sys/arch/arm/ixp12x0/ixp12x0_com.c 25 May 2011 22:28:42 -0000
@@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_com.
#include <sys/lwp.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0_comreg.h>
#include <arm/ixp12x0/ixp12x0_comvar.h>
Index: sys/arch/arm/ixp12x0/ixp12x0_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0_intr.c,v
retrieving revision 1.21
diff -u -p -r1.21 ixp12x0_intr.c
--- sys/arch/arm/ixp12x0/ixp12x0_intr.c 20 Dec 2010 00:25:28 -0000 1.21
+++ sys/arch/arm/ixp12x0/ixp12x0_intr.c 25 May 2011 22:28:42 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr
#include <sys/simplelock.h>
#include <sys/termios.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/ixp12x0/ixp12x0_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0_io.c,v
retrieving revision 1.14
diff -u -p -r1.14 ixp12x0_io.c
--- sys/arch/arm/ixp12x0/ixp12x0_io.c 7 Nov 2009 07:27:41 -0000 1.14
+++ sys/arch/arm/ixp12x0/ixp12x0_io.c 25 May 2011 22:28:42 -0000
@@ -40,7 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_io.c
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0reg.h>
#include <arm/ixp12x0/ixp12x0var.h>
Index: sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c,v
retrieving revision 1.7
diff -u -p -r1.7 ixp12x0_pci_dma.c
--- sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c 21 Oct 2009 14:15:50 -0000
1.7
+++ sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c 25 May 2011 22:28:42 -0000
@@ -38,7 +38,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp12x0_pci_
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0_pcireg.h>
#include <arm/ixp12x0/ixp12x0var.h>
Index: sys/arch/arm/ixp12x0/ixp12x0var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixp12x0var.h,v
retrieving revision 1.8
diff -u -p -r1.8 ixp12x0var.h
--- sys/arch/arm/ixp12x0/ixp12x0var.h 21 Oct 2009 14:15:50 -0000 1.8
+++ sys/arch/arm/ixp12x0/ixp12x0var.h 25 May 2011 22:28:42 -0000
@@ -33,7 +33,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/arm/ixp12x0/ixpsip.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixpsip.c,v
retrieving revision 1.12
diff -u -p -r1.12 ixpsip.c
--- sys/arch/arm/ixp12x0/ixpsip.c 21 Oct 2009 14:15:50 -0000 1.12
+++ sys/arch/arm/ixp12x0/ixpsip.c 25 May 2011 22:28:42 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixpsip.c,v 1
#include <sys/device.h>
#include <machine/autoconf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/ixp12x0/ixp12x0var.h>
#include <arm/ixp12x0/ixpsipvar.h>
Index: sys/arch/arm/ixp12x0/ixpsipvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/ixp12x0/ixpsipvar.h,v
retrieving revision 1.2
diff -u -p -r1.2 ixpsipvar.h
--- sys/arch/arm/ixp12x0/ixpsipvar.h 21 Oct 2009 14:15:50 -0000 1.2
+++ sys/arch/arm/ixp12x0/ixpsipvar.h 25 May 2011 22:28:42 -0000
@@ -33,7 +33,7 @@
#include <sys/device.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct ixpsip_softc {
struct device sc_dev;
Index: sys/arch/arm/mainbus/mainbus.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mainbus/mainbus.c,v
retrieving revision 1.16
diff -u -p -r1.16 mainbus.c
--- sys/arch/arm/mainbus/mainbus.c 14 Mar 2009 15:36:02 -0000 1.16
+++ sys/arch/arm/mainbus/mainbus.c 25 May 2011 22:28:42 -0000
@@ -54,7 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v
#if defined(arm32) /* XXX */
#include <machine/io.h>
#endif
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/mainbus/mainbus.h>
#include "locators.h"
Index: sys/arch/arm/mainbus/mainbus.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mainbus/mainbus.h,v
retrieving revision 1.1
diff -u -p -r1.1 mainbus.h
--- sys/arch/arm/mainbus/mainbus.h 24 Feb 2001 19:38:02 -0000 1.1
+++ sys/arch/arm/mainbus/mainbus.h 25 May 2011 22:28:42 -0000
@@ -41,7 +41,7 @@
* Created : 15/12/94
*/
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* mainbus driver attach arguments
Index: sys/arch/arm/mainbus/mainbus_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mainbus/mainbus_io.c,v
retrieving revision 1.20
diff -u -p -r1.20 mainbus_io.c
--- sys/arch/arm/mainbus/mainbus_io.c 7 Nov 2009 07:27:41 -0000 1.20
+++ sys/arch/arm/mainbus/mainbus_io.c 25 May 2011 22:28:42 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus_io.c
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
/* Proto types for all the bus_space structure functions */
Index: sys/arch/arm/marvell/mvsoc_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/marvell/mvsoc_dma.c,v
retrieving revision 1.1
diff -u -p -r1.1 mvsoc_dma.c
--- sys/arch/arm/marvell/mvsoc_dma.c 3 Oct 2010 05:49:24 -0000 1.1
+++ sys/arch/arm/marvell/mvsoc_dma.c 25 May 2011 22:28:42 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: mvsoc_dma.c,
#include <sys/systm.h>
#include <sys/extent.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/marvell/mvsocvar.h>
Index: sys/arch/arm/marvell/mvsoc_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/marvell/mvsoc_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 mvsoc_space.c
--- sys/arch/arm/marvell/mvsoc_space.c 3 Oct 2010 05:49:24 -0000 1.1
+++ sys/arch/arm/marvell/mvsoc_space.c 25 May 2011 22:28:42 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: mvsoc_space.
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/marvell/mvsocreg.h>
#include <arm/marvell/mvsocvar.h>
Index: sys/arch/arm/marvell/mvsocrtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/marvell/mvsocrtc.c,v
retrieving revision 1.1
diff -u -p -r1.1 mvsocrtc.c
--- sys/arch/arm/marvell/mvsocrtc.c 5 Mar 2011 14:50:56 -0000 1.1
+++ sys/arch/arm/marvell/mvsocrtc.c 25 May 2011 22:28:42 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mvsocrtc.c,v
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/marvell/mvsocrtcreg.h>
#include <dev/marvell/marvellvar.h>
Index: sys/arch/arm/marvell/mvsocvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/marvell/mvsocvar.h,v
retrieving revision 1.1
diff -u -p -r1.1 mvsocvar.h
--- sys/arch/arm/marvell/mvsocvar.h 3 Oct 2010 05:49:24 -0000 1.1
+++ sys/arch/arm/marvell/mvsocvar.h 25 May 2011 22:28:42 -0000
@@ -28,7 +28,7 @@
#ifndef _MVSOCVAR_H_
#define _MVSOCVAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
struct mvsoc_softc {
device_t sc_dev;
Index: sys/arch/arm/mpcore/dic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mpcore/dic.c,v
retrieving revision 1.1
diff -u -p -r1.1 dic.c
--- sys/arch/arm/mpcore/dic.c 11 Mar 2011 03:26:37 -0000 1.1
+++ sys/arch/arm/mpcore/dic.c 25 May 2011 22:28:42 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: dic.c,v 1.1
#include <sys/atomic.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: sys/arch/arm/mpcore/mpcore_a2x_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mpcore/mpcore_a2x_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 mpcore_a2x_space.c
--- sys/arch/arm/mpcore/mpcore_a2x_space.c 10 Mar 2011 07:47:15 -0000
1.1
+++ sys/arch/arm/mpcore/mpcore_a2x_space.c 25 May 2011 22:28:42 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcore_a2x_s
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(mpcore);
Index: sys/arch/arm/mpcore/mpcore_a4x_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mpcore/mpcore_a4x_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 mpcore_a4x_space.c
--- sys/arch/arm/mpcore/mpcore_a4x_space.c 10 Mar 2011 07:47:15 -0000
1.1
+++ sys/arch/arm/mpcore/mpcore_a4x_space.c 25 May 2011 22:28:42 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcore_a4x_s
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(mpcore);
Index: sys/arch/arm/mpcore/mpcore_clock.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mpcore/mpcore_clock.c,v
retrieving revision 1.1
diff -u -p -r1.1 mpcore_clock.c
--- sys/arch/arm/mpcore/mpcore_clock.c 10 Mar 2011 07:47:15 -0000 1.1
+++ sys/arch/arm/mpcore/mpcore_clock.c 25 May 2011 22:28:42 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcore_clock
#include <dev/clock_subr.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: sys/arch/arm/mpcore/mpcore_pmr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mpcore/mpcore_pmr.c,v
retrieving revision 1.1
diff -u -p -r1.1 mpcore_pmr.c
--- sys/arch/arm/mpcore/mpcore_pmr.c 10 Mar 2011 07:47:15 -0000 1.1
+++ sys/arch/arm/mpcore/mpcore_pmr.c 25 May 2011 22:28:42 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: mpcore_pmr.c
#include <sys/atomic.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <uvm/uvm_extern.h>
Index: sys/arch/arm/mpcore/mpcore_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/mpcore/mpcore_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 mpcore_space.c
--- sys/arch/arm/mpcore/mpcore_space.c 10 Mar 2011 07:47:15 -0000 1.1
+++ sys/arch/arm/mpcore/mpcore_space.c 25 May 2011 22:28:42 -0000
@@ -80,7 +80,7 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
bs_protos(mpcore);
bs_protos(generic);
Index: sys/arch/arm/omap/obio_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/obio_com.c,v
retrieving revision 1.3
diff -u -p -r1.3 obio_com.c
--- sys/arch/arm/omap/obio_com.c 27 Aug 2008 11:03:10 -0000 1.3
+++ sys/arch/arm/omap/obio_com.c 25 May 2011 22:28:42 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_com.c,v
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/arm/omap/obio_mputmr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/obio_mputmr.c,v
retrieving revision 1.4
diff -u -p -r1.4 obio_mputmr.c
--- sys/arch/arm/omap/obio_mputmr.c 21 Nov 2008 17:13:07 -0000 1.4
+++ sys/arch/arm/omap/obio_mputmr.c 25 May 2011 22:28:42 -0000
@@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_mputmr.
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/omap/omap2_obiovar.h>
Index: sys/arch/arm/omap/obio_ohci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/obio_ohci.c,v
retrieving revision 1.4
diff -u -p -r1.4 obio_ohci.c
--- sys/arch/arm/omap/obio_ohci.c 12 Dec 2008 17:36:14 -0000 1.4
+++ sys/arch/arm/omap/obio_ohci.c 25 May 2011 22:28:42 -0000
@@ -31,7 +31,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_ohci.c,
#include <sys/kernel.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
Index: sys/arch/arm/omap/obio_wdt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/obio_wdt.c,v
retrieving revision 1.4
diff -u -p -r1.4 obio_wdt.c
--- sys/arch/arm/omap/obio_wdt.c 21 Nov 2008 17:13:07 -0000 1.4
+++ sys/arch/arm/omap/obio_wdt.c 25 May 2011 22:28:42 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: obio_wdt.c,v
#include <sys/wdog.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#include <arm/omap/omap2_obiovar.h>
Index: sys/arch/arm/omap/omap2430_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2430_intr.c,v
retrieving revision 1.5
diff -u -p -r1.5 omap2430_intr.c
--- sys/arch/arm/omap/omap2430_intr.c 20 Dec 2010 00:25:29 -0000 1.5
+++ sys/arch/arm/omap/omap2430_intr.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2430_int
#include <arm/cpufunc.h>
#include <arm/omap/omap2_reg.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef OMAP_2430
#define NIGROUPS 8
Index: sys/arch/arm/omap/omap2_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_gpio.c,v
retrieving revision 1.7
diff -u -p -r1.7 omap2_gpio.c
--- sys/arch/arm/omap/omap2_gpio.c 21 Nov 2008 17:13:07 -0000 1.7
+++ sys/arch/arm/omap/omap2_gpio.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_gpio.c
#include <arm/armreg.h>
#include <arm/cpufunc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/omap/omap2_reg.h>
#include <arm/omap/omap2_obiovar.h>
Index: sys/arch/arm/omap/omap2_gpmc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_gpmc.c,v
retrieving revision 1.8
diff -u -p -r1.8 omap2_gpmc.c
--- sys/arch/arm/omap/omap2_gpmc.c 4 Sep 2010 16:23:47 -0000 1.8
+++ sys/arch/arm/omap/omap2_gpmc.c 25 May 2011 22:28:43 -0000
@@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_gpmc.c
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/omap/omap2_icu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_icu.c,v
retrieving revision 1.7
diff -u -p -r1.7 omap2_icu.c
--- sys/arch/arm/omap/omap2_icu.c 20 Dec 2010 00:25:29 -0000 1.7
+++ sys/arch/arm/omap/omap2_icu.c 25 May 2011 22:28:43 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_icu.c,
#include <uvm/uvm_extern.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpu.h>
#include <arm/armreg.h>
Index: sys/arch/arm/omap/omap2_l3i.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_l3i.c,v
retrieving revision 1.5
diff -u -p -r1.5 omap2_l3i.c
--- sys/arch/arm/omap/omap2_l3i.c 21 Nov 2008 17:13:07 -0000 1.5
+++ sys/arch/arm/omap/omap2_l3i.c 25 May 2011 22:28:43 -0000
@@ -114,7 +114,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_l3i.c,
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/omap/omap2_mputmr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_mputmr.c,v
retrieving revision 1.3
diff -u -p -r1.3 omap2_mputmr.c
--- sys/arch/arm/omap/omap2_mputmr.c 19 Jun 2010 19:44:58 -0000 1.3
+++ sys/arch/arm/omap/omap2_mputmr.c 25 May 2011 22:28:43 -0000
@@ -92,7 +92,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_mputmr
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/omap/omap_gptmrreg.h>
Index: sys/arch/arm/omap/omap2_nand.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_nand.c,v
retrieving revision 1.2
diff -u -p -r1.2 omap2_nand.c
--- sys/arch/arm/omap/omap2_nand.c 27 Mar 2011 13:35:39 -0000 1.2
+++ sys/arch/arm/omap/omap2_nand.c 25 May 2011 22:28:43 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_nand.c
#include <sys/cdefs.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arch/arm/omap/omap2_gpmcvar.h>
#include <arch/arm/omap/omap2_gpmcreg.h>
Index: sys/arch/arm/omap/omap2_obio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_obio.c,v
retrieving revision 1.11
diff -u -p -r1.11 omap2_obio.c
--- sys/arch/arm/omap/omap2_obio.c 4 Sep 2010 14:22:28 -0000 1.11
+++ sys/arch/arm/omap/omap2_obio.c 25 May 2011 22:28:43 -0000
@@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_obio.c
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/omap/omap2_prcm.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap2_prcm.c,v
retrieving revision 1.1
diff -u -p -r1.1 omap2_prcm.c
--- sys/arch/arm/omap/omap2_prcm.c 28 Aug 2010 13:02:32 -0000 1.1
+++ sys/arch/arm/omap/omap2_prcm.c 25 May 2011 22:28:43 -0000
@@ -33,7 +33,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap2_prcm.c
#include <sys/param.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/omap/omap_var.h>
Index: sys/arch/arm/omap/omap5912_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap5912_intr.c,v
retrieving revision 1.4
diff -u -p -r1.4 omap5912_intr.c
--- sys/arch/arm/omap/omap5912_intr.c 20 Dec 2010 00:25:29 -0000 1.4
+++ sys/arch/arm/omap/omap5912_intr.c 25 May 2011 22:28:43 -0000
@@ -35,7 +35,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap5912_int
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/lock.h>
Index: sys/arch/arm/omap/omap_a2x_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_a2x_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 omap_a2x_space.c
--- sys/arch/arm/omap/omap_a2x_space.c 6 Jan 2007 00:29:52 -0000 1.1
+++ sys/arch/arm/omap/omap_a2x_space.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_a2x_spa
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(omap);
Index: sys/arch/arm/omap/omap_a4x_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_a4x_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 omap_a4x_space.c
--- sys/arch/arm/omap/omap_a4x_space.c 6 Jan 2007 00:29:52 -0000 1.1
+++ sys/arch/arm/omap/omap_a4x_space.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_a4x_spa
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(omap);
Index: sys/arch/arm/omap/omap_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_com.c,v
retrieving revision 1.3
diff -u -p -r1.3 omap_com.c
--- sys/arch/arm/omap/omap_com.c 21 Nov 2008 17:13:07 -0000 1.3
+++ sys/arch/arm/omap/omap_com.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_com.c,v
#include <sys/termios.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/ic/comreg.h>
#include <dev/ic/comvar.h>
Index: sys/arch/arm/omap/omap_dma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_dma.c,v
retrieving revision 1.2
diff -u -p -r1.2 omap_dma.c
--- sys/arch/arm/omap/omap_dma.c 7 Jul 2010 22:53:44 -0000 1.2
+++ sys/arch/arm/omap/omap_dma.c 25 May 2011 22:28:43 -0000
@@ -37,7 +37,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_dma.c,v
#include <uvm/uvm_extern.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
struct arm32_bus_dma_tag omap_bus_dma_tag = {
0,
Index: sys/arch/arm/omap/omap_emifs.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_emifs.c,v
retrieving revision 1.4
diff -u -p -r1.4 omap_emifs.c
--- sys/arch/arm/omap/omap_emifs.c 12 Dec 2008 17:36:14 -0000 1.4
+++ sys/arch/arm/omap/omap_emifs.c 25 May 2011 22:28:43 -0000
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_emifs.c
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/omap/omap_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_gpio.c,v
retrieving revision 1.5
diff -u -p -r1.5 omap_gpio.c
--- sys/arch/arm/omap/omap_gpio.c 17 Dec 2008 20:51:32 -0000 1.5
+++ sys/arch/arm/omap/omap_gpio.c 25 May 2011 22:28:43 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_gpio.c,
#include <sys/malloc.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/omap/omap_tipb.h>
#include <arm/omap/omap_gpio.h>
Index: sys/arch/arm/omap/omap_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_intr.c,v
retrieving revision 1.8
diff -u -p -r1.8 omap_intr.c
--- sys/arch/arm/omap/omap_intr.c 20 Dec 2010 00:25:29 -0000 1.8
+++ sys/arch/arm/omap/omap_intr.c 25 May 2011 22:28:43 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_intr.c,
#include <sys/malloc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <machine/lock.h>
Index: sys/arch/arm/omap/omap_mputmr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_mputmr.c,v
retrieving revision 1.5
diff -u -p -r1.5 omap_mputmr.c
--- sys/arch/arm/omap/omap_mputmr.c 12 Dec 2008 17:36:14 -0000 1.5
+++ sys/arch/arm/omap/omap_mputmr.c 25 May 2011 22:28:43 -0000
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_mputmr.
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/omap/omap_reg.h>
Index: sys/arch/arm/omap/omap_nobyteacc_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_nobyteacc_space.c,v
retrieving revision 1.1
diff -u -p -r1.1 omap_nobyteacc_space.c
--- sys/arch/arm/omap/omap_nobyteacc_space.c 6 Jan 2007 00:29:52 -0000
1.1
+++ sys/arch/arm/omap/omap_nobyteacc_space.c 25 May 2011 22:28:43 -0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_nobytea
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(omap);
Index: sys/arch/arm/omap/omap_ocp.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_ocp.c,v
retrieving revision 1.4
diff -u -p -r1.4 omap_ocp.c
--- sys/arch/arm/omap/omap_ocp.c 12 Dec 2008 17:36:14 -0000 1.4
+++ sys/arch/arm/omap/omap_ocp.c 25 May 2011 22:28:43 -0000
@@ -107,7 +107,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_ocp.c,v
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/omap/omap_rtc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_rtc.c,v
retrieving revision 1.4
diff -u -p -r1.4 omap_rtc.c
--- sys/arch/arm/omap/omap_rtc.c 12 Dec 2008 17:36:14 -0000 1.4
+++ sys/arch/arm/omap/omap_rtc.c 25 May 2011 22:28:43 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_rtc.c,v
#include <sys/device.h>
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/omap/omap_reg.h>
Index: sys/arch/arm/omap/omap_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_space.c,v
retrieving revision 1.3
diff -u -p -r1.3 omap_space.c
--- sys/arch/arm/omap/omap_space.c 7 Nov 2009 07:27:41 -0000 1.3
+++ sys/arch/arm/omap/omap_space.c 25 May 2011 22:28:43 -0000
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_space.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(omap);
Index: sys/arch/arm/omap/omap_tipb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_tipb.c,v
retrieving revision 1.4
diff -u -p -r1.4 omap_tipb.c
--- sys/arch/arm/omap/omap_tipb.c 12 Dec 2008 17:36:14 -0000 1.4
+++ sys/arch/arm/omap/omap_tipb.c 25 May 2011 22:28:43 -0000
@@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: omap_tipb.c,
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/omap/omap_var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_var.h,v
retrieving revision 1.2
diff -u -p -r1.2 omap_var.h
--- sys/arch/arm/omap/omap_var.h 27 Apr 2008 18:58:45 -0000 1.2
+++ sys/arch/arm/omap/omap_var.h 25 May 2011 22:28:43 -0000
@@ -2,7 +2,7 @@
#define _ARM_OMAP_OMAP_VAR_H_
#include <sys/types.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Texas Instruments OMAP generic */
Index: sys/arch/arm/omap/omap_wdt.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_wdt.c,v
retrieving revision 1.2
diff -u -p -r1.2 omap_wdt.c
--- sys/arch/arm/omap/omap_wdt.c 27 Apr 2008 18:58:45 -0000 1.2
+++ sys/arch/arm/omap/omap_wdt.c 25 May 2011 22:28:43 -0000
@@ -40,7 +40,7 @@
#include <sys/wdog.h>
#include <machine/param.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#include <arm/omap/omap_wdtvar.h>
Index: sys/arch/arm/omap/omap_wdtvar.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omap_wdtvar.h,v
retrieving revision 1.3
diff -u -p -r1.3 omap_wdtvar.h
--- sys/arch/arm/omap/omap_wdtvar.h 21 Nov 2008 17:13:07 -0000 1.3
+++ sys/arch/arm/omap/omap_wdtvar.h 25 May 2011 22:28:43 -0000
@@ -32,7 +32,7 @@
#define _OMAP_WDTVAR_H
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/sysmon/sysmonvar.h>
#define OMAPWDT32K_DEFAULT_PERIOD 4 /* in seconds */
Index: sys/arch/arm/omap/omapfb.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/omap/omapfb.c,v
retrieving revision 1.2
diff -u -p -r1.2 omapfb.c
--- sys/arch/arm/omap/omapfb.c 12 Apr 2011 18:10:15 -0000 1.2
+++ sys/arch/arm/omap/omapfb.c 25 May 2011 22:28:43 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: omapfb.c,v 1
#include <dev/videomode/videomode.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/omap/omapfbreg.h>
#include <arm/omap/omap2_obiovar.h>
#include <arm/omap/omap2_obioreg.h>
Index: sys/arch/arm/s3c2xx0/ohci_s3c24x0.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/ohci_s3c24x0.c,v
retrieving revision 1.7
diff -u -p -r1.7 ohci_s3c24x0.c
--- sys/arch/arm/s3c2xx0/ohci_s3c24x0.c 11 Nov 2010 15:58:41 -0000 1.7
+++ sys/arch/arm/s3c2xx0/ohci_s3c24x0.c 25 May 2011 22:28:43 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: ohci_s3c24x0
#include <sys/proc.h>
#include <sys/queue.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c24x0var.h>
Index: sys/arch/arm/s3c2xx0/s3c2410.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2410.c,v
retrieving revision 1.10
diff -u -p -r1.10 s3c2410.c
--- sys/arch/arm/s3c2xx0/s3c2410.c 11 Dec 2005 12:16:51 -0000 1.10
+++ sys/arch/arm/s3c2xx0/s3c2410.c 25 May 2011 22:28:43 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2410.c,v
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/s3c2xx0/s3c2410_extint.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2410_extint.c,v
retrieving revision 1.10
diff -u -p -r1.10 s3c2410_extint.c
--- sys/arch/arm/s3c2xx0/s3c2410_extint.c 5 Jan 2010 13:14:56 -0000
1.10
+++ sys/arch/arm/s3c2xx0/s3c2410_extint.c 25 May 2011 22:28:43 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2410_exti
#include <sys/systm.h>
#include <sys/malloc.h>
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/s3c2xx0/s3c2410_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2410_intr.c,v
retrieving revision 1.12
diff -u -p -r1.12 s3c2410_intr.c
--- sys/arch/arm/s3c2xx0/s3c2410_intr.c 20 Dec 2010 00:25:29 -0000 1.12
+++ sys/arch/arm/s3c2xx0/s3c2410_intr.c 25 May 2011 22:28:43 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2410_intr
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/s3c2xx0/s3c2410_spi.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2410_spi.c,v
retrieving revision 1.5
diff -u -p -r1.5 s3c2410_spi.c
--- sys/arch/arm/s3c2xx0/s3c2410_spi.c 14 Mar 2009 15:36:02 -0000 1.5
+++ sys/arch/arm/s3c2xx0/s3c2410_spi.c 25 May 2011 22:28:43 -0000
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2410_spi.
#include <sys/systm.h>
#include <sys/conf.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arm/s3c2xx0/s3c24x0var.h>
Index: sys/arch/arm/s3c2xx0/s3c24x0_clk.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c24x0_clk.c,v
retrieving revision 1.10
diff -u -p -r1.10 s3c24x0_clk.c
--- sys/arch/arm/s3c2xx0/s3c24x0_clk.c 4 Jul 2008 11:59:45 -0000 1.10
+++ sys/arch/arm/s3c2xx0/s3c24x0_clk.c 25 May 2011 22:28:43 -0000
@@ -39,7 +39,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c24x0_clk.
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c,v
retrieving revision 1.6
diff -u -p -r1.6 s3c24x0_lcd.c
--- sys/arch/arm/s3c2xx0/s3c24x0_lcd.c 15 Dec 2007 00:39:15 -0000 1.6
+++ sys/arch/arm/s3c2xx0/s3c24x0_lcd.c 25 May 2011 22:28:43 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.
#include <dev/rasops/rasops.h>
#include <dev/wsfont/wsfont.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/s3c2xx0/s3c24x0_lcd.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.h,v
retrieving revision 1.4
diff -u -p -r1.4 s3c24x0_lcd.h
--- sys/arch/arm/s3c2xx0/s3c24x0_lcd.h 4 Mar 2007 05:59:38 -0000 1.4
+++ sys/arch/arm/s3c2xx0/s3c24x0_lcd.h 25 May 2011 22:28:43 -0000
@@ -34,7 +34,7 @@
#define _ARM_S3C2XX0_S3C24X0_LCD_H
#include <dev/rasops/rasops.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* LCD Contoroller */
Index: sys/arch/arm/s3c2xx0/s3c2800.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2800.c,v
retrieving revision 1.11
diff -u -p -r1.11 s3c2800.c
--- sys/arch/arm/s3c2xx0/s3c2800.c 11 Dec 2005 12:16:51 -0000 1.11
+++ sys/arch/arm/s3c2xx0/s3c2800.c 25 May 2011 22:28:43 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800.c,v
#include <sys/reboot.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/mainbus/mainbus.h>
Index: sys/arch/arm/s3c2xx0/s3c2800_clk.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2800_clk.c,v
retrieving revision 1.15
diff -u -p -r1.15 s3c2800_clk.c
--- sys/arch/arm/s3c2xx0/s3c2800_clk.c 18 Mar 2009 10:22:24 -0000 1.15
+++ sys/arch/arm/s3c2xx0/s3c2800_clk.c 25 May 2011 22:28:43 -0000
@@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800_clk.
#include <sys/time.h>
#include <sys/timetc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/s3c2xx0/s3c2800_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2800_intr.c,v
retrieving revision 1.12
diff -u -p -r1.12 s3c2800_intr.c
--- sys/arch/arm/s3c2xx0/s3c2800_intr.c 20 Dec 2010 00:25:29 -0000 1.12
+++ sys/arch/arm/s3c2xx0/s3c2800_intr.c 25 May 2011 22:28:43 -0000
@@ -44,7 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800_intr
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/s3c2xx0/s3c2800_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2800_pci.c,v
retrieving revision 1.15
diff -u -p -r1.15 s3c2800_pci.c
--- sys/arch/arm/s3c2xx0/s3c2800_pci.c 17 May 2011 17:34:48 -0000 1.15
+++ sys/arch/arm/s3c2xx0/s3c2800_pci.c 25 May 2011 22:28:43 -0000
@@ -111,7 +111,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2800_pci.
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2800reg.h>
#include <arm/s3c2xx0/s3c2800var.h>
Index: sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c,v
retrieving revision 1.3
diff -u -p -r1.3 s3c2xx0_busdma.c
--- sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c 11 Dec 2005 12:16:51 -0000
1.3
+++ sys/arch/arm/s3c2xx0/s3c2xx0_busdma.c 25 May 2011 22:28:43 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2xx0_busd
#include <sys/extent.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2xx0var.h>
Index: sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c,v
retrieving revision 1.14
diff -u -p -r1.14 s3c2xx0_intr.c
--- sys/arch/arm/s3c2xx0/s3c2xx0_intr.c 20 Dec 2010 00:25:29 -0000 1.14
+++ sys/arch/arm/s3c2xx0/s3c2xx0_intr.c 25 May 2011 22:28:43 -0000
@@ -79,7 +79,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2xx0_intr
#include <sys/systm.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/s3c2xx0/s3c2xx0_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2xx0_space.c,v
retrieving revision 1.8
diff -u -p -r1.8 s3c2xx0_space.c
--- sys/arch/arm/s3c2xx0/s3c2xx0_space.c 7 Nov 2009 07:27:41 -0000
1.8
+++ sys/arch/arm/s3c2xx0/s3c2xx0_space.c 25 May 2011 22:28:43 -0000
@@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: s3c2xx0_spac
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/* Prototypes for all the bus_space structure functions */
bs_protos(s3c2xx0);
Index: sys/arch/arm/s3c2xx0/s3c2xx0var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/s3c2xx0var.h,v
retrieving revision 1.5
diff -u -p -r1.5 s3c2xx0var.h
--- sys/arch/arm/s3c2xx0/s3c2xx0var.h 16 Nov 2010 02:53:02 -0000 1.5
+++ sys/arch/arm/s3c2xx0/s3c2xx0var.h 25 May 2011 22:28:43 -0000
@@ -35,7 +35,7 @@
#ifndef _ARM_S3C2XX0VAR_H_
#define _ARM_S3C2XX0VAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <sys/device.h>
struct s3c2xx0_softc {
Index: sys/arch/arm/s3c2xx0/sscom_s3c2410.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c,v
retrieving revision 1.3
diff -u -p -r1.3 sscom_s3c2410.c
--- sys/arch/arm/s3c2xx0/sscom_s3c2410.c 21 Nov 2009 20:32:28 -0000
1.3
+++ sys/arch/arm/s3c2xx0/sscom_s3c2410.c 25 May 2011 22:28:43 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: sscom_s3c241
#include <sys/vnode.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2410reg.h>
#include <arm/s3c2xx0/s3c2410var.h>
Index: sys/arch/arm/s3c2xx0/sscom_s3c2800.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c,v
retrieving revision 1.7
diff -u -p -r1.7 sscom_s3c2800.c
--- sys/arch/arm/s3c2xx0/sscom_s3c2800.c 21 Nov 2009 20:32:28 -0000
1.7
+++ sys/arch/arm/s3c2xx0/sscom_s3c2800.c 25 May 2011 22:28:43 -0000
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: sscom_s3c280
#include <sys/vnode.h>
#include <machine/intr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/s3c2xx0/s3c2800reg.h>
#include <arm/s3c2xx0/s3c2800var.h>
Index: sys/arch/arm/s3c2xx0/sscom_var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/s3c2xx0/sscom_var.h,v
retrieving revision 1.7
diff -u -p -r1.7 sscom_var.h
--- sys/arch/arm/s3c2xx0/sscom_var.h 6 Mar 2006 20:21:25 -0000 1.7
+++ sys/arch/arm/s3c2xx0/sscom_var.h 25 May 2011 22:28:43 -0000
@@ -75,7 +75,7 @@
#include <sys/device.h>
#include <sys/termios.h>
#include <sys/callout.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#ifdef SSCOM_S3C2410
#include <arm/s3c2xx0/s3c2410reg.h>
Index: sys/arch/arm/sa11x0/sa1111.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa1111.c,v
retrieving revision 1.23
diff -u -p -r1.23 sa1111.c
--- sys/arch/arm/sa11x0/sa1111.c 29 May 2009 14:15:44 -0000 1.23
+++ sys/arch/arm/sa11x0/sa1111.c 25 May 2011 22:28:43 -0000
@@ -46,7 +46,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa1111.c,v 1
#include <sys/malloc.h>
#include <sys/uio.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/sa11x0/sa11x0_reg.h>
Index: sys/arch/arm/sa11x0/sa11x0.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x0.c,v
retrieving revision 1.25
diff -u -p -r1.25 sa11x0.c
--- sys/arch/arm/sa11x0/sa11x0.c 9 Aug 2009 06:12:33 -0000 1.25
+++ sys/arch/arm/sa11x0/sa11x0.c 25 May 2011 22:28:43 -0000
@@ -73,7 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0.c,v 1
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/arm32/psl.h>
#include <arm/arm32/machdep.h>
Index: sys/arch/arm/sa11x0/sa11x0_com.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x0_com.c,v
retrieving revision 1.48
diff -u -p -r1.48 sa11x0_com.c
--- sys/arch/arm/sa11x0/sa11x0_com.c 24 Apr 2011 16:26:54 -0000 1.48
+++ sys/arch/arm/sa11x0/sa11x0_com.c 25 May 2011 22:28:43 -0000
@@ -93,7 +93,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_com.c
#include <dev/cons.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/sa11x0/sa11x0_reg.h>
#include <arm/sa11x0/sa11x0_var.h>
#include <arm/sa11x0/sa11x0_comreg.h>
Index: sys/arch/arm/sa11x0/sa11x0_io.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x0_io.c,v
retrieving revision 1.18
diff -u -p -r1.18 sa11x0_io.c
--- sys/arch/arm/sa11x0/sa11x0_io.c 7 Nov 2009 07:27:42 -0000 1.18
+++ sys/arch/arm/sa11x0/sa11x0_io.c 25 May 2011 22:28:43 -0000
@@ -49,7 +49,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_io.c,
#include <uvm/uvm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/pmap.h>
/* Prototypes for all the bus_space structure functions */
Index: sys/arch/arm/sa11x0/sa11x0_ost.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x0_ost.c,v
retrieving revision 1.28
diff -u -p -r1.28 sa11x0_ost.c
--- sys/arch/arm/sa11x0/sa11x0_ost.c 9 Aug 2009 06:12:33 -0000 1.28
+++ sys/arch/arm/sa11x0/sa11x0_ost.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x0_ost.c
#include <sys/timetc.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/sa11x0/sa11x0_var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x0_var.h,v
retrieving revision 1.10
diff -u -p -r1.10 sa11x0_var.h
--- sys/arch/arm/sa11x0/sa11x0_var.h 9 Aug 2009 06:12:33 -0000 1.10
+++ sys/arch/arm/sa11x0/sa11x0_var.h 25 May 2011 22:28:43 -0000
@@ -34,7 +34,7 @@
#include <sys/conf.h>
#include <sys/device.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
struct sa11x0_softc {
device_t sc_dev;
Index: sys/arch/arm/sa11x0/sa11x1_pcic.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/sa11x0/sa11x1_pcic.c,v
retrieving revision 1.20
diff -u -p -r1.20 sa11x1_pcic.c
--- sys/arch/arm/sa11x0/sa11x1_pcic.c 29 May 2009 14:15:44 -0000 1.20
+++ sys/arch/arm/sa11x0/sa11x1_pcic.c 25 May 2011 22:28:43 -0000
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: sa11x1_pcic.
#include <sys/kthread.h>
#include <sys/malloc.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pcmcia/pcmciachip.h>
#include <dev/pcmcia/pcmciavar.h>
Index: sys/arch/arm/xscale/becc.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/becc.c,v
retrieving revision 1.13
diff -u -p -r1.13 becc.c
--- sys/arch/arm/xscale/becc.c 17 May 2011 17:34:48 -0000 1.13
+++ sys/arch/arm/xscale/becc.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: becc.c,v 1.1
#include <sys/device.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80200reg.h>
#include <arm/xscale/beccreg.h>
Index: sys/arch/arm/xscale/becc_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/becc_pci.c,v
retrieving revision 1.9
diff -u -p -r1.9 becc_pci.c
--- sys/arch/arm/xscale/becc_pci.c 4 Apr 2011 20:37:46 -0000 1.9
+++ sys/arch/arm/xscale/becc_pci.c 25 May 2011 22:28:43 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: becc_pci.c,v
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/beccreg.h>
#include <arm/xscale/beccvar.h>
Index: sys/arch/arm/xscale/becc_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/becc_space.c,v
retrieving revision 1.4
diff -u -p -r1.4 becc_space.c
--- sys/arch/arm/xscale/becc_space.c 11 Dec 2005 12:16:51 -0000 1.4
+++ sys/arch/arm/xscale/becc_space.c 25 May 2011 22:28:43 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: becc_space.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/beccreg.h>
#include <arm/xscale/beccvar.h>
Index: sys/arch/arm/xscale/becc_timer.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/becc_timer.c,v
retrieving revision 1.14
diff -u -p -r1.14 becc_timer.c
--- sys/arch/arm/xscale/becc_timer.c 20 Jan 2008 16:28:24 -0000 1.14
+++ sys/arch/arm/xscale/becc_timer.c 25 May 2011 22:28:43 -0000
@@ -51,7 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: becc_timer.c
#include <dev/clock_subr.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/cpufunc.h>
#include <arm/xscale/beccreg.h>
Index: sys/arch/arm/xscale/i80312.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312.c,v
retrieving revision 1.20
diff -u -p -r1.20 i80312.c
--- sys/arch/arm/xscale/i80312.c 17 May 2011 17:34:48 -0000 1.20
+++ sys/arch/arm/xscale/i80312.c 25 May 2011 22:28:43 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80312.c,v 1
#include <sys/device.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80312reg.h>
#include <arm/xscale/i80312var.h>
Index: sys/arch/arm/xscale/i80312_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312_gpio.c,v
retrieving revision 1.3
diff -u -p -r1.3 i80312_gpio.c
--- sys/arch/arm/xscale/i80312_gpio.c 11 Dec 2005 12:16:51 -0000 1.3
+++ sys/arch/arm/xscale/i80312_gpio.c 25 May 2011 22:28:43 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80312_gpio.
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80312reg.h>
#include <arm/xscale/i80312var.h>
Index: sys/arch/arm/xscale/i80312_i2c.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312_i2c.c,v
retrieving revision 1.4
diff -u -p -r1.4 i80312_i2c.c
--- sys/arch/arm/xscale/i80312_i2c.c 6 Dec 2007 17:00:32 -0000 1.4
+++ sys/arch/arm/xscale/i80312_i2c.c 25 May 2011 22:28:43 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80312_i2c.c
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/xscale/i80312var.h>
Index: sys/arch/arm/xscale/i80312_mem.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312_mem.c,v
retrieving revision 1.4
diff -u -p -r1.4 i80312_mem.c
--- sys/arch/arm/xscale/i80312_mem.c 11 Dec 2005 12:16:51 -0000 1.4
+++ sys/arch/arm/xscale/i80312_mem.c 25 May 2011 22:28:43 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80312_mem.c
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80312reg.h>
#include <arm/xscale/i80312var.h>
Index: sys/arch/arm/xscale/i80312_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312_pci.c,v
retrieving revision 1.9
diff -u -p -r1.9 i80312_pci.c
--- sys/arch/arm/xscale/i80312_pci.c 11 Dec 2005 12:16:51 -0000 1.9
+++ sys/arch/arm/xscale/i80312_pci.c 25 May 2011 22:28:43 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80312_pci.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80312reg.h>
#include <arm/xscale/i80312var.h>
Index: sys/arch/arm/xscale/i80312_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312_space.c,v
retrieving revision 1.10
diff -u -p -r1.10 i80312_space.c
--- sys/arch/arm/xscale/i80312_space.c 24 Feb 2010 19:12:12 -0000 1.10
+++ sys/arch/arm/xscale/i80312_space.c 25 May 2011 22:28:43 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80312_space
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80312reg.h>
#include <arm/xscale/i80312var.h>
Index: sys/arch/arm/xscale/i80312var.h
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80312var.h,v
retrieving revision 1.9
diff -u -p -r1.9 i80312var.h
--- sys/arch/arm/xscale/i80312var.h 11 Dec 2005 12:16:51 -0000 1.9
+++ sys/arch/arm/xscale/i80312var.h 25 May 2011 22:28:43 -0000
@@ -38,7 +38,7 @@
#ifndef _ARM_XSCALE_I80312VAR_H_
#define _ARM_XSCALE_I80312VAR_H_
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/pci/pcivar.h>
Index: sys/arch/arm/xscale/i80321.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321.c,v
retrieving revision 1.21
diff -u -p -r1.21 i80321.c
--- sys/arch/arm/xscale/i80321.c 17 May 2011 17:34:48 -0000 1.21
+++ sys/arch/arm/xscale/i80321.c 25 May 2011 22:28:43 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321.c,v 1
#include <sys/device.h>
#define _ARM32_BUS_DMA_PRIVATE
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/arm/xscale/i80321_gpio.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_gpio.c,v
retrieving revision 1.2
diff -u -p -r1.2 i80321_gpio.c
--- sys/arch/arm/xscale/i80321_gpio.c 11 Dec 2005 12:16:51 -0000 1.2
+++ sys/arch/arm/xscale/i80321_gpio.c 25 May 2011 22:28:44 -0000
@@ -42,7 +42,7 @@
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/arm/xscale/i80321_i2c.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_i2c.c,v
retrieving revision 1.3
diff -u -p -r1.3 i80321_i2c.c
--- sys/arch/arm/xscale/i80321_i2c.c 6 Dec 2007 17:00:32 -0000 1.3
+++ sys/arch/arm/xscale/i80321_i2c.c 25 May 2011 22:28:44 -0000
@@ -48,7 +48,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_i2c.c
#include <sys/device.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/xscale/i80321reg.h>
Index: sys/arch/arm/xscale/i80321_icu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_icu.c,v
retrieving revision 1.21
diff -u -p -r1.21 i80321_icu.c
--- sys/arch/arm/xscale/i80321_icu.c 20 Dec 2010 00:25:29 -0000 1.21
+++ sys/arch/arm/xscale/i80321_icu.c 25 May 2011 22:28:44 -0000
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_icu.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/intr.h>
#include <arm/cpufunc.h>
Index: sys/arch/arm/xscale/i80321_mcu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_mcu.c,v
retrieving revision 1.3
diff -u -p -r1.3 i80321_mcu.c
--- sys/arch/arm/xscale/i80321_mcu.c 11 Dec 2005 12:16:51 -0000 1.3
+++ sys/arch/arm/xscale/i80321_mcu.c 25 May 2011 22:28:44 -0000
@@ -45,7 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_mcu.c
#include <sys/param.h>
#include <sys/systm.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/arm/xscale/i80321_pci.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_pci.c,v
retrieving revision 1.9
diff -u -p -r1.9 i80321_pci.c
--- sys/arch/arm/xscale/i80321_pci.c 17 Oct 2007 19:53:43 -0000 1.9
+++ sys/arch/arm/xscale/i80321_pci.c 25 May 2011 22:28:44 -0000
@@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_pci.c
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
#include <arm/xscale/i80321var.h>
Index: sys/arch/arm/xscale/i80321_space.c
===================================================================
RCS file: /cvsroot/src/sys/arch/arm/xscale/i80321_space.c,v
retrieving revision 1.12
diff -u -p -r1.12 i80321_space.c
--- sys/arch/arm/xscale/i80321_space.c 24 Feb 2010 19:12:12 -0000 1.12
+++ sys/arch/arm/xscale/i80321_space.c 25 May 2011 22:28:44 -0000
@@ -47,7 +47,7 @@ __KERNEL_RCSID(0, "$NetBSD: i80321_space
#include <uvm/uvm_extern.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <arm/xscale/i80321reg.h>
#include <arm/xscale/i80321var.h>
Home |
Main Index |
Thread Index |
Old Index