 @@ -1,14 +1,14 @@
-/*	$NetBSD: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $ */
+/*	$NetBSD: dino.c,v 1.6.4.1 2009/09/29 22:56:48 snj Exp $ */
 /*	$OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $	*/
 /*
  * Copyright (c) 2003 Michael Shalayeff
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * 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: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6.4.1 2009/09/29 22:56:48 snj Exp $");
 /* #include "cardbus.h" */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/reboot.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <machine/iomod.h>
 #include <machine/autoconf.h>
 #include <machine/intr.h>
 @@ -150,26 +150,28 @@ void dino_intr_disestablish(void *, void
 void *dino_alloc_parent(struct device *, struct pci_attach_args *, int);
 int dino_iomap(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 int dino_memmap(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 int dino_subregion(void *, bus_space_handle_t, bus_size_t, bus_size_t,
     bus_space_handle_t *);
 int dino_ioalloc(void *, bus_addr_t, bus_addr_t, bus_size_t,
     bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *);
 int dino_memalloc(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t,
     bus_size_t, int, bus_addr_t *, bus_space_handle_t *);
 void dino_unmap(void *, bus_space_handle_t, bus_size_t);
 void dino_free(void *, bus_space_handle_t, bus_size_t);
 void dino_barrier(void *, bus_space_handle_t, bus_size_t, bus_size_t, int);
 void *dino_vaddr(void *, bus_space_handle_t);
 paddr_t dino_mmap(void *, bus_addr_t, off_t, int, int);
 u_int8_t dino_r1(void *, bus_space_handle_t, bus_size_t);
 u_int16_t dino_r2(void *, bus_space_handle_t, bus_size_t);
 u_int32_t dino_r4(void *, bus_space_handle_t, bus_size_t);
 u_int64_t dino_r8(void *, bus_space_handle_t, bus_size_t);
 void dino_w1(void *, bus_space_handle_t, bus_size_t, u_int8_t);
 void dino_w2(void *, bus_space_handle_t, bus_size_t, u_int16_t);
 void dino_w4(void *, bus_space_handle_t, bus_size_t, u_int32_t);
 void dino_w8(void *, bus_space_handle_t, bus_size_t, u_int64_t);
 void dino_rm_1(void *, bus_space_handle_t, bus_size_t, u_int8_t *, bus_size_t);
 void dino_rm_2(void *, bus_space_handle_t, bus_size_t, u_int16_t *, bus_size_t);
 void dino_rm_4(void *, bus_space_handle_t, bus_size_t, u_int32_t *, bus_size_t);
 void dino_rm_8(void *, bus_space_handle_t, bus_size_t, u_int64_t *, bus_size_t);
 void dino_wm_1(void *, bus_space_handle_t, bus_size_t, const u_int8_t *,
 @@ -558,26 +560,32 @@ void
 dino_barrier(void *v, bus_space_handle_t h, bus_size_t o, bus_size_t l, int op)
+{
 	sync_caches();
+}
 void*
 dino_vaddr(void *v, bus_space_handle_t h)
+{
 	struct dino_softc *sc = v;
 	return bus_space_vaddr(sc->sc_bt, h);
+}
 paddr_t
 dino_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
 	return -1;
+}
 u_int8_t
 dino_r1(void *v, bus_space_handle_t h, bus_size_t o)
+{
 	h += o;
 	if (h & 0xf0000000)
 		return *(volatile u_int8_t *)h;
 	else {
 		struct dino_softc *sc = v;
 		volatile struct dino_regs *r = sc->sc_regs;
 		r->pci_addr = h & ~3;
 		return *((volatile u_int8_t *)&r->pci_io_data + (h & 3));
+	}
 @@ -1389,27 +1397,27 @@ dino_cp_8(void *v, bus_space_handle_t h1
+{
 	while (c--) {
 		dino_w8(v, h1, o1, dino_r8(v, h2, o2));
 		o1 += 8;
 		o2 += 8;
+	}
+}
 const struct hppa_bus_space_tag dino_iomemt = {
 	NULL,
 	NULL, dino_unmap, dino_subregion, NULL, dino_free,
-	dino_barrier, dino_vaddr,
+	dino_barrier, dino_vaddr, dino_mmap,
 	dino_r1,    dino_r2,    dino_r4,    dino_r8,
 	dino_w1,    dino_w2,    dino_w4,    dino_w8,
 	dino_rm_1,  dino_rm_2,  dino_rm_4,  dino_rm_8,
 	dino_wm_1,  dino_wm_2,  dino_wm_4,  dino_wm_8,
 	dino_sm_1,  dino_sm_2,  dino_sm_4,  dino_sm_8,
 	            dino_rrm_2, dino_rrm_4, dino_rrm_8,
 	            dino_wrm_2, dino_wrm_4, dino_wrm_8,
 	dino_rr_1,  dino_rr_2,  dino_rr_4,  dino_rr_8,
 	dino_wr_1,  dino_wr_2,  dino_wr_4,  dino_wr_8,
 	            dino_rrr_2, dino_rrr_4, dino_rrr_8,
 	            dino_wrr_2, dino_wrr_4, dino_wrr_8,
 	dino_sr_1,  dino_sr_2,  dino_sr_4,  dino_sr_8,
 	dino_cp_1,  dino_cp_2,  dino_cp_4,  dino_cp_8

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mainbus.c,v 1.45 2008/06/13 09:41:44 cegger Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.45.6.1 2009/09/29 22:56:48 snj 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.
 @@ -53,27 +53,27 @@
  * 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.45 2008/06/13 09:41:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.45.6.1 2009/09/29 22:56:48 snj Exp $");
 #include "locators.h"
 #include "opt_power_switch.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>
 @@ -146,26 +146,27 @@ void mbus_cp_1(void *, bus_space_handle_
 void mbus_cp_2(void *, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 void mbus_cp_4(void *, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 void mbus_cp_8(void *, bus_space_handle_t, bus_size_t, bus_space_handle_t, bus_size_t, bus_size_t);
 int mbus_add_mapping(bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 int mbus_remove_mapping(bus_space_handle_t, bus_size_t, bus_addr_t *);
 int mbus_map(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 void mbus_unmap(void *, bus_space_handle_t, bus_size_t);
 int mbus_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t, bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *);
 void mbus_free(void *, bus_space_handle_t, bus_size_t);
 int mbus_subregion(void *, bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *);
 void mbus_barrier(void *, bus_space_handle_t, bus_size_t, bus_size_t, int);
 void *mbus_vaddr(void *, bus_space_handle_t);
 paddr_t mbus_mmap(void *, bus_addr_t, off_t, int, int);
 int mbus_dmamap_create(void *, bus_size_t, int, bus_size_t, bus_size_t, int, bus_dmamap_t *);
 void mbus_dmamap_destroy(void *, bus_dmamap_t);
 int mbus_dmamap_load(void *, bus_dmamap_t, void *, bus_size_t, struct proc *, int);
 int mbus_dmamap_load_mbuf(void *, bus_dmamap_t, struct mbuf *, int);
 int mbus_dmamap_load_uio(void *, bus_dmamap_t, struct uio *, int);
 int mbus_dmamap_load_raw(void *, bus_dmamap_t, bus_dma_segment_t *, int, bus_size_t, int);
 void mbus_dmamap_unload(void *, bus_dmamap_t);
 void mbus_dmamap_sync(void *, bus_dmamap_t, bus_addr_t, bus_size_t, int);
 int mbus_dmamem_alloc(void *, bus_size_t, bus_size_t, bus_size_t, bus_dma_segment_t *, int, int *, int);
 void mbus_dmamem_free(void *, bus_dma_segment_t *, int);
 int mbus_dmamem_map(void *, bus_dma_segment_t *, int, size_t, void **, int);
 void mbus_dmamem_unmap(void *, void *, size_t);
 @@ -446,26 +447,33 @@ mbus_barrier(void *v, bus_space_handle_t
 	sync_caches();
+}
 void*
 mbus_vaddr(void *v, bus_space_handle_t h)
+{
 	/*
 	 * We must only be called with addresses in I/O space.
 	 */
 	KASSERT(h >= HPPA_IOSPACE);
 	return (void*)h;
+}
 paddr_t
 mbus_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
 	return -1;
+}
 u_int8_t
 mbus_r1(void *v, bus_space_handle_t h, bus_size_t o)
+{
 	return *((volatile u_int8_t *)(h + o));
+}
 u_int16_t
 mbus_r2(void *v, bus_space_handle_t h, bus_size_t o)
+{
 	return *((volatile u_int16_t *)(h + o));
+}
 u_int32_t
 @@ -800,27 +808,27 @@ mbus_cp_8(void *v, bus_space_handle_t h1
 	h1 += o1;
 	h2 += o2;
 	p1 = (void *)h1;
 	p2 = (void *)h2;
 	while (c--)
 		*p1++ = *p2++;
+}
 const struct hppa_bus_space_tag hppa_bustag = {
 	NULL,
 	mbus_map, mbus_unmap, mbus_subregion, mbus_alloc, mbus_free,
-	mbus_barrier, mbus_vaddr,
+	mbus_barrier, mbus_vaddr, mbus_mmap,
 	mbus_r1,    mbus_r2,   mbus_r4,   mbus_r8,
 	mbus_w1,    mbus_w2,   mbus_w4,   mbus_w8,
 	mbus_rm_1,  mbus_rm_2, mbus_rm_4, mbus_rm_8,
 	mbus_wm_1,  mbus_wm_2, mbus_wm_4, mbus_wm_8,
 	mbus_sm_1,  mbus_sm_2, mbus_sm_4, mbus_sm_8,
 	/* *_stream_* are the same as non-stream for native busses */
 		    mbus_rm_2, mbus_rm_4, mbus_rm_8,
 		    mbus_wm_2, mbus_wm_4, mbus_wm_8,
 	mbus_rr_1,  mbus_rr_2, mbus_rr_4, mbus_rr_8,
 	mbus_wr_1,  mbus_wr_2, mbus_wr_4, mbus_wr_8,
 	/* *_stream_* are the same as non-stream for native busses */
 		    mbus_rr_2, mbus_rr_4, mbus_rr_8,
 		    mbus_wr_2, mbus_wr_4, mbus_wr_8,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.h,v 1.12 2007/03/04 05:59:51 christos Exp $	*/
+/*	$NetBSD: bus.h,v 1.12.54.1 2009/09/29 22:56:48 snj Exp $	*/
 /*	$OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $	*/
 /*
  * Copyright (c) 1998,1999 Michael Shalayeff
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -54,26 +54,27 @@ struct hppa_bus_space_tag {
 	void (*hbt_unmap)(void *v, bus_space_handle_t bsh,
 			       bus_size_t size);
 	int  (*hbt_subregion)(void *v, bus_space_handle_t bsh,
 				   bus_size_t offset, bus_size_t size,
 				   bus_space_handle_t *nbshp);
 	int  (*hbt_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);
 	void (*hbt_free)(void *, bus_space_handle_t, bus_size_t);
 	void (*hbt_barrier)(void *v, bus_space_handle_t h,
 				 bus_size_t o, bus_size_t l, int op);
 	void *(*hbt_vaddr)(void *, bus_space_handle_t);
 	paddr_t (*hbt_mmap)(void *, bus_addr_t, off_t, int, int);
 	u_int8_t  (*hbt_r1)(void *, bus_space_handle_t, bus_size_t);
 	u_int16_t (*hbt_r2)(void *, bus_space_handle_t, bus_size_t);
 	u_int32_t (*hbt_r4)(void *, bus_space_handle_t, bus_size_t);
 	u_int64_t (*hbt_r8)(void *, bus_space_handle_t, bus_size_t);
 	void (*hbt_w1)(void *, bus_space_handle_t, bus_size_t, u_int8_t);
 	void (*hbt_w2)(void *, bus_space_handle_t, bus_size_t, u_int16_t);
 	void (*hbt_w4)(void *, bus_space_handle_t, bus_size_t, u_int32_t);
 	void (*hbt_w8)(void *, bus_space_handle_t, bus_size_t, u_int64_t);
 	void (*hbt_rm_1)(void *v, bus_space_handle_t h,
 			      bus_size_t o, u_int8_t *a, bus_size_t c);
 @@ -188,26 +189,28 @@ extern const struct hppa_bus_space_tag h
 	(((t)->hbt_map)((t)->hbt_cookie,(a),(c),(ca),(hp)))
 #define	bus_space_unmap(t,h,c) \
 	(((t)->hbt_unmap)((t)->hbt_cookie,(h),(c)))
 #define	bus_space_subregion(t,h,o,c,hp) \
 	(((t)->hbt_subregion)((t)->hbt_cookie,(h),(o),(c),(hp)))
 #define	bus_space_alloc(t,b,e,c,al,bn,ca,ap,hp) \
 	(((t)->hbt_alloc)((t)->hbt_cookie,(b),(e),(c),(al),(bn),(ca),(ap),(hp)))
 #define	bus_space_free(t,h,c) \
 	(((t)->hbt_free)((t)->hbt_cookie,(h),(c)))
 #define	bus_space_barrier(t,h,o,l,op) \
 	((t)->hbt_barrier((t)->hbt_cookie, (h), (o), (l), (op)))
 #define	bus_space_vaddr(t,h) \
 	(((t)->hbt_vaddr)((t)->hbt_cookie,(h)))
 #define bus_space_mmap(t, a, o, p, f) \
 	(*(t)->hbt_mmap)((t)->hbt_cookie, (a), (o), (p), (f))
 #define	bus_space_read_1(t,h,o) (((t)->hbt_r1)((t)->hbt_cookie,(h),(o)))
 #define	bus_space_read_2(t,h,o) (((t)->hbt_r2)((t)->hbt_cookie,(h),(o)))
 #define	bus_space_read_4(t,h,o) (((t)->hbt_r4)((t)->hbt_cookie,(h),(o)))
 #define	bus_space_read_8(t,h,o) (((t)->hbt_r8)((t)->hbt_cookie,(h),(o)))
 #define	bus_space_write_1(t,h,o,v) (((t)->hbt_w1)((t)->hbt_cookie,(h),(o),(v)))
 #define	bus_space_write_2(t,h,o,v) (((t)->hbt_w2)((t)->hbt_cookie,(h),(o),(v)))
 #define	bus_space_write_4(t,h,o,v) (((t)->hbt_w4)((t)->hbt_cookie,(h),(o),(v)))
 #define	bus_space_write_8(t,h,o,v) (((t)->hbt_w8)((t)->hbt_cookie,(h),(o),(v)))
 /* XXX fredette */
 #define	__BUS_SPACE_HAS_STREAM_METHODS