 @@ -1,14 +1,14 @@
-/*	$NetBSD: empb_bsm.c,v 1.3 2012/06/04 12:56:48 rkujawa Exp $ */
+/*	$NetBSD: empb_bsm.c,v 1.4 2012/06/04 19:45:50 rkujawa Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Radoslaw Kujawa.
+ *
  * 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.
 @@ -75,40 +75,40 @@ static bsw(empb_bsw2_swap, u_int16_t);
 static bsr(empb_bsr2, u_int16_t);
 static bsw(empb_bsw2, u_int16_t);
 static bsrm(empb_bsrm2_swap, u_int16_t);
 static bswm(empb_bswm2_swap, u_int16_t);
 static bsrm(empb_bsrm2, u_int16_t);
 static bswm(empb_bswm2, u_int16_t);
 static bsrm(empb_bsrr2_swap, u_int16_t);
 static bswm(empb_bswr2_swap, u_int16_t);
 static bsrm(empb_bsrr2, u_int16_t);
 static bswm(empb_bswr2, u_int16_t);
 static bssr(empb_bssr2_swap, u_int16_t);
 static bscr(empb_bscr2, u_int16_t);
-/*static bsr(empb_bsr4_swap, u_int32_t);
+static bsr(empb_bsr4_swap, u_int32_t);
 static bsw(empb_bsw4_swap, u_int32_t);
 static bsr(empb_bsr4, u_int32_t);
 static bsw(empb_bsw4, u_int32_t);
 static bsrm(empb_bsrm4_swap, u_int32_t);
 static bswm(empb_bswm4_swap, u_int32_t);
 static bsrm(empb_bsrm4, u_int32_t);
 static bswm(empb_bswm4, u_int32_t);
 static bsrm(empb_bsrr4_swap, u_int32_t);
 static bswm(empb_bswr4_swap, u_int32_t);
 static bsrm(empb_bsrr4, u_int32_t);
 static bswm(empb_bswr4, u_int32_t);
 static bssr(empb_bssr4_swap, u_int32_t);
-static bscr(empb_bscr4, u_int32_t);*/
+static bscr(empb_bscr4, u_int32_t);
 /*
  * Hold pointer to bridge driver here. We need to access it to switch
  * window position. Perhaps it should be stored in bus_space_tag instead...
  */
 static struct empb_softc *empb_sc = NULL;
 static bool
 empb_bsm_init(void)
+{
 	device_t dev;
 	/* We can't have more than one Mediator anyway. */
 	if (!(dev = device_find_by_xname("empb0"))) {
 @@ -179,127 +179,127 @@ empb_bsr1(bus_space_handle_t handle, bus
 	uint8_t *p;
 	uint8_t x;
 	bus_addr_t wp; /* window position */
 	wp = empb_switch_window(empb_sc, handle);
 	/* window address + (PCI mem address - window position) */
 	p = (uint8_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	x = *p;
 	return x;
+}
-void
+static void
 empb_bsw1(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (uint8_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	*p = value;
+}
-void
+static void
 empb_bsrm1(bus_space_handle_t handle, bus_size_t offset, u_int8_t *pointer,
     bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
   	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
-void
+static void
 empb_bswm1(bus_space_handle_t handle, bus_size_t offset,
     const u_int8_t *pointer, bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
 	while (count > 0) {
 		*p = *pointer++;
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
-void
+static void
 empb_bsrr1(bus_space_handle_t handle, bus_size_t offset, u_int8_t *pointer,
     bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
 empb_bswr1(bus_space_handle_t handle, bus_size_t offset,
     const u_int8_t *pointer, bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
  	while (count > 0) {
 		*p = *pointer++;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
 empb_bssr1(bus_space_handle_t handle, bus_size_t offset, unsigned value,
     bus_size_t count)
+{
 	volatile uint8_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile u_int8_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
  	while (count > 0) {
  		*p = value;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 /* XXX: this is broken, rewrite */
-void
+static void
 empb_bscr1(bus_space_handle_t handlefrom, bus_size_t from,
     bus_space_handle_t handleto, bus_size_t to, bus_size_t count)
+{
 	volatile uint8_t *p, *q;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handlefrom);
 	p = (volatile u_int8_t *)
 	    ( ((empb_sc->pci_mem_win_t->base)+(handlefrom - wp)) + from );
 	q = (volatile u_int8_t *)
 	    ( ((empb_sc->pci_mem_win_t->base)+(handleto - wp)) + to );
 @@ -334,236 +334,236 @@ empb_bsr2_swap(bus_space_handle_t handle
 	uint16_t *p;
 	uint16_t x;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	x = *p;
 	return bswap16(x);
+}
-void
+static void
 empb_bsw2(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	*p = value;
+}
-void
+static void
 empb_bsw2_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	*p = bswap16(value);
+}
-void
+static void
 empb_bsrm2(bus_space_handle_t handle, bus_size_t offset, u_int16_t *pointer,
     bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-  	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+  	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
-void
+static void
 empb_bsrm2_swap(bus_space_handle_t handle, bus_size_t offset,
     u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-  	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+  	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
 		*pointer++ = bswap16(*p);
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
-void
+static void
 empb_bswm2(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
 		*p = *pointer++;
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
-void
+static void
 empb_bswm2_swap(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
 		*p = bswap16(*pointer++);
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
-void
+static void
 empb_bsrr2(bus_space_handle_t handle, bus_size_t offset, u_int16_t *pointer,
     bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
 empb_bsrr2_swap(bus_space_handle_t handle, bus_size_t offset,
     u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
 	while (count > 0) {
 		*pointer++ = bswap16(*p);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
 empb_bssr2_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value,
     bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
  	while (count > 0) {
  		*p = bswap16(value);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
 empb_bswr2(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile u_int16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
  	while (count > 0) {
 		*p = *pointer++;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
 empb_bswr2_swap(bus_space_handle_t handle, bus_size_t offset,
     const u_int16_t *pointer, bus_size_t count)
+{
 	volatile uint16_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (volatile u_int16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
  	while (count > 0) {
 		*p = bswap16(*pointer++);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
 /* XXX: this is broken, rewrite, XXX 2: should we swap here? */
-void
+static void
 empb_bscr2(bus_space_handle_t handlefrom, bus_size_t from,
     bus_space_handle_t handleto, bus_size_t to, bus_size_t count)
+{
 	volatile uint16_t *p, *q;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handlefrom);
 	p = (volatile uint16_t *)
 	    ( ((empb_sc->pci_mem_win_t->base)+(handlefrom - wp)) + from );
 	q = (volatile uint16_t *)
 	    ( ((empb_sc->pci_mem_win_t->base)+(handleto - wp)) + to );
 	while (count > 0) {
 		*q = *p;
 		amiga_bus_reorder_protect();
 		p++; q++;
 		--count;
+	}
+}
 /* === 32-bit methods === */
 /*
 static uint32_t
 empb_bsr4(bus_space_handle_t handle, bus_size_t offset)
+{
 	uint32_t *p;
 	uint32_t x;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	x = *p;
 	return x;
 @@ -575,233 +575,233 @@ empb_bsr4_swap(bus_space_handle_t handle
 	uint32_t *p;
 	uint32_t x;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
 	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	x = *p;
 	return bswap32(x);
+}
-void
+static void
 empb_bsw4(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
 	uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
 	*p = value;
+}
-void
+static void
-empb_bsw2_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+empb_bsw4_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value)
+{
-	uint16_t *p;
+	uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (uint16_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
+	p = (uint32_t*)((empb_sc->pci_mem_win_t->base) + (handle - wp));
-	*p = bswap16(value);
+	*p = bswap32(value);
+}
-void
+static void
-empb_bsrm2(bus_space_handle_t handle, bus_size_t offset, u_int16_t *pointer,
+empb_bsrm4(bus_space_handle_t handle, bus_size_t offset, u_int32_t *pointer,
     bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-  	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+  	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
-void
+static void
-empb_bsrm2_swap(bus_space_handle_t handle, bus_size_t offset,
+empb_bsrm4_swap(bus_space_handle_t handle, bus_size_t offset,
-    u_int16_t *pointer, bus_size_t count)
+    u_int32_t *pointer, bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-  	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+  	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
-		*pointer++ = bswap16(*p);
+		*pointer++ = bswap32(*p);
 		amiga_bus_reorder_protect();
  		--count;
+	}
+}
-void
+static void
-empb_bswm2(bus_space_handle_t handle, bus_size_t offset,
+empb_bswm4(bus_space_handle_t handle, bus_size_t offset,
-    const u_int16_t *pointer, bus_size_t count)
+    const u_int32_t *pointer, bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
 		*p = *pointer++;
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
-void
+static void
-empb_bswm2_swap(bus_space_handle_t handle, bus_size_t offset,
+empb_bswm4_swap(bus_space_handle_t handle, bus_size_t offset,
-    const u_int16_t *pointer, bus_size_t count)
+    const u_int32_t *pointer, bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *) ((empb_sc->pci_mem_win_t->base) +
+	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
 	while (count > 0) {
-		*p = bswap16(*pointer++);
+		*p = bswap32(*pointer++);
  		amiga_bus_reorder_protect();
 		--count;
+	}
+}
-void
+static void
-empb_bsrr2(bus_space_handle_t handle, bus_size_t offset, u_int16_t *pointer,
+empb_bsrr4(bus_space_handle_t handle, bus_size_t offset, u_int32_t *pointer,
     bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
 	while (count > 0) {
 		*pointer++ = *p;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
-empb_bsrr2_swap(bus_space_handle_t handle, bus_size_t offset,
+empb_bsrr4_swap(bus_space_handle_t handle, bus_size_t offset,
-    u_int16_t *pointer, bus_size_t count)
+    u_int32_t *pointer, bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
 	while (count > 0) {
-		*pointer++ = bswap16(*p);
+		*pointer++ = bswap32(*p);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
-empb_bssr2_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value,
+empb_bssr4_swap(bus_space_handle_t handle, bus_size_t offset, unsigned value,
     bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile uint16_t *) ((empb_sc->pci_mem_win_t->base) +
+	p = (volatile uint32_t *) ((empb_sc->pci_mem_win_t->base) +
 	    (handle - wp));
  	while (count > 0) {
- 		*p = bswap16(value);
+ 		*p = bswap32(value);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
-empb_bswr2(bus_space_handle_t handle, bus_size_t offset,
+empb_bswr4(bus_space_handle_t handle, bus_size_t offset,
-    const u_int16_t *pointer, bus_size_t count)
+    const u_int32_t *pointer, bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
  	while (count > 0) {
 		*p = *pointer++;
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-void
+static void
-empb_bswr2_swap(bus_space_handle_t handle, bus_size_t offset,
+empb_bswr4_swap(bus_space_handle_t handle, bus_size_t offset,
-    const u_int16_t *pointer, bus_size_t count)
+    const u_int32_t *pointer, bus_size_t count)
+{
-	volatile uint16_t *p;
+	volatile uint32_t *p;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handle);
-	p = (volatile u_int16_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
+	p = (volatile uint32_t *)((empb_sc->pci_mem_win_t->base)+(handle - wp));
  	while (count > 0) {
-		*p = bswap16(*pointer++);
+		*p = bswap32(*pointer++);
 		amiga_bus_reorder_protect();
 		p++;
 		--count;
+	}
+}
-// XXX: this is broken, rewrite, XXX 2: should we swap here?
+/* XXX: this is broken, rewrite, XXX 2: should we swap here? */
 void
-empb_bscr2(bus_space_handle_t handlefrom, bus_size_t from,
+empb_bscr4(bus_space_handle_t handlefrom, bus_size_t from,
     bus_space_handle_t handleto, bus_size_t to, bus_size_t count)
+{
-	volatile uint16_t *p, *q;
+	volatile uint32_t *p, *q;
 	bus_addr_t wp;
 	wp = empb_switch_window(empb_sc, handlefrom);
-	p = (volatile uint16_t *)
+	p = (volatile uint32_t *)
 	    ( ((empb_sc->pci_mem_win_t->base)+(handlefrom - wp)) + from );
-	q = (volatile uint16_t *)
+	q = (volatile uint32_t *)
 	    ( ((empb_sc->pci_mem_win_t->base)+(handleto - wp)) + to );
 	while (count > 0) {
 		*q = *p;
 		amiga_bus_reorder_protect();
 		p++; q++;
 		--count;
+	}
 } */
 /* === end of implementation === */
 const struct amiga_bus_space_methods empb_bus_swap = {
 	.bsm =		empb_bsm,
 	.bsms =		empb_bsms,
 	.bsu =		empb_bsu,
  	.bsa =		NULL,
 	.bsf =		NULL,
 	/* 8-bit methods */
 	.bsr1 =		empb_bsr1,
 	.bsw1 =		empb_bsw1,
 @@ -816,33 +816,33 @@ const struct amiga_bus_space_methods emp
 	.bsr2 =		empb_bsr2_swap,
 	.bsw2 =		empb_bsw2_swap,
 	.bsrs2 =	empb_bsr2,
 	.bsws2 =	empb_bsw2,
 	.bsrm2 =	empb_bsrm2_swap,
 	.bswm2 =	empb_bswm2_swap,
 	.bsrms2 =	empb_bsrm2,
 	.bswms2 =	empb_bswm2,
 	.bsrr2 =	empb_bsrr2_swap,
 	.bswr2 =	empb_bswr2_swap,
 	.bsrrs2 =	empb_bsrr2,
 	.bswrs2 =	empb_bswr2,
 	.bssr2 =	empb_bssr2_swap,
-	.bscr2 =	empb_bscr2 /*
+	.bscr2 =	empb_bscr2, 	/* swap? */
-	//32-bit methods
+	/* 32-bit methods */
 	.bsr4 =		empb_bsr4_swap,
 	.bsw4 =		empb_bsw4_swap,
 	.bsrs4 =	empb_bsr4,
 	.bsws4 =	empb_bsw4,
 	.bsrm4 =	empb_bsrm4_swap,
 	.bswm4 =	empb_bswm4_swap,
 	.bsrms4 =	empb_bsrm4,
 	.bswms4 =	empb_bswm4,
 	.bsrr4 =	empb_bsrr4_swap,
 	.bswr4 =	empb_bswr4_swap,
 	.bsrrs4 =	empb_bsrr4,
 	.bswrs4 =	empb_bswr4,
 	.bssr4 = 	empb_bssr4_swap,
-	.bscr4 =	empb_bscr4_swap  */
+	.bscr4 =	empb_bscr4	/* swap? */
 };

 @@ -1,14 +1,14 @@
-/*	$NetBSD: empb.c,v 1.5 2012/06/04 12:56:48 rkujawa Exp $ */
+/*	$NetBSD: empb.c,v 1.6 2012/06/04 19:45:50 rkujawa Exp $ */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Radoslaw Kujawa.
+ *
  * 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.
 @@ -45,27 +45,27 @@
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <amiga/dev/zbusvar.h>
 #include <amiga/pci/empbreg.h>
 #include <amiga/pci/empbvar.h>
 #include <amiga/pci/emmemvar.h>
 #include <dev/pci/pciconf.h>
 #include "opt_pci.h"
-/* #define EMPB_DEBUG 1  */
+/* #define EMPB_DEBUG 1 */
 #define	PCI_CONF_LOCK(s)	(s) = splhigh()
 #define	PCI_CONF_UNLOCK(s)	splx((s))
 #define WINDOW_LOCK(s)		(s) = splhigh()
 #define WINDOW_UNLOCK(s)	splx((s))
 static int	empb_match(struct device *, struct cfdata *, void *);
 static void	empb_attach(struct device *, struct device *, void *);
 static void	empb_callback(device_t self);
 static void	empb_find_mem(struct empb_softc *sc);
 @@ -199,31 +199,26 @@ empb_callback(device_t self) {
 	sc->setup_area_t = &(sc->setup_area);
 	if (bus_space_map(sc->setup_area_t, 0, EMPB_SETUP_SIZE, 0,
 	    &sc->setup_area_h))
 		aprint_error_dev(self,
 		    "couldn't map Mediator setup space\n");
 	empb_find_mem(sc);
 	if (sc->pci_mem_win_size == 0)
 		aprint_error_dev(self,
 		    "couldn't find memory space, check your WINDOW jumper\n");
 	/* just a test */
 	empb_switch_window(sc, 0x80000000);
 	empb_switch_window(sc, 0x82F00000);
 	empb_switch_window(sc, 0x82000000);
 	/* Initialize the PCI chipset tag. */
 	sc->apc.pc_conf_v = (void*) pc;
 	sc->apc.pc_bus_maxdevs = empb_pci_bus_maxdevs;
 	sc->apc.pc_make_tag = amiga_pci_make_tag;
 	sc->apc.pc_decompose_tag = amiga_pci_decompose_tag;
 	sc->apc.pc_conf_read = empb_pci_conf_read;
 	sc->apc.pc_conf_write = empb_pci_conf_write;
 	sc->apc.pc_attach_hook = empb_pci_attach_hook;
 	sc->apc.pc_intr_map = empb_pci_intr_map;
 	sc->apc.pc_intr_string = amiga_pci_intr_string;
 	sc->apc.pc_intr_establish = amiga_pci_intr_establish;
 	sc->apc.pc_intr_disestablish = amiga_pci_intr_disestablish;