 @@ -1,14 +1,14 @@
-/*	$NetBSD: awin_space.c,v 1.2 2014/01/23 19:26:55 matt Exp $	*/
+/*	$NetBSD: awin_space.c,v 1.3 2014/02/20 21:45:49 matt Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * 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: awin_space.c,v 1.2 2014/01/23 19:26:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_space.c,v 1.3 2014/02/20 21:45:49 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 #include <sys/bus.h>
 /* Prototypes for all the bus_space structure functions */
 bs_protos(awin);
 bs_protos(awin_a4x);
 bs_protos(a4x);
 bs_protos(bs_notimpl);
 @@ -183,52 +183,52 @@ struct bus_space awin_a4x_bs_tag = {
 	awin_bs_free,	/* not implemented */
 	/* get kernel virtual address */
 	awin_bs_vaddr,
 	/* mmap */
 	awin_a4x_bs_mmap,
 	/* barrier */
 	awin_bs_barrier,
 	/* read (single) */
 	a4x_bs_r_1,
-	a4x_bs_r_2,
+	NSWAP(a4x_bs_r_2),
-	a4x_bs_r_4,
+	NSWAP(a4x_bs_r_4),
 	bs_notimpl_bs_r_8,
 	/* read multiple */
 	a4x_bs_rm_1,
-	a4x_bs_rm_2,
+	NSWAP(a4x_bs_rm_2),
-	a4x_bs_rm_4,
+	NSWAP(a4x_bs_rm_4),
 	bs_notimpl_bs_rm_8,
 	/* read region */
 	bs_notimpl_bs_rr_1,
 	bs_notimpl_bs_rr_2,
 	bs_notimpl_bs_rr_4,
 	bs_notimpl_bs_rr_8,
 	/* write (single) */
 	a4x_bs_w_1,
-	a4x_bs_w_2,
+	NSWAP(a4x_bs_w_2),
-	a4x_bs_w_4,
+	NSWAP(a4x_bs_w_4),
 	bs_notimpl_bs_w_8,
 	/* write multiple */
 	a4x_bs_wm_1,
-	a4x_bs_wm_2,
+	NSWAP(a4x_bs_wm_2),
-	a4x_bs_wm_4,
+	NSWAP(a4x_bs_wm_4),
 	bs_notimpl_bs_wm_8,
 	/* write region */
 	bs_notimpl_bs_wr_1,
 	bs_notimpl_bs_wr_2,
 	bs_notimpl_bs_wr_4,
 	bs_notimpl_bs_wr_8,
 	/* set multiple */
 	bs_notimpl_bs_sm_1,
 	bs_notimpl_bs_sm_2,
 	bs_notimpl_bs_sm_4,
 	bs_notimpl_bs_sm_8,
 @@ -238,58 +238,58 @@ struct bus_space awin_a4x_bs_tag = {
 	bs_notimpl_bs_sr_2,
 	bs_notimpl_bs_sr_4,
 	bs_notimpl_bs_sr_8,
 	/* copy */
 	bs_notimpl_bs_c_1,
 	bs_notimpl_bs_c_2,
 	bs_notimpl_bs_c_4,
 	bs_notimpl_bs_c_8,
 #ifdef __BUS_SPACE_HAS_STREAM_METHODS
 	/* read (single) */
 	a4x_bs_r_1,
-	a4x_bs_r_2,
+	NSWAP(a4x_bs_r_2),
-	a4x_bs_r_4,
+	NSWAP(a4x_bs_r_4),
 	bs_notimpl_bs_r_8,
 	/* read multiple */
 	a4x_bs_rm_1,
-	a4x_bs_rm_2,
+	NSWAP(a4x_bs_rm_2),
-	a4x_bs_rm_4,
+	NSWAP(a4x_bs_rm_4),
 	bs_notimpl_bs_rm_8,
 	/* read region */
 	a4x_bs_rr_1,
-	a4x_bs_rr_2,
+	NSWAP(a4x_bs_rr_2),
-	a4x_bs_rr_4,
+	NSWAP(a4x_bs_rr_4),
 	bs_notimpl_bs_rr_8,
 	/* write (single) */
 	a4x_bs_w_1,
-	a4x_bs_w_2,
+	NSWAP(a4x_bs_w_2),
-	a4x_bs_w_4,
+	NSWAP(a4x_bs_w_4),
 	bs_notimpl_bs_w_8,
 	/* write multiple */
 	a4x_bs_wm_1,
-	a4x_bs_wm_2,
+	NSWAP(a4x_bs_wm_2),
-	a4x_bs_wm_4,
+	NSWAP(a4x_bs_wm_4),
 	bs_notimpl_bs_wm_8,
 	/* write region */
 	a4x_bs_wr_1,
-	a4x_bs_wr_2,
+	NSWAP(a4x_bs_wr_2),
-	a4x_bs_wr_4,
+	NSWAP(a4x_bs_wr_4),
 	bs_notimpl_bs_wr_8,
 #endif
 };
 int
 awin_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	u_long startpa, endpa, pa;
 	const struct pmap_devmap *pd;
 	vaddr_t va;
 	if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {