 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.57 2009/12/02 13:45:13 skrll Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.58 2009/12/02 13:49:32 skrll Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -48,51 +48,63 @@
  * 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 AUTHOR OR HIS RELATIVES 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 MIND, 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.57 2009/12/02 13:45:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.58 2009/12/02 13:49:32 skrll Exp $");
 #include "locators.h"
 #include "power.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/extent.h>
 #include <sys/mbuf.h>
 #include <uvm/uvm_page.h>
 #include <uvm/uvm.h>
 #include <machine/pdc.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 #include <hp700/hp700/machdep.h>
 #include <hp700/hp700/intr.h>
 #include <hp700/dev/cpudevs.h>
 static struct pdc_hpa pdc_hpa PDC_ALIGNMENT;
 #ifdef MBUSDEBUG
 #define	DPRINTF(s)	do {	\
 	if (mbusdebug)		\
 		printf s;	\
 } while(0)
 int mbusdebug = 1;
 #else
 #define	DPRINTF(s)	/* */
 #endif
 struct mainbus_softc {
 	device_t sc_dv;
 	hppa_hpa_t sc_hpa;
 };
 int	mbmatch(device_t, cfdata_t, void *);
 void	mbattach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(mainbus, sizeof(struct mainbus_softc),
     mbmatch, mbattach, NULL, NULL);
 extern struct cfdriver mainbus_cd;
 @@ -168,26 +180,29 @@ int _bus_dmamap_load_buffer(bus_dma_tag_
     bus_size_t buflen, struct vmspace *vm, int flags, paddr_t *lastaddrp,
     int *segp, int first);
 int
 mbus_add_mapping(bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp)
+{
 	u_int frames;
 #ifdef USE_BTLB
 	vsize_t btlb_size;
 	int error;
 #endif /* USE_BTLB */
 	DPRINTF(("\n%s(%lx,%lx,%scachable,%p)\n", __func__,
 	    bpa, size, flags? "" : "non", bshp));
 	/*
 	 * We must be called with a page-aligned address in
 	 * I/O space, and with a multiple of the page size.
 	 */
 	KASSERT((bpa & PGOFSET) == 0);
 	KASSERT(bpa >= HPPA_IOSPACE);
 	KASSERT((size & PGOFSET) == 0);
 	/*
 	 * Assume that this will succeed.
 	 */
 	*bshp = bpa;
 @@ -320,29 +335,29 @@ mbus_map(void *v, bus_addr_t bpa, bus_si
 	/*
 	 * Allocate the region of I/O space.
 	 */
 	error = extent_alloc_region(hp700_io_extent, bpa, size, EX_NOWAIT);
 	if (error)
 		return (error);
 	/*
 	 * Map the region of I/O space.
 	 */
 	error = mbus_add_mapping(bpa, size, flags, bshp);
 	*bshp |= offset;
 	if (error) {
 		DPRINTF(("bus_space_map: pa 0x%lx, size 0x%lx failed\n",
 		    bpa, size));
 		if (extent_free(hp700_io_extent, bpa, size, EX_NOWAIT)) {
 			printf ("bus_space_map: pa 0x%lx, size 0x%lx\n",
 				bpa, size);
 			printf ("bus_space_map: can't free region\n");
+		}
+	}
 	return error;
+}
 void
 mbus_unmap(void *v, bus_space_handle_t bsh, bus_size_t size)
+{
 	bus_size_t offset;
 	bus_addr_t bpa;
 	int error;
 @@ -357,28 +372,28 @@ mbus_unmap(void *v, bus_space_handle_t b
 	/*
 	 * Unmap the region of I/O space.
 	 */
 	error = mbus_remove_mapping(bsh, size, &bpa);
 	if (error)
 		panic("mbus_unmap: can't unmap region (%d)", error);
 	/*
 	 * Free the region of I/O space.
 	 */
 	error = extent_free(hp700_io_extent, bpa, size, EX_NOWAIT);
 	if (error) {
-		printf("bus_space_unmap: ps 0x%lx, size 0x%lx\n",
+		DPRINTF(("bus_space_unmap: ps 0x%lx, size 0x%lx\n",
-		    bpa, size);
+		    bpa, size));
 		panic("bus_space_unmap: can't free region (%d)", error);
+	}
+}
 int
 mbus_alloc(void *v, 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)
+{
 	bus_addr_t bpa;
 	int error;
 	if (rstart < hp700_io_extent->ex_start ||
 @@ -395,29 +410,29 @@ mbus_alloc(void *v, bus_addr_t rstart, b
 	/*
 	 * Allocate the region of I/O space.
 	 */
 	error = extent_alloc_subregion1(hp700_io_extent, rstart, rend, size,
 	    align, 0, boundary, EX_NOWAIT, &bpa);
 	if (error)
 		return (error);
 	/*
 	 * Map the region of I/O space.
 	 */
 	error = mbus_add_mapping(bpa, size, flags, bshp);
 	if (error) {
 		DPRINTF(("bus_space_alloc: pa 0x%lx, size 0x%lx failed\n",
 		    bpa, size));
 		if (extent_free(hp700_io_extent, bpa, size, EX_NOWAIT)) {
 			printf("bus_space_alloc: pa 0x%lx, size 0x%lx\n",
 				bpa, size);
 			printf("bus_space_alloc: can't free region\n");
+		}
+	}
 	*addrp = bpa;
 	return error;
+}
 void
 mbus_free(void *v, bus_space_handle_t h, bus_size_t size)
+{
 	/* bus_space_unmap() does all that we need to do. */