 @@ -1,14 +1,14 @@
-/*	$NetBSD: be_bus.c,v 1.7 2005/12/11 12:16:54 christos Exp $	*/
+/*	$NetBSD: be_bus.c,v 1.7.24.1 2009/01/02 12:26:06 jdc Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.7 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: be_bus.c,v 1.7.24.1 2009/01/02 12:26:06 jdc Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 /*
  * This file contains the common functions for using a big endian (linear)
  * bus on a big endian atari.
  */
 @@ -158,35 +158,35 @@ static void		beb_bus_space_set_region_1
 static void		beb_bus_space_set_region_2 __P((bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int16_t,
 				bus_size_t));
 static void		beb_bus_space_set_region_4 __P((bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
 				bus_size_t));
 static void		beb_bus_space_set_region_8 __P((bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
 				bus_size_t));
 /*
  * Don't force a function call overhead on these primitives...
  */
-#define __read_1(h, o)		*((u_int8_t  *)((h) + (o)))
+#define __read_1(h, o)		*((volatile u_int8_t  *)((h) + (o)))
-#define __read_2(h, o)		*((u_int16_t *)((h) + (o)))
+#define __read_2(h, o)		*((volatile u_int16_t *)((h) + (o)))
-#define __read_4(h, o)		*((u_int32_t *)((h) + (o)))
+#define __read_4(h, o)		*((volatile u_int32_t *)((h) + (o)))
-#define __read_8(h, o)		*((u_int64_t *)((h) + (o)))
+#define __read_8(h, o)		*((volatile u_int64_t *)((h) + (o)))
-#define __write_1(h, o, v)	*((u_int8_t  *)((h) + (o))) = (v)
+#define __write_1(h, o, v)	*((volatile u_int8_t  *)((h) + (o))) = (v)
-#define __write_2(h, o, v)	*((u_int16_t *)((h) + (o))) = (v)
+#define __write_2(h, o, v)	*((volatile u_int16_t *)((h) + (o))) = (v)
-#define __write_4(h, o, v)	*((u_int32_t *)((h) + (o))) = (v)
+#define __write_4(h, o, v)	*((volatile u_int32_t *)((h) + (o))) = (v)
-#define __write_8(h, o, v)	*((u_int64_t *)((h) + (o))) = (v)
+#define __write_8(h, o, v)	*((volatile u_int64_t *)((h) + (o))) = (v)
 bus_space_tag_t
 beb_alloc_bus_space_tag(storage)
 bus_space_tag_t	storage;
+{
 	bus_space_tag_t	beb_t;
 	/*
 	 * Allow the caller to specify storage space for the tag. This
 	 * is used during console config (when malloc() can't be used).
 	 */
 	if (storage != NULL)
 		beb_t = storage;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: le_bus.c,v 1.11 2006/01/29 21:42:41 dsl Exp $	*/
+/*	$NetBSD: le_bus.c,v 1.11.22.1 2009/01/02 12:26:06 jdc Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.11 2006/01/29 21:42:41 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: le_bus.c,v 1.11.22.1 2009/01/02 12:26:06 jdc Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/bswap.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 /*
  * This file contains the common functions for using a litte endian (linear)
  * bus on a big endian atari.
  */
 @@ -240,35 +240,35 @@ static inline u_int16_t swap16(u_int16_t
+}
 static inline u_int32_t swap32(u_int32_t v)
+{
 	__asm volatile ("	rolw	#8, %0	\n"
 			"	swap	%0	\n"
 			"	rolw	#8, %0" : "=d"(v) : "0"(v));
 	return(v);
+}
 /*
  * Don't force a function call overhead on these primitives...
  */
-#define __read_1(h, o)		*((u_int8_t *)((h) + (o)))
+#define __read_1(h, o)		*((volatile u_int8_t *)((h) + (o)))
-#define __read_2(h, o)		swap16(*((u_int16_t *)((h) + (o))))
+#define __read_2(h, o)		swap16(*((volatile u_int16_t *)((h) + (o))))
-#define __read_4(h, o)		swap32(*((u_int32_t *)((h) + (o))))
+#define __read_4(h, o)		swap32(*((volatile u_int32_t *)((h) + (o))))
-#define __read_8(h, o)		bswap64(*((u_int64_t *)((h) + (o))))
+#define __read_8(h, o)		bswap64(*((volatile u_int64_t *)((h) + (o))))
-#define __write_1(h, o, v)	*((u_int8_t *)((h) + (o))) = (v)
+#define __write_1(h, o, v)	*((volatile u_int8_t *)((h) + (o))) = (v)
-#define __write_2(h, o, v)	*((u_int16_t *)((h) + (o))) = swap16(v)
+#define __write_2(h, o, v)	*((volatile u_int16_t *)((h) + (o))) = swap16(v)
-#define __write_4(h, o, v)	*((u_int32_t *)((h) + (o))) = swap32(v)
+#define __write_4(h, o, v)	*((volatile u_int32_t *)((h) + (o))) = swap32(v)
-#define __write_8(h, o, v)	*((u_int64_t *)((h) + (o))) = bswap64(v)
+#define __write_8(h, o, v)	*((volatile u_int64_t *)((h) + (o))) = bswap64(v)
 bus_space_tag_t
 leb_alloc_bus_space_tag(storage)
 bus_space_tag_t	storage;
+{
 	bus_space_tag_t			leb_t;
 	/*
 	 * Allow the caller to specify storage space for the tag. This
 	 * is used during console config (when malloc() can't be used).
 	 */
 	if (storage != NULL)
 		leb_t = storage;
 @@ -483,82 +483,82 @@ leb_bus_space_write_8(t, h, o, v)
 /*
  *	u_intX_t bus_space_read_stream_N __P((bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset));
+ *
  * Return an 1, 2, 4, or 8 byte value read from the bus_space described
  * by tag/handle at `offset'. No endian conversion is done.
  */
 static u_int16_t
 leb_bus_space_read_stream_2(t, h, o)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o;
+{
-	return(*((u_int16_t *)(h + o)));
+	return(*((volatile u_int16_t *)(h + o)));
+}
 static u_int32_t
 leb_bus_space_read_stream_4(t, h, o)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o;
+{
-	return(*((u_int32_t *)(h + o)));
+	return(*((volatile u_int32_t *)(h + o)));
+}
 static u_int64_t
 leb_bus_space_read_stream_8(t, h, o)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o;
+{
-	return(*((u_int64_t *)(h + o)));
+	return(*((volatile u_int64_t *)(h + o)));
+}
 /*
  *	u_intX_t bus_space_write_stream_N __P((bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t val));
+ *
  * Write an 1, 2, 4, or 8 byte value to the bus_space described by tag/handle
  * at `offset'. No endian conversion is done.
  */
 static void
 leb_bus_space_write_stream_2(t, h, o, v)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o;
 	u_int16_t		v;
+{
-	*((u_int16_t *)(h + o)) = v;
+	*((volatile u_int16_t *)(h + o)) = v;
+}
 static void
 leb_bus_space_write_stream_4(t, h, o, v)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o;
 	u_int32_t		v;
+{
-	*((u_int32_t *)(h + o)) = v;
+	*((volatile u_int32_t *)(h + o)) = v;
+}
 static void
 leb_bus_space_write_stream_8(t, h, o, v)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o;
 	u_int64_t		v;
+{
-	*((u_int64_t *)(h + o)) = v;
+	*((volatile u_int64_t *)(h + o)) = v;
+}
 /*
  *	void bus_space_read_multi_N __P((bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset, u_intX_t *address,
  *	 	bus_size_t count));
+ *
  * Read 'count' 1, 2, 4, or 8 byte values from the bus_space described by
  * tag/handle at `offset' and store them in the address range starting at
  * 'address'. The values are converted to CPU endian order before being
  * being stored.
  */
 static void
 @@ -665,91 +665,91 @@ leb_bus_space_write_multi_8(t, h, o, a,
+ *
  * Read 'count' 1, 2, 4, or 8 byte values from the bus_space described by
  * tag/handle at `offset' and store them in the address range starting at
  * 'address'. No endian conversion is being done.
  */
 static void
 leb_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;
 	u_int16_t		*a;
+{
 	for (; c; a++, c--)
-		*a = *((u_int16_t *)(h + o));
+		*a = *((volatile u_int16_t *)(h + o));
+}
 static void
 leb_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;
 	u_int32_t		*a;
+{
 	for (; c; a++, c--)
-		*a = *((u_int32_t *)(h + o));
+		*a = *((volatile u_int32_t *)(h + o));
+}
 static void
 leb_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;
 	u_int64_t		*a;
+{
 	for (; c; a++, c--)
-		*a = *((u_int64_t *)(h + o));
+		*a = *((volatile u_int64_t *)(h + o));
+}
 /*
  *	void bus_space_write_multi_stream_N __P((bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset,
  *		const u_intX_t *address, bus_size_t count));
+ *
  * Write 'count' 1, 2, 4, or 8 byte values from the address range starting
  * at 'address' to the bus_space described by tag/handle at `offset'.
  * No endian conversion is being done.
  */
 static void
 leb_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 u_int16_t		*a;
+{
 	for (; c; a++, c--)
-		*((u_int16_t *)(h + o)) = *a;
+		*((volatile u_int16_t *)(h + o)) = *a;
+}
 static void
 leb_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 u_int32_t		*a;
+{
 	for (; c; a++, c--)
-		*((u_int32_t *)(h + o)) = *a;
+		*((volatile u_int32_t *)(h + o)) = *a;
+}
 static void
 leb_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 u_int64_t		*a;
+{
 	for (; c; a++, c--)
-		*((u_int64_t *)(h + o)) = *a;
+		*((volatile u_int64_t *)(h + o)) = *a;
+}
 /*
  *	void bus_space_read_region_N __P((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.
  */
 static void
 leb_bus_space_read_region_1(t, h, o, a, c)
 @@ -855,91 +855,91 @@ leb_bus_space_write_region_8(t, h, o, a,
  * 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 endian conversion is being done.
  */
 static void
 leb_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;
 	u_int16_t		*a;
+{
 	for (; c; a++, o += 2, c--)
-		*a = *(u_int16_t *)(h + o);
+		*a = *(volatile u_int16_t *)(h + o);
+}
 static void
 leb_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;
 	u_int32_t		*a;
+{
 	for (; c; a++, o += 4, c--)
-		*a = *(u_int32_t *)(h + o);
+		*a = *(volatile u_int32_t *)(h + o);
+}
 static void
 leb_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;
 	u_int64_t		*a;
+{
 	for (; c; a++, o += 8, c--)
-		*a = *(u_int64_t *)(h + o);
+		*a = *(volatile u_int64_t *)(h + o);
+}
 /*
  *	void bus_space_write_region_stream_N __P((bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset,
  *		u_intN_t *addr, bus_size_t count));
+ *
  * Copy `count' 1, 2, 4, or 8 byte quantities from the buffer provided
  * into the bus space described by tag/handle and starting at `offset'.
  * No endian conversion is being done.
  */
 static void
 leb_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 u_int16_t		*a;
+{
 	for (; c; a++, o += 2, c--)
-		*((u_int16_t *)(h + o)) = *a;
+		*((volatile u_int16_t *)(h + o)) = *a;
+}
 static void
 leb_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 u_int32_t		*a;
+{
 	for (; c; a++, o += 4, c--)
-		*((u_int32_t *)(h + o)) = *a;
+		*((volatile u_int32_t *)(h + o)) = *a;
+}
 static void
 leb_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 u_int64_t		*a;
+{
 	for (; c; a++, o += 8, c--)
-		*((u_int64_t *)(h + o)) = *a;
+		*((volatile u_int64_t *)(h + o)) = *a;
+}
 /*
  *	void bus_space_set_multi_N __P((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.
  */
 static void
 leb_bus_space_set_multi_1(t, h, o, v, c)
 @@ -951,51 +951,51 @@ leb_bus_space_set_multi_1(t, h, o, v, c)
 	for (; c; c--)
 		__write_1(h, o, v);
+}
 static void
 leb_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;
 	u_int16_t		v;
+{
 	v = swap16(v);
 	for (; c; c--)
-		*((u_int16_t *)(h + o)) = v;
+		*((volatile u_int16_t *)(h + o)) = v;
+}
 static void
 leb_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;
 	u_int32_t		v;
+{
 	v = swap32(v);
 	for (; c; c--)
-		*((u_int32_t *)(h + o)) = v;
+		*((volatile u_int32_t *)(h + o)) = v;
+}
 static void
 leb_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;
 	u_int64_t		v;
+{
 	v = bswap64(v);
 	for (; c; c--)
-		*((u_int64_t *)(h + o)) = v;
+		*((volatile u_int64_t *)(h + o)) = v;
+}
 /*
  *	void bus_space_set_region_N __P((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'.
  */
 static void
 leb_bus_space_set_region_1(t, h, o, v, c)
 	bus_space_tag_t		t;
 @@ -1006,39 +1006,39 @@ leb_bus_space_set_region_1(t, h, o, v, c
 	for (; c; o++, c--)
 		__write_1(h, o, v);
+}
 static void
 leb_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;
 	u_int16_t		v;
+{
 	v = swap16(v);
 	for (; c; o += 2, c--)
-		*((u_int16_t *)(h + o)) = v;
+		*((volatile u_int16_t *)(h + o)) = v;
+}
 static void
 leb_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;
 	u_int32_t		v;
+{
 	v = swap32(v);
 	for (; c; o += 4, c--)
-		*((u_int32_t *)(h + o)) = v;
+		*((volatile u_int32_t *)(h + o)) = v;
+}
 static void
 leb_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;
 	u_int64_t		v;
+{
 	v = bswap64(v);
 	for (; c; o += 8, c--)
-		*((u_int64_t *)(h + o)) = v;
+		*((volatile u_int64_t *)(h + o)) = v;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.4 2005/12/11 12:16:54 christos Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.4.24.1 2009/01/02 12:26:06 jdc Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.4.24.1 2009/01/02 12:26:06 jdc Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 static int		mb_bus_space_peek_1 __P((bus_space_tag_t,
 				bus_space_handle_t, bus_size_t));
 static int		mb_bus_space_peek_2 __P((bus_space_tag_t,
 				bus_space_handle_t, bus_size_t));
 static int		mb_bus_space_peek_4 __P((bus_space_tag_t,
 @@ -139,45 +139,45 @@ static void		mb_bus_space_set_region_2 _
 static void		mb_bus_space_set_region_4 __P((bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int32_t,
 				bus_size_t));
 static void		mb_bus_space_set_region_8 __P((bus_space_tag_t,
 				bus_space_handle_t, bus_size_t, u_int64_t,
 				bus_size_t));
 /*
  * Calculate offset on the mainbus given a stride_shift and width_offset
  */
 #define calc_addr(base, off, stride, wm)	\
 	((u_long)(base) + ((off) << (stride)) + (wm))
 #define __read_1(t, h, o)	\
-	(*((u_int8_t *)(calc_addr(h, o, (t)->stride, (t)->wo_1))))
+	(*((volatile u_int8_t *)(calc_addr(h, o, (t)->stride, (t)->wo_1))))
 #define __read_2(t, h, o)	\
-	(*((u_int16_t *)(calc_addr(h, o, (t)->stride, (t)->wo_2))))
+	(*((volatile u_int16_t *)(calc_addr(h, o, (t)->stride, (t)->wo_2))))
 #define	__read_4(t, h, o)	\
-	(*((u_int32_t *)(calc_addr(h, o, (t)->stride, (t)->wo_4))))
+	(*((volatile u_int32_t *)(calc_addr(h, o, (t)->stride, (t)->wo_4))))
 #define	__read_8(t, h, o)	\
-	(*((u_int64_t *)(calc_addr(h, o, (t)->stride, (t)->wo_8))))
+	(*((volatile u_int64_t *)(calc_addr(h, o, (t)->stride, (t)->wo_8))))
 #define __write_1(t, h, o, v)	\
-    *((u_int8_t *)(calc_addr(h, o, (t)->stride, (t)->wo_1))) = v
+    *((volatile u_int8_t *)(calc_addr(h, o, (t)->stride, (t)->wo_1))) = v
 #define __write_2(t, h, o, v)	\
-    *((u_int16_t *)(calc_addr(h, o, (t)->stride, (t)->wo_2))) = v
+    *((volatile u_int16_t *)(calc_addr(h, o, (t)->stride, (t)->wo_2))) = v
 #define __write_4(t, h, o, v)	\
-    *((u_int32_t *)(calc_addr(h, o, (t)->stride, (t)->wo_4))) = v
+    *((volatile u_int32_t *)(calc_addr(h, o, (t)->stride, (t)->wo_4))) = v
 #define __write_8(t, h, o, v)	\
-    *((u_int64_t *)(calc_addr(h, o, (t)->stride, (t)->wo_8))) = v
+    *((volatile u_int64_t *)(calc_addr(h, o, (t)->stride, (t)->wo_8))) = v
 bus_space_tag_t
 mb_alloc_bus_space_tag()
+{
 	bus_space_tag_t	mb_t;
 	/* Not really M_TEMP, is it.. */
 	if ((mb_t = malloc(sizeof(*mb_t), M_TEMP, M_NOWAIT)) == NULL)
 		return(NULL);
 	bzero(mb_t, sizeof(*mb_t));
 	mb_t->abs_p_1   = mb_bus_space_peek_1;
 	mb_t->abs_p_2   = mb_bus_space_peek_2;
 @@ -361,127 +361,127 @@ mb_bus_space_write_8(t, h, o, v)
     u_int64_t		v;
+{
 	__write_8(t, h, o, v);
+}
 static void
 mb_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;
 	u_int8_t		*a;
+{
-	u_int8_t	*ba;
+	volatile u_int8_t	*ba;
-	ba = (u_int8_t *)calc_addr(h, o, t->stride, t->wo_1);
+	ba = (volatile u_int8_t *)calc_addr(h, o, t->stride, t->wo_1);
 	for (; c; a++, c--)
 		*a = *ba;
+}
 static void
 mb_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;
 	u_int16_t		*a;
+{
-	u_int16_t	*ba;
+	volatile u_int16_t	*ba;
-	ba = (u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
+	ba = (volatile u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
 	for (; c; a++, c--)
 		*a = *ba;
+}
 static void
 mb_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;
 	u_int32_t		*a;
+{
-	u_int32_t	*ba;
+	volatile u_int32_t	*ba;
-	ba = (u_int32_t *)calc_addr(h, o, t->stride, t->wo_4);
+	ba = (volatile u_int32_t *)calc_addr(h, o, t->stride, t->wo_4);
 	for (; c; a++, c--)
 		*a = *ba;
+}
 static void
 mb_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;
 	u_int64_t		*a;
+{
-	u_int64_t	*ba;
+	volatile u_int64_t	*ba;
-	ba = (u_int64_t *)calc_addr(h, o, t->stride, t->wo_8);
+	ba = (volatile u_int64_t *)calc_addr(h, o, t->stride, t->wo_8);
 	for (; c; a++, c--)
 		*a = *ba;
+}
 static void
 mb_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 u_int8_t		*a;
+{
-	u_int8_t	*ba;
+	volatile u_int8_t	*ba;
-	ba = (u_int8_t *)calc_addr(h, o, t->stride, t->wo_1);
+	ba = (volatile u_int8_t *)calc_addr(h, o, t->stride, t->wo_1);
 	for (; c; a++, c--)
 		*ba = *a;
+}
 static void
 mb_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 u_int16_t		*a;
+{
-	u_int16_t	*ba;
+	volatile u_int16_t	*ba;
-	ba = (u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
+	ba = (volatile u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
 	for (; c; a++, c--)
 		*ba = *a;
+}
 static void
 mb_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 u_int32_t		*a;
+{
-	u_int32_t	*ba;
+	volatile u_int32_t	*ba;
-	ba = (u_int32_t *)calc_addr(h, o, t->stride, t->wo_4);
+	ba = (volatile u_int32_t *)calc_addr(h, o, t->stride, t->wo_4);
 	for (; c; a++, c--)
 		*ba = *a;
+}
 static void
 mb_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 u_int64_t		*a;
+{
-	u_int64_t	*ba;
+	volatile u_int64_t	*ba;
-	ba = (u_int64_t *)calc_addr(h, o, t->stride, t->wo_8);
+	ba = (volatile u_int64_t *)calc_addr(h, o, t->stride, t->wo_8);
 	for (; c; a++, c--)
 		*ba = *a;
+}
 /*
  *	void bus_space_read_region_N __P((bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset,
  *		u_intN_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.
  */
 @@ -587,71 +587,71 @@ mb_bus_space_write_region_8(t, h, o, a,
  *		size_t count));
+ *
  * Write the 1, 2, 4, or 8 byte value `val' to bus space described
  * by tag/handle/offset `count' times.
  */
 static void
 mb_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;
 	u_int8_t		v;
+{
-	u_int8_t	*ba;
+	volatile u_int8_t	*ba;
-	ba = (u_int8_t *)calc_addr(h, o, t->stride, t->wo_1);
+	ba = (volatile u_int8_t *)calc_addr(h, o, t->stride, t->wo_1);
 	for (; c; c--)
 		*ba = v;
+}
 static void
 mb_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;
 	u_int16_t		v;
+{
-	u_int16_t	*ba;
+	volatile u_int16_t	*ba;
-	ba = (u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
+	ba = (volatile u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
 	for (; c; c--)
 		*ba = v;
+}
 static void
 mb_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;
 	u_int32_t		v;
+{
-	u_int32_t	*ba;
+	volatile u_int32_t	*ba;
-	ba = (u_int32_t *)calc_addr(h, o, t->stride, t->wo_4);
+	ba = (volatile u_int32_t *)calc_addr(h, o, t->stride, t->wo_4);
 	for (; c; c--)
 		*ba = v;
+}
 static void
 mb_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;
 	u_int64_t		v;
+{
-	u_int64_t	*ba;
+	volatile u_int64_t	*ba;
-	ba = (u_int64_t *)calc_addr(h, o, t->stride, t->wo_8);
+	ba = (volatile u_int64_t *)calc_addr(h, o, t->stride, t->wo_8);
 	for (; c; c--)
 		*ba = v;
+}
 /*
  *	void bus_space_set_region_N __P((bus_space_tag_t tag,
  *		bus_space_handle_t bsh, bus_size_t offset, u_intN_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'.
  */
 static void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wdc_mb.c,v 1.28.22.1 2008/02/02 03:34:04 riz Exp $	*/
+/*	$NetBSD: wdc_mb.c,v 1.28.22.2 2009/01/02 12:26:07 jdc Exp $	*/
 /*-
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Onno van der Linden.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.28.22.1 2008/02/02 03:34:04 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_mb.c,v 1.28.22.2 2009/01/02 12:26:07 jdc Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/bswap.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/iomap.h>
 #include <machine/mfp.h>
 #include <machine/dma.h>
 @@ -280,33 +280,33 @@ struct ata_channel *chp;
  * the data-register are swapped on the atari. This works OK for an IDE
  * disk, but turns into a nightmare when used on atapi devices.
  */
 #define calc_addr(base, off, stride, wm)	\
 	((u_long)(base) + ((off) << (stride)) + (wm))
 static void
 read_multi_2_swap(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o, c;
 	u_int16_t		*a;
+{
-	u_int16_t	*ba;
+	volatile u_int16_t	*ba;
-	ba = (u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
+	ba = (volatile u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
 	for (; c; a++, c--)
 		*a = bswap16(*ba);
+}
 static void
 write_multi_2_swap(t, h, o, a, c)
 	bus_space_tag_t		t;
 	bus_space_handle_t	h;
 	bus_size_t		o, c;
 	const u_int16_t		*a;
+{
-	u_int16_t	*ba;
+	volatile u_int16_t	*ba;
-	ba = (u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
+	ba = (volatile u_int16_t *)calc_addr(h, o, t->stride, t->wo_2);
 	for (; c; a++, c--)
 		*ba = bswap16(*a);
+}