5 files changed, 305 insertions, 1064 deletions

diff --git a/sys/alpha/include/bus.h b/sys/alpha/include/bus.h
index 5fb1ccf..7fe2726 100644
--- a/sys/alpha/include/bus.h
+++ b/sys/alpha/include/bus.h
@@ -72,28 +72,13 @@
 #ifndef _ALPHA_BUS_H_
 #define _ALPHA_BUS_H_
 
-#include <machine/cpufunc.h>
-
-/*
- * To remain compatible with NetBSD's interface, default to both memio and
- * pio when neither of them is defined.
- */ 
-#if !defined(_ALPHA_BUS_PIO_H_) && !defined(_ALPHA_BUS_MEMIO_H_)
-#define _ALPHA_BUS_PIO_H_
-#define _ALPHA_BUS_MEMIO_H_
-#endif
-
-/*
- * Values for the alpha bus space tag, not to be used directly by MI code.
- */
-#define	ALPHA_BUS_SPACE_IO	0	/* space is i/o space */
-#define ALPHA_BUS_SPACE_MEM	1	/* space is mem space */
-
 /*
  * Bus address and size types
  */
-typedef u_long bus_addr_t;
-typedef u_long bus_size_t;
+typedef u_int32_t		bus_addr_t;
+typedef u_int32_t		bus_size_t;
+typedef struct alpha_busspace	*bus_space_tag_t;
+typedef u_int32_t		bus_space_handle_t;
 
 #define BUS_SPACE_MAXSIZE_24BIT	0xFFFFFF
 #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF
@@ -104,928 +89,280 @@ typedef u_long bus_size_t;
 
 #define BUS_SPACE_UNRESTRICTED	(~0)
 
-/*
- * Access methods for bus resources and address space.
- */
-typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
-
-/*
- * Map a region of device bus space into CPU virtual address space.
- */
-
-#define	BUS_SPACE_MAP_CACHEABLE		0x01
-#define	BUS_SPACE_MAP_LINEAR		0x02
-
-int	bus_space_map(bus_space_tag_t t, bus_addr_t addr, bus_size_t size,
-		      int flags, bus_space_handle_t *bshp);
-
-/*
- * Unmap a region of device bus space.
- */
-
-void	bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
-			bus_size_t size);
-
-/*
- * Get a new handle for a subregion of an already-mapped area of bus space.
- */
-
-int	bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
-			    bus_size_t offset, bus_size_t size,
-			    bus_space_handle_t *nbshp);
-
-/*
- * Allocate a region of memory that is accessible to devices in bus space.
- */
-
-int	bus_space_alloc(bus_space_tag_t t, bus_addr_t rstart,
-			bus_addr_t rend, bus_size_t size, bus_size_t align,
-			bus_size_t boundary, int flags, bus_addr_t *addrp,
-			bus_space_handle_t *bshp);
-
-/*
- * Free a region of bus space accessible memory.
- */
-
-void	bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh,
-		       bus_size_t size);
-
-#if defined(_ALPHA_BUS_PIO_H_) || defined(_ALPHA_BUS_MEMIO_H_)
-
-/*
- * Read a 1, 2, 4, or 8 byte quantity from bus space
- * described by tag/handle/offset.
- */
-static __inline u_int8_t bus_space_read_1(bus_space_tag_t tag,
-					  bus_space_handle_t handle,
-					  bus_size_t offset);
-
-static __inline u_int16_t bus_space_read_2(bus_space_tag_t tag,
-					   bus_space_handle_t handle,
-					   bus_size_t offset);
-
-static __inline u_int32_t bus_space_read_4(bus_space_tag_t tag,
-					   bus_space_handle_t handle,
-					   bus_size_t offset);
-
-static __inline u_int8_t
-bus_space_read_1(bus_space_tag_t tag, bus_space_handle_t handle,
-		 bus_size_t offset)
-{
-#if defined (_ALPHA_BUS_PIO_H_)
-#if defined (_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		return (inb(handle + offset));
-#endif
-#if defined (_ALPHA_BUS_MEMIO_H_)
-	return (readb(handle + offset));
-#endif
-}
-
-static __inline u_int16_t
-bus_space_read_2(bus_space_tag_t tag, bus_space_handle_t handle,
-		 bus_size_t offset)
-{
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		return (inw(handle + offset));
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	return (readw(handle + offset));
-#endif
-}
-
-static __inline u_int32_t
-bus_space_read_4(bus_space_tag_t tag, bus_space_handle_t handle,
-		 bus_size_t offset)
-{
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		return (inl(handle + offset));
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	return (readl(handle + offset));
-#endif
-}
-
-#if 0	/* Cause a link error for bus_space_read_8 */
-#define	bus_space_read_8(t, h, o)	!!! bus_space_read_8 unimplemented !!!
-#endif
-
-/*
- * Read `count' 1, 2, 4, or 8 byte quantities from bus space
- * described by tag/handle/offset and copy into buffer provided.
- */
-static __inline void bus_space_read_multi_1(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int8_t *addr,
-					    size_t count);
-
-static __inline void bus_space_read_multi_2(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int16_t *addr,
-					    size_t count);
-
-static __inline void bus_space_read_multi_4(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int32_t *addr,
-					    size_t count);
+struct alpha_busspace;
+
+struct alpha_busspace_ops {
+    u_int8_t	(*abo_read_1)(struct alpha_busspace *space, size_t offset);
+    u_int16_t	(*abo_read_2)(struct alpha_busspace *space, size_t offset);
+    u_int32_t	(*abo_read_4)(struct alpha_busspace *space, size_t offset);
+
+    void	(*abo_read_multi_1)(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int8_t *addr, size_t count);
+    void	(*abo_read_multi_2)(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int16_t *addr, size_t count);
+    void	(*abo_read_multi_4)(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int32_t *addr, size_t count);
+
+    void	(*abo_read_region_1)(struct alpha_busspace *space,
+				     size_t offset,
+				     u_int8_t *addr, size_t count);
+    void	(*abo_read_region_2)(struct alpha_busspace *space,
+				     size_t offset,
+				     u_int16_t *addr, size_t count);
+    void	(*abo_read_region_4)(struct alpha_busspace *space,
+				     size_t offset,
+				     u_int32_t *addr, size_t count);
+
+    void	(*abo_write_1)(struct alpha_busspace *space, size_t offset,
+			       u_int8_t value);
+    void	(*abo_write_2)(struct alpha_busspace *space, size_t offset,
+			       u_int16_t value);
+    void	(*abo_write_4)(struct alpha_busspace *space, size_t offset,
+			       u_int32_t value);
+
+    void	(*abo_write_multi_1)(struct alpha_busspace *space,
+				     size_t offset,
+				     const u_int8_t *addr, size_t count);
+    void	(*abo_write_multi_2)(struct alpha_busspace *space,
+				     size_t offset,
+				     const u_int16_t *addr, size_t count);
+    void	(*abo_write_multi_4)(struct alpha_busspace *space,
+				     size_t offset,
+				     const u_int32_t *addr, size_t count);
+
+    void	(*abo_write_region_1)(struct alpha_busspace *space,
+				      size_t offset,
+				      const u_int8_t *addr, size_t count);
+    void	(*abo_write_region_2)(struct alpha_busspace *space,
+				      size_t offset,
+				      const u_int16_t *addr, size_t count);
+    void	(*abo_write_region_4)(struct alpha_busspace *space,
+				      size_t offset,
+				      const u_int32_t *addr, size_t count);
+
+    void	(*abo_set_multi_1)(struct alpha_busspace *space, size_t offset,
+				   u_int8_t value, size_t count);
+    void	(*abo_set_multi_2)(struct alpha_busspace *space, size_t offset,
+				   u_int16_t value, size_t count);
+    void	(*abo_set_multi_4)(struct alpha_busspace *space, size_t offset,
+				   u_int32_t value, size_t count);
+
+    void	(*abo_set_region_1)(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int8_t value, size_t count);
+    void	(*abo_set_region_2)(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int16_t value, size_t count);
+    void	(*abo_set_region_4)(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int32_t value, size_t count);
+
+    void	(*abo_copy_region_1)(struct alpha_busspace *space,
+				     size_t offset1, size_t offset2,
+				     size_t count);
+    void	(*abo_copy_region_2)(struct alpha_busspace *space,
+				     size_t offset1, size_t offset2,
+				     size_t count);
+    void	(*abo_copy_region_4)(struct alpha_busspace *space,
+				     size_t offset1, size_t offset2,
+				     size_t count);
+
+    void	(*abo_barrier)(struct alpha_busspace *space, size_t offset,
+			       size_t len, int flags);
+};
+
+struct alpha_busspace {
+    struct alpha_busspace_ops *ab_ops;
+};
+
+/* Back-compat functions for old ISA drivers */
+
+extern struct alpha_busspace *busspace_isa_io;
+extern struct alpha_busspace *busspace_isa_mem;
+
+#define inb(o)		bus_space_read_1(busspace_isa_io, o, 0)
+#define inw(o)		bus_space_read_2(busspace_isa_io, o, 0)
+#define inl(o)		bus_space_read_4(busspace_isa_io, o, 0)
+#define outb(o, v)	bus_space_write_1(busspace_isa_io, o, 0, v)
+#define outw(o, v)	bus_space_write_2(busspace_isa_io, o, 0, v)
+#define outl(o, v)	bus_space_write_4(busspace_isa_io, o, 0, v)
+
+#define readb(o)	bus_space_read_1(busspace_isa_mem, o, 0)
+#define readw(o)	bus_space_read_2(busspace_isa_mem, o, 0)
+#define readl(o)	bus_space_read_4(busspace_isa_mem, o, 0)
+#define writeb(o, v)	bus_space_write_1(busspace_isa_mem, o, 0, v)
+#define writew(o, v)	bus_space_write_2(busspace_isa_mem, o, 0, v)
+#define writel(o, v)	bus_space_write_4(busspace_isa_mem, o, 0, v)
+
+#define insb(o, a, c)	bus_space_read_multi_1(busspace_isa_io, o, 0, \
+					       (void*)a, c)
+#define insw(o, a, c)	bus_space_read_multi_2(busspace_isa_io, o, 0, \
+					       (void*)a, c)
+#define insl(o, a, c)	bus_space_read_multi_4(busspace_isa_io, o, 0, \
+					       (void*)a, c)
+
+#define outsb(o, a, c)	bus_space_write_multi_1(busspace_isa_io, o, 0, \
+						(void*)a, c)
+#define outsw(o, a, c)	bus_space_write_multi_2(busspace_isa_io, o, 0, \
+						(void*)a, c)
+#define outsl(o, a, c)	bus_space_write_multi_4(busspace_isa_io, o, 0, \
+						(void*)a, c)
+
+#define memcpy_fromio(d, s, c) \
+	bus_space_read_region_1(busspace_isa_mem, s, 0, d, c)
+#define memcpy_toio(d, s, c) \
+	bus_space_write_region_1(busspace_isa_mem, d, 0, s, c)
+#define memcpy_io(d, s, c) \
+	bus_space_copy_region_1(busspace_isa_mem, s, 0, d, 0, c)
+#define memset_io(d, v, c) \
+	bus_space_set_region_1(busspace_isa_mem, d, 0, v, c)
+#define memsetw_io(d, v, c) \
+	bus_space_set_region_2(busspace_isa_mem, d, 0, v, c)
 
 static __inline void
-bus_space_read_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t *addr, size_t count)
+memsetw(void *d, int val, size_t size)
 {
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			*addr++ = inb(bsh + offset);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-	while (count--)
-		*addr++ = readb(bsh + offset);
-#endif
-}
+    u_int16_t *sp = d;
 
-static __inline void
-bus_space_read_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			*addr++ = inw(baddr);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			*addr++ = readw(baddr);
-#endif
-}
-
-static __inline void
-bus_space_read_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			*addr++ = inl(baddr);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			*addr++ = readl(baddr);
-#endif
-}
-
-#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
-
-/*
- * 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.
- */
-static __inline void bus_space_read_region_1(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset, u_int8_t *addr,
-					     size_t count);
-
-static __inline void bus_space_read_region_2(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset, u_int16_t *addr,
-					     size_t count);
-
-static __inline void bus_space_read_region_4(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset, u_int32_t *addr,
-					     size_t count);
-
-
-static __inline void
-bus_space_read_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, u_int8_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--) {
-			*addr++ = inb(baddr);
-			baddr += 1;
-		}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--) {
-			*addr++ = readb(baddr);
-			baddr += 1;
-		}
-#endif
-}
-
-static __inline void
-bus_space_read_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, u_int16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--) {
-			*addr++ = inw(baddr);
-			baddr += 2;
-		}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--) {
-			*addr++ = readw(baddr);
-			baddr += 2;
-		}
-#endif
-}
-
-static __inline void
-bus_space_read_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, u_int32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--) {
-			*addr++ = inl(baddr);
-			baddr += 4;
-		}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--) {
-			*addr++ = readb(baddr);
-			baddr += 4;
-		}
-#endif
+    while (size--)
+	*sp++ = val;
 }
 
-#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
+void busspace_generic_read_multi_1(struct alpha_busspace *space,
+				   size_t offset,
+				   u_int8_t *addr, size_t count);
+void busspace_generic_read_multi_2(struct alpha_busspace *space,
+				   size_t offset,
+				   u_int16_t *addr, size_t count);
+void busspace_generic_read_multi_4(struct alpha_busspace *space,
+				   size_t offset,
+				   u_int32_t *addr, size_t count);
+void busspace_generic_read_region_1(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int8_t *addr, size_t count);
+void busspace_generic_read_region_2(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int16_t *addr, size_t count);
+void busspace_generic_read_region_4(struct alpha_busspace *space,
+				    size_t offset,
+				    u_int32_t *addr, size_t count);
+void busspace_generic_write_multi_1(struct alpha_busspace *space,
+				    size_t offset,
+				    const u_int8_t *addr, size_t count);
+void busspace_generic_write_multi_2(struct alpha_busspace *space,
+				    size_t offset,
+				    const u_int16_t *addr, size_t count);
+void busspace_generic_write_multi_4(struct alpha_busspace *space,
+				    size_t offset,
+				    const u_int32_t *addr, size_t count);
+void busspace_generic_write_region_1(struct alpha_busspace *space,
+				     size_t offset,
+				     const u_int8_t *addr, size_t count);
+void busspace_generic_write_region_2(struct alpha_busspace *space,
+				     size_t offset,
+				     const u_int16_t *addr, size_t count);
+void busspace_generic_write_region_4(struct alpha_busspace *space,
+				     size_t offset,
+				     const u_int32_t *addr, size_t count);
+void busspace_generic_set_multi_1(struct alpha_busspace *space,
+				  size_t offset,
+				  u_int8_t value, size_t count);
+void busspace_generic_set_multi_2(struct alpha_busspace *space,
+				  size_t offset,
+				  u_int16_t value, size_t count);
+void busspace_generic_set_multi_4(struct alpha_busspace *space,
+				  size_t offset,
+				  u_int32_t value, size_t count);
+void busspace_generic_set_region_1(struct alpha_busspace *space,
+				   size_t offset,
+				   u_int8_t value, size_t count);
+void busspace_generic_set_region_2(struct alpha_busspace *space,
+				   size_t offset,
+				   u_int16_t value, size_t count);
+void busspace_generic_set_region_4(struct alpha_busspace *space,
+				   size_t offset,
+				   u_int32_t value, size_t count);
+void busspace_generic_copy_region_1(struct alpha_busspace *space,
+				    size_t offset1,
+				    size_t offset2,
+				    size_t count);
+void busspace_generic_copy_region_2(struct alpha_busspace *space,
+				    size_t offset1,
+				    size_t offset2,
+				    size_t count);
+void busspace_generic_copy_region_4(struct alpha_busspace *space,
+				    size_t offset1,
+				    size_t offset2,
+				    size_t count);
+void busspace_generic_barrier(struct alpha_busspace *space,
+			      size_t offset, size_t len,
+			      int flags);
 
-/*
- * Write the 1, 2, 4, or 8 byte value `value' to bus space
- * described by tag/handle/offset.
- */
-
-static __inline void bus_space_write_1(bus_space_tag_t tag,
-				       bus_space_handle_t bsh,
-				       bus_size_t offset, u_int8_t value);
-
-static __inline void bus_space_write_2(bus_space_tag_t tag,
-				       bus_space_handle_t bsh,
-				       bus_size_t offset, u_int16_t value);
-
-static __inline void bus_space_write_4(bus_space_tag_t tag,
-				       bus_space_handle_t bsh,
-				       bus_size_t offset, u_int32_t value);
-
-static __inline void
-bus_space_write_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t value)
-{
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		outb(bsh + offset, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		writeb(bsh + offset, value);
-#endif
-}
-
-static __inline void
-bus_space_write_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t value)
-{
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		outw(bsh + offset, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		writew(bsh + offset, value);
-#endif
-}
-
-static __inline void
-bus_space_write_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int32_t value)
-{
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		outl(bsh + offset, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		writel(bsh + offset, value);
-#endif
-}
-
-#if 0	/* Cause a link error for bus_space_write_8 */
-#define	bus_space_write_8	!!! bus_space_write_8 not implemented !!!
-#endif
-
-/*
- * Write `count' 1, 2, 4, or 8 byte quantities from the buffer
- * provided to bus space described by tag/handle/offset.
- */
-
-static __inline void bus_space_write_multi_1(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset,
-					     const u_int8_t *addr,
-					     size_t count);
-static __inline void bus_space_write_multi_2(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset,
-					     const u_int16_t *addr,
-					     size_t count);
-
-static __inline void bus_space_write_multi_4(bus_space_tag_t tag,
-					     bus_space_handle_t bsh,
-					     bus_size_t offset,
-					     const u_int32_t *addr,
-					     size_t count);
-
-static __inline void
-bus_space_write_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, const u_int8_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			outb(baddr, *addr++);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			writeb(baddr, *addr++);
-#endif
-}
-
-static __inline void
-bus_space_write_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, const u_int16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			outw(baddr, *addr++);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			writew(baddr, *addr++);
-#endif
-}
-
-static __inline void
-bus_space_write_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-			bus_size_t offset, const u_int32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			outl(baddr, *addr++);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			writel(baddr, *addr++);
-#endif
-}
-
-#if 0	/* Cause a link error for bus_space_write_multi_8 */
-#define	bus_space_write_multi_8(t, h, o, a, c)				\
-			!!! bus_space_write_multi_8 unimplemented !!!
-#endif
-
-/*
- * Write `count' 1, 2, 4, or 8 byte quantities from the buffer provided
- * to bus space described by tag/handle starting at `offset'.
- */
-
-static __inline void bus_space_write_region_1(bus_space_tag_t tag,
-					      bus_space_handle_t bsh,
-					      bus_size_t offset,
-					      const u_int8_t *addr,
-					      size_t count);
-static __inline void bus_space_write_region_2(bus_space_tag_t tag,
-					      bus_space_handle_t bsh,
-					      bus_size_t offset,
-					      const u_int16_t *addr,
-					      size_t count);
-static __inline void bus_space_write_region_4(bus_space_tag_t tag,
-					      bus_space_handle_t bsh,
-					      bus_size_t offset,
-					      const u_int32_t *addr,
-					      size_t count);
-
-static __inline void
-bus_space_write_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-			 bus_size_t offset, const u_int8_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--) {
-			outb(baddr, *addr++);
-			baddr += 1;
-		}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--) {
-			writeb(baddr, *addr++);
-			baddr += 1;
-		}
-#endif
-}
-
-static __inline void
-bus_space_write_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-			 bus_size_t offset, const u_int16_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--) {
-			outw(baddr, *addr++);
-			baddr += 2;
-		}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--) {
-			writew(baddr, *addr++);
-			baddr += 2;
-		}
-#endif
-}
-
-static __inline void
-bus_space_write_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-			 bus_size_t offset, const u_int32_t *addr, size_t count)
-{
-	bus_addr_t baddr = bsh + offset;
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--) {
-			outl(baddr, *addr++);
-			baddr += 4;
-		}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--) {
-			writel(baddr, *addr++);
-			baddr += 4;
-		}
-#endif
-}
-
-#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
-
-/*
- * Write the 1, 2, 4, or 8 byte value `val' to bus space described
- * by tag/handle/offset `count' times.
- */
-
-static __inline void bus_space_set_multi_1(bus_space_tag_t tag,
-					   bus_space_handle_t bsh,
-					   bus_size_t offset,
-					   u_int8_t value, size_t count);
-static __inline void bus_space_set_multi_2(bus_space_tag_t tag,
-					   bus_space_handle_t bsh,
-					   bus_size_t offset,
-					   u_int16_t value, size_t count);
-static __inline void bus_space_set_multi_4(bus_space_tag_t tag,
-					   bus_space_handle_t bsh,
-					   bus_size_t offset,
-					   u_int32_t value, size_t count);
-
-static __inline void
-bus_space_set_multi_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		      bus_size_t offset, u_int8_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			outb(addr, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			writeb(addr, value);
-#endif
-}
-
-static __inline void
-bus_space_set_multi_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		     bus_size_t offset, u_int16_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			outw(addr, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			writew(addr, value);
-#endif
-}
-
-static __inline void
-bus_space_set_multi_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		      bus_size_t offset, u_int32_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		while (count--)
-			outl(addr, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		while (count--)
-			writel(addr, value);
-#endif
-}
-
-#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
-
-/*
- * Write `count' 1, 2, 4, or 8 byte value `val' to bus space described
- * by tag/handle starting at `offset'.
- */
-
-static __inline void bus_space_set_region_1(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int8_t value,
-					    size_t count);
-static __inline void bus_space_set_region_2(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int16_t value,
-					    size_t count);
-static __inline void bus_space_set_region_4(bus_space_tag_t tag,
-					    bus_space_handle_t bsh,
-					    bus_size_t offset, u_int32_t value,
-					    size_t count);
-
-static __inline void
-bus_space_set_region_1(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int8_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		for (; count != 0; count--, addr++)
-			outb(addr, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		for (; count != 0; count--, addr++)
-			writeb(addr, value);
-#endif
-}
-
-static __inline void
-bus_space_set_region_2(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int16_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		for (; count != 0; count--, addr += 2)
-			outw(addr, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		for (; count != 0; count--, addr += 2)
-			writew(addr, value);
-#endif
-}
-
-static __inline void
-bus_space_set_region_4(bus_space_tag_t tag, bus_space_handle_t bsh,
-		       bus_size_t offset, u_int32_t value, size_t count)
-{
-	bus_addr_t addr = bsh + offset;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-		for (; count != 0; count--, addr += 4)
-			outl(addr, value);
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-		for (; count != 0; count--, addr += 4)
-			writel(addr, value);
-#endif
-}
-
-#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
-
-/*
- * 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.
- */
-
-static __inline void bus_space_copy_region_1(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);
-
-static __inline void bus_space_copy_region_2(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);
-
-static __inline void bus_space_copy_region_4(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);
-
-static __inline void
-bus_space_copy_region_1(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)
-{
-	bus_addr_t addr1 = bsh1 + off1;
-	bus_addr_t addr2 = bsh2 + off2;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-	{
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1++, addr2++)
-				outb(addr2, inb(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += (count - 1), addr2 += (count - 1);
-			    count != 0; count--, addr1--, addr2--)
-				outb(addr2, inb(addr1));
-		}
-	}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-	{
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1++, addr2++)
-				writeb(addr2, readb(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += (count - 1), addr2 += (count - 1);
-			    count != 0; count--, addr1--, addr2--)
-				writeb(addr2, readb(addr1));
-		}
-	}
-#endif
-}
-
-static __inline void
-bus_space_copy_region_2(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)
-{
-	bus_addr_t addr1 = bsh1 + off1;
-	bus_addr_t addr2 = bsh2 + off2;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-	{
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 2, addr2 += 2)
-				outw(addr2, inw(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1);
-			    count != 0; count--, addr1 -= 2, addr2 -= 2)
-				outw(addr2, inw(addr1));
-		}
-	}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-	{
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 2, addr2 += 2)
-				writew(addr2, readw(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 2 * (count - 1), addr2 += 2 * (count - 1);
-			    count != 0; count--, addr1 -= 2, addr2 -= 2)
-				writew(addr2, readw(addr1));
-		}
-	}
-#endif
-}
-
-static __inline void
-bus_space_copy_region_4(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)
-{
-	bus_addr_t addr1 = bsh1 + off1;
-	bus_addr_t addr2 = bsh2 + off2;
-
-#if defined(_ALPHA_BUS_PIO_H_)
-#if defined(_ALPHA_BUS_MEMIO_H_)
-	if (tag == ALPHA_BUS_SPACE_IO)
-#endif
-	{
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 4, addr2 += 4)
-				outl(addr2, inl(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1);
-			    count != 0; count--, addr1 -= 4, addr2 -= 4)
-				outl(addr2, inl(addr1));
-		}
-	}
-#endif
-#if defined(_ALPHA_BUS_MEMIO_H_)
-#if defined(_ALPHA_BUS_PIO_H_)
-	else
-#endif
-	{
-		if (addr1 >= addr2) {
-			/* src after dest: copy forward */
-			for (; count != 0; count--, addr1 += 4, addr2 += 4)
-				writel(addr2, readl(addr1));
-		} else {
-			/* dest after src: copy backwards */
-			for (addr1 += 4 * (count - 1), addr2 += 4 * (count - 1);
-			    count != 0; count--, addr1 -= 4, addr2 -= 4)
-				writel(addr2, readl(addr1));
-		}
-	}
-#endif
-}
-
-#endif /* defined(_ALPHA_BUS_PIO_H_) || defined(_ALPHA_MEM_IO_H_) */
-
-#if 0	/* Cause a link error for bus_space_copy_8 */
-#define	bus_space_copy_region_8	!!! bus_space_copy_region_8 unimplemented !!!
-#endif
-
-/*
- * Bus read/write barrier methods.
- *
- *	void bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh,
- *			       bus_size_t offset, bus_size_t len, int flags);
- *
- */
 #define	BUS_SPACE_BARRIER_READ	0x01		/* force read barrier */
 #define	BUS_SPACE_BARRIER_WRITE	0x02		/* force write barrier */
 
-static __inline void
-bus_space_barrier(bus_space_tag_t tag, bus_space_handle_t bsh,
-		  bus_size_t offset, bus_size_t len, int flags)
-{
-	if (flags & BUS_SPACE_BARRIER_READ)
-		alpha_mb();
-	else
-		alpha_wmb();
-}
-
+#define bus_space_read_1(t, h, o) \
+	(t)->ab_ops->abo_read_1(t, (h)+(o))
+#define bus_space_read_2(t, h, o) \
+	(t)->ab_ops->abo_read_2(t, (h)+(o))
+#define bus_space_read_4(t, h, o) \
+	(t)->ab_ops->abo_read_4(t, (h)+(o))
+#define bus_space_read_multi_1(t, h, o, a, c) \
+	(t)->ab_ops->abo_read_multi_1(t, (h)+(o), a, c)
+#define bus_space_read_multi_2(t, h, o, a, c) \
+	(t)->ab_ops->abo_read_multi_2(t, (h)+(o), a, c)
+#define bus_space_read_multi_4(t, h, o, a, c) \
+	(t)->ab_ops->abo_read_multi_4(t, (h)+(o), a, c)
+#define bus_space_read_region_1(t, h, o, a, c) \
+	(t)->ab_ops->abo_read_region_1(t, (h)+(o), a, c)
+#define bus_space_read_region_2(t, h, o, a, c) \
+	(t)->ab_ops->abo_read_region_2(t, (h)+(o), a, c)
+#define bus_space_read_region_4(t, h, o, a, c) \
+	(t)->ab_ops->abo_read_region_4(t, (h)+(o), a, c)
+
+#define bus_space_write_1(t, h, o, v) \
+	(t)->ab_ops->abo_write_1(t, (h)+(o), v)
+#define bus_space_write_2(t, h, o, v) \
+	(t)->ab_ops->abo_write_2(t, (h)+(o), v)
+#define bus_space_write_4(t, h, o, v) \
+	(t)->ab_ops->abo_write_4(t, (h)+(o), v)
+#define bus_space_write_multi_1(t, h, o, a, c) \
+	(t)->ab_ops->abo_write_multi_1(t, (h)+(o), a, c)
+#define bus_space_write_multi_2(t, h, o, a, c) \
+	(t)->ab_ops->abo_write_multi_2(t, (h)+(o), a, c)
+#define bus_space_write_multi_4(t, h, o, a, c) \
+	(t)->ab_ops->abo_write_multi_4(t, (h)+(o), a, c)
+#define bus_space_write_region_1(t, h, o, a, c) \
+	(t)->ab_ops->abo_write_region_1(t, (h)+(o), a, c)
+#define bus_space_write_region_2(t, h, o, a, c) \
+	(t)->ab_ops->abo_write_region_2(t, (h)+(o), a, c)
+#define bus_space_write_region_4(t, h, o, a, c) \
+	(t)->ab_ops->abo_write_region_4(t, (h)+(o), a, c)
+#define bus_space_set_multi_1(t, h, o, v, c) \
+	(t)->ab_ops->abo_set_multi_1(t, (h)+(o), v, c)
+#define bus_space_set_multi_2(t, h, o, v, c) \
+	(t)->ab_ops->abo_set_multi_2(t, (h)+(o), v, c)
+#define bus_space_set_multi_4(t, h, o, v, c) \
+	(t)->ab_ops->abo_set_multi_4(t, (h)+(o), v, c)
+#define bus_space_set_region_1(t, h, o, v, c) \
+	(t)->ab_ops->abo_set_region_1(t, (h)+(o), v, c)
+#define bus_space_set_region_2(t, h, o, v, c) \
+	(t)->ab_ops->abo_set_region_2(t, (h)+(o), v, c)
+#define bus_space_set_region_4(t, h, o, v, c) \
+	(t)->ab_ops->abo_set_region_4(t, (h)+(o), v, c)
+
+#define bus_space_copy_region_1(t, h1, o1, h2, o2, c) \
+	(t)->ab_ops->abo_copy_region_1(t, (h1)+(o1), (h2)+(o2), c)
+#define bus_space_copy_region_2(t, h1, o1, h2, o2, c) \
+	(t)->ab_ops->abo_copy_region_2(t, (h1)+(o1), (h2)+(o2), c)
+#define bus_space_copy_region_4(t, h1, o1, h2, o2, c) \
+	(t)->ab_ops->abo_copy_region_4(t, (h1)+(o1), (h2)+(o2), c)
+
+#define bus_space_barrier(t, h, o, l, f) \
+	(t)->ab_ops->abo_barrier(t, (h)+(o), l, f)
 
 /*
  * Flags used in various bus DMA methods.
diff --git a/sys/alpha/include/bwx.h b/sys/alpha/include/bwx.h
index 3d63995..bb2866b 100644
--- a/sys/alpha/include/bwx.h
+++ b/sys/alpha/include/bwx.h
@@ -93,11 +93,25 @@ stw_nb(vm_offset_t va, u_int64_t r)
     __asm__ __volatile__ ("stw %1,%0" : "=m"(*(u_int16_t*)va) : "r"(r));
 }
 
-
 static __inline void
 stl_nb(vm_offset_t va, u_int64_t r)
 {
     __asm__ __volatile__ ("stl %1,%0" : "=m"(*(u_int32_t*)va) : "r"(r));
 }
 
+#ifdef _KERNEL
+
+/*
+ * A kernel object for accessing memory-like spaces (port and
+ * memory spaces) using BWX instructions.
+ */
+struct bwx_space {
+	struct alpha_busspace_ops *ops;
+	u_int64_t	base;		/* base address of space */
+};
+
+void bwx_init_space(struct bwx_space *bwx, u_int64_t base);
+
+#endif /* _KERNEL */
+
 #endif /* !_MACHINE_BWX_H_ */
diff --git a/sys/alpha/include/chipset.h b/sys/alpha/include/chipset.h
index 18792f1..048fbed 100644
--- a/sys/alpha/include/chipset.h
+++ b/sys/alpha/include/chipset.h
@@ -29,31 +29,6 @@
 #ifndef _MACHINE_CHIPSET_H_
 #define _MACHINE_CHIPSET_H_
 
-typedef u_int8_t	alpha_chipset_inb_t(u_int32_t port);
-typedef u_int16_t	alpha_chipset_inw_t(u_int32_t port);
-typedef u_int32_t	alpha_chipset_inl_t(u_int32_t port);
-typedef void		alpha_chipset_outb_t(u_int32_t port, u_int8_t data);
-typedef void		alpha_chipset_outw_t(u_int32_t port, u_int16_t data);
-typedef void		alpha_chipset_outl_t(u_int32_t port, u_int32_t data);
-
-typedef u_int8_t	alpha_chipset_readb_t(u_int32_t pa);
-typedef u_int16_t	alpha_chipset_readw_t(u_int32_t pa);
-typedef u_int32_t	alpha_chipset_readl_t(u_int32_t pa);
-typedef void		alpha_chipset_writeb_t(u_int32_t pa, u_int8_t data);
-typedef void		alpha_chipset_writew_t(u_int32_t pa, u_int16_t data);
-typedef void		alpha_chipset_writel_t(u_int32_t pa, u_int32_t data);
-
-typedef int		alpha_chipset_maxdevs_t(u_int bus);
-typedef u_int8_t	alpha_chipset_cfgreadb_t(u_int, u_int, u_int, u_int, u_int);
-typedef u_int16_t	alpha_chipset_cfgreadw_t(u_int, u_int, u_int, u_int, u_int);
-typedef u_int32_t	alpha_chipset_cfgreadl_t(u_int, u_int, u_int, u_int, u_int);
-typedef void		alpha_chipset_cfgwriteb_t(u_int, u_int, u_int, u_int, u_int,
-						  u_int8_t);
-typedef void		alpha_chipset_cfgwritew_t(u_int, u_int, u_int, u_int, u_int,
-						  u_int16_t);
-typedef void		alpha_chipset_cfgwritel_t(u_int, u_int, u_int, u_int, u_int,
-						  u_int32_t);
-typedef vm_offset_t     alpha_chipset_addrcvt_t(vm_offset_t);
 typedef u_int64_t	alpha_chipset_read_hae_t(void);
 typedef void		alpha_chipset_write_hae_t(u_int64_t);
 
@@ -61,43 +36,6 @@ struct sgmap;
 
 typedef struct alpha_chipset {
     /*
-     * I/O port access
-     */
-    alpha_chipset_inb_t*	inb;
-    alpha_chipset_inw_t*	inw;
-    alpha_chipset_inl_t*	inl;
-    alpha_chipset_outb_t*	outb;
-    alpha_chipset_outw_t*	outw;
-    alpha_chipset_outl_t*	outl;
-
-    /*
-     * Memory access
-     */
-    alpha_chipset_readb_t*	readb;
-    alpha_chipset_readw_t*	readw;
-    alpha_chipset_readl_t*	readl;
-    alpha_chipset_writeb_t*	writeb;
-    alpha_chipset_writew_t*	writew;
-    alpha_chipset_writel_t*	writel;
-
-    /*
-     * PCI configuration access
-     */
-    alpha_chipset_maxdevs_t*	maxdevs;
-    alpha_chipset_cfgreadb_t*	cfgreadb;
-    alpha_chipset_cfgreadw_t*	cfgreadw;
-    alpha_chipset_cfgreadl_t*	cfgreadl;
-    alpha_chipset_cfgwriteb_t*	cfgwriteb;
-    alpha_chipset_cfgwritew_t*	cfgwritew;
-    alpha_chipset_cfgwritel_t*	cfgwritel;
-
-    /*
-     * PCI address space translation functions
-     */
-    alpha_chipset_addrcvt_t*	cvt_to_dense;
-    alpha_chipset_addrcvt_t*	cvt_to_bwx;
-
-    /*
      * Access the HAE register
      */
     alpha_chipset_read_hae_t*	read_hae;
diff --git a/sys/alpha/include/cpufunc.h b/sys/alpha/include/cpufunc.h
index 96a91b6..e7d37f0 100644
--- a/sys/alpha/include/cpufunc.h
+++ b/sys/alpha/include/cpufunc.h
@@ -44,76 +44,6 @@ breakpoint(void)
 
 #endif
 
-#define inb(port)		chipset.inb(port)
-#define inw(port)		chipset.inw(port)
-#define inl(port)		chipset.inl(port)
-#define outb(port, data)	chipset.outb(port, data)
-#define outw(port, data)	chipset.outw(port, data)
-#define outl(port, data)	chipset.outl(port, data)
-
-#define readb(pa)		chipset.readb(pa)
-#define readw(pa)		chipset.readw(pa)
-#define readl(pa)		chipset.readl(pa)
-#define writeb(pa,v)		chipset.writeb(pa,v)
-#define writew(pa,v)		chipset.writew(pa,v)
-#define writel(pa,v)		chipset.writel(pa,v)
-
-/*
- * Bulk i/o (for IDE driver).
- */
-static __inline void insb(u_int32_t port, void *buffer, size_t count)
-{
-        u_int8_t *p = (u_int8_t *) buffer;
-        while (count--)
-                *p++ = inb(port);
-}
-
-static __inline void insw(u_int32_t port, void *buffer, size_t count)
-{
-	u_int16_t *p = (u_int16_t *) buffer;
-	while (count--)
-		*p++ = inw(port);
-}
-
-static __inline void insl(u_int32_t port, void *buffer, size_t count)
-{
-	u_int32_t *p = (u_int32_t *) buffer;
-	while (count--)
-		*p++ = inl(port);
-}
-
-static __inline void outsb(u_int32_t port, const void *buffer, size_t count)
-{
-        const u_int8_t *p = (const u_int8_t *) buffer;
-        while (count--)
-                outb(port, *p++);
-}
-
-static __inline void outsw(u_int32_t port, const void *buffer, size_t count)
-{
-	const u_int16_t *p = (const u_int16_t *) buffer;
-	while (count--)
-		outw(port, *p++);
-}
-
-static __inline void outsl(u_int32_t port, const void *buffer, size_t count)
-{
-	const u_int32_t *p = (const u_int32_t *) buffer;
-	while (count--)
-		outl(port, *p++);
-}
-
-/*
- * String version of IO memory access ops:
- */
-extern void memcpy_fromio(void *, u_int32_t, size_t);
-extern void memcpy_toio(u_int32_t, void *, size_t);
-extern void memcpy_io(u_int32_t, u_int32_t, size_t);
-extern void memset_io(u_int32_t, int, size_t);
-extern void memsetw(void *, int, size_t);
-extern void memsetw_io(u_int32_t, int, size_t);
-
-
 #endif /* _KERNEL */
 
 #endif /* !_MACHINE_CPUFUNC_H_ */
diff --git a/sys/alpha/include/swiz.h b/sys/alpha/include/swiz.h
index 4b6397a..465a81a 100644
--- a/sys/alpha/include/swiz.h
+++ b/sys/alpha/include/swiz.h
@@ -70,4 +70,26 @@
 #define SPARSE_WRITE_LONG(base, o, d)	\
 	SPARSE_WRITE(base + SPARSE_LONG_OFFSET(o), d)
 
+#ifdef _KERNEL
+
+/*
+ * A kernel object for accessing memory-like spaces (port and
+ * memory spaces) using SWIZ instructions.
+ */
+
+typedef u_int32_t (*swiz_sethae_fn)(void *arg, u_int32_t hae);
+
+struct swiz_space {
+	struct alpha_busspace_ops *ops;
+	u_int64_t	base;		/* base address of space */
+	swiz_sethae_fn	sethae;		/* function to set HAE */
+	void		*arg;		/* arg to sethae() */
+};
+
+void swiz_init_space(struct swiz_space *swiz, u_int64_t base);
+void swiz_init_space_hae(struct swiz_space *swiz, u_int64_t base,
+			 swiz_sethae_fn sethae, void *arg);
+
+#endif /* _KERNEL */
+
 #endif /* !_MACHINE_SWIZ_H_ */