 @@ -1,14 +1,14 @@
-/*	$NetBSD: obio.c,v 1.6 2008/04/28 20:23:26 martin Exp $	*/
+/*	$NetBSD: obio.c,v 1.7 2009/08/02 00:06:44 nonaka Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -20,27 +20,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: obio.c,v 1.6 2008/04/28 20:23:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio.c,v 1.7 2009/08/02 00:06:44 nonaka Exp $");
 #include "btn_obio.h"
 #include "pwrsw_obio.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <sh3/devreg.h>
 #include <sh3/mmu.h>
 #include <sh3/pmap.h>
 @@ -233,26 +233,28 @@ obio_intr_disestablish(void *arg)
 	    (OBIO_IOMEM_PCMCIA_MEM|OBIO_IOMEM_PCMCIA_8BIT)
 #define	OBIO_IOMEM_PCMCIA_ATT8 \
 	    (OBIO_IOMEM_PCMCIA_ATT|OBIO_IOMEM_PCMCIA_8BIT)
 int obio_iomem_map(void *v, bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp);
 void obio_iomem_unmap(void *v, bus_space_handle_t bsh, bus_size_t size);
 int obio_iomem_subregion(void *v, bus_space_handle_t bsh,
     bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp);
 int obio_iomem_alloc(void *v, bus_addr_t rstart, bus_addr_t rend,
     bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
     bus_addr_t *bpap, bus_space_handle_t *bshp);
 void obio_iomem_free(void *v, bus_space_handle_t bsh, bus_size_t size);
 paddr_t obio_iomem_mmap(void *v, bus_addr_t addr, off_t off, int prot,
     int flags);
 static int obio_iomem_add_mapping(bus_addr_t, bus_size_t, int,
     bus_space_handle_t *);
 static int
 obio_iomem_add_mapping(bus_addr_t bpa, bus_size_t size, int type,
     bus_space_handle_t *bshp)
+{
 	u_long pa, endpa;
 	vaddr_t va;
 	pt_entry_t *pte;
 	unsigned int m = 0;
 	int io_type = type & ~OBIO_IOMEM_PCMCIA_8BIT;
 @@ -374,26 +376,33 @@ obio_iomem_alloc(void *v, bus_addr_t rst
 	*bshp = *bpap = rstart;
 	return (0);
+}
 void
 obio_iomem_free(void *v, bus_space_handle_t bsh, bus_size_t size)
+{
 	obio_iomem_unmap(v, bsh, size);
+}
 paddr_t
 obio_iomem_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
 	return (paddr_t)-1;
+}
 /*
  * on-board I/O bus space read/write
  */
 uint8_t obio_iomem_read_1(void *v, bus_space_handle_t bsh, bus_size_t offset);
 uint16_t obio_iomem_read_2(void *v, bus_space_handle_t bsh, bus_size_t offset);
 uint32_t obio_iomem_read_4(void *v, bus_space_handle_t bsh, bus_size_t offset);
 void obio_iomem_read_multi_1(void *v, bus_space_handle_t bsh,
     bus_size_t offset, uint8_t *addr, bus_size_t count);
 void obio_iomem_read_multi_2(void *v, bus_space_handle_t bsh,
     bus_size_t offset, uint16_t *addr, bus_size_t count);
 void obio_iomem_read_multi_4(void *v, bus_space_handle_t bsh,
     bus_size_t offset, uint32_t *addr, bus_size_t count);
 void obio_iomem_read_region_1(void *v, bus_space_handle_t bsh,
 @@ -440,26 +449,28 @@ void obio_iomem_copy_region_4(void *v, b
     bus_space_handle_t h2, bus_size_t o2, bus_size_t count);
 struct _bus_space obio_bus_io =
+{
 	.bs_cookie = (void *)OBIO_IOMEM_PCMCIA_IO,
 	.bs_map = obio_iomem_map,
 	.bs_unmap = obio_iomem_unmap,
 	.bs_subregion = obio_iomem_subregion,
 	.bs_alloc = obio_iomem_alloc,
 	.bs_free = obio_iomem_free,
 	.bs_mmap = obio_iomem_mmap,
 	.bs_r_1 = obio_iomem_read_1,
 	.bs_r_2 = obio_iomem_read_2,
 	.bs_r_4 = obio_iomem_read_4,
 	.bs_rm_1 = obio_iomem_read_multi_1,
 	.bs_rm_2 = obio_iomem_read_multi_2,
 	.bs_rm_4 = obio_iomem_read_multi_4,
 	.bs_rr_1 = obio_iomem_read_region_1,
 	.bs_rr_2 = obio_iomem_read_region_2,
 	.bs_rr_4 = obio_iomem_read_region_4,
 	.bs_w_1 = obio_iomem_write_1,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.h,v 1.4 2008/04/28 20:23:26 martin Exp $	*/
+/*	$NetBSD: bus.h,v 1.5 2009/08/02 00:06:44 nonaka Exp $	*/
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * 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
 @@ -120,26 +120,29 @@ struct _bus_space {
 	int		(*bs_subregion)(void *, bus_space_handle_t,
 			    bus_size_t, bus_size_t, bus_space_handle_t *);
 	/* allocation/deallocation */
 	int		(*bs_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		(*bs_free)(void *, bus_space_handle_t,
 			    bus_size_t);
 	/* get kernel virtual address */
 	void *		(*bs_vaddr)(void *, bus_space_handle_t);
 	/* mmap bus space for user */
 	paddr_t		(*bs_mmap)(void *, bus_addr_t, off_t, int, int);
 	/* read (single) */
 	uint8_t	(*bs_r_1)(void *, bus_space_handle_t,
 			    bus_size_t);
 	uint16_t	(*bs_r_2)(void *, bus_space_handle_t,
 			    bus_size_t);
 	uint32_t	(*bs_r_4)(void *, bus_space_handle_t,
 			    bus_size_t);
 	uint64_t	(*bs_r_8)(void *, bus_space_handle_t,
 			    bus_size_t);
 	/* read multiple */
 	void		(*bs_rm_1)(void *, bus_space_handle_t,
 			    bus_size_t, uint8_t *, bus_size_t);
 @@ -282,26 +285,32 @@ do {									\
 #define	bus_space_alloc(t, rs, re, s, a, b, f, ap, hp)			\
 	(*(t)->bs_alloc)((t)->bs_cookie, (rs), (re), (s), (a), (b),	\
 	    (f), (ap), (hp))
 #define	bus_space_free(t, h, s)						\
 	(*(t)->bs_free)((t)->bs_cookie, (h), (s))
 /*
  * Get kernel virtual address for ranges mapped BUS_SPACE_MAP_LINEAR.
  */
 #define bus_space_vaddr(t, h) \
 	(*(t)->bs_vaddr)((t)->bs_cookie, (h))
 /*
  * MMap bus space for a user application.
  */
 #define bus_space_mmap(t, a, o, p, f)					\
 	(*(t)->bs_mmap)((t)->bs_cookie, (a), (o), (p), (f))
 /*
  * Bus barrier operations.  The SH3 does not currently require
  * barriers, but we must provide the flags to MI code.
  */
 #define	bus_space_barrier(t, h, o, l, f)				\
 	((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f)))
 #define	BUS_SPACE_BARRIER_READ	0x01
 #define	BUS_SPACE_BARRIER_WRITE	0x02
 /*
  * Bus read (single) operations.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shpcic_machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $	*/
+/*	$NetBSD: shpcic_machdep.c,v 1.2 2009/08/02 00:06:44 nonaka Exp $	*/
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Machine-specific functions for PCI autoconfiguration.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shpcic_machdep.c,v 1.1 2006/09/01 21:26:18 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic_machdep.c,v 1.2 2009/08/02 00:06:44 nonaka Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/errno.h>
 #include <sys/extent.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
 @@ -179,26 +179,28 @@ landisk_pci_conf_hook(void *v, int bus,
  * shpcic bus space
  */
 struct _bus_space landisk_pci_bus_io =
+{
 	.bs_cookie = NULL,
 	.bs_map = shpcic_iomem_map,
 	.bs_unmap = shpcic_iomem_unmap,
 	.bs_subregion = shpcic_iomem_subregion,
 	.bs_alloc = shpcic_iomem_alloc,
 	.bs_free = shpcic_iomem_free,
 	.bs_mmap = shpcic_iomem_mmap,
 	.bs_r_1 = shpcic_io_read_1,
 	.bs_r_2 = shpcic_io_read_2,
 	.bs_r_4 = shpcic_io_read_4,
 	.bs_rm_1 = shpcic_io_read_multi_1,
 	.bs_rm_2 = shpcic_io_read_multi_2,
 	.bs_rm_4 = shpcic_io_read_multi_4,
 	.bs_rr_1 = shpcic_io_read_region_1,
 	.bs_rr_2 = shpcic_io_read_region_2,
 	.bs_rr_4 = shpcic_io_read_region_4,
 	.bs_w_1 = shpcic_io_write_1,
 @@ -227,26 +229,28 @@ struct _bus_space landisk_pci_bus_io =
 };
 struct _bus_space landisk_pci_bus_mem =
+{
 	.bs_cookie = NULL,
 	.bs_map = shpcic_iomem_map,
 	.bs_unmap = shpcic_iomem_unmap,
 	.bs_subregion = shpcic_iomem_subregion,
 	.bs_alloc = shpcic_iomem_alloc,
 	.bs_free = shpcic_iomem_free,
 	.bs_mmap = shpcic_iomem_mmap,
 	.bs_r_1 = shpcic_mem_read_1,
 	.bs_r_2 = shpcic_mem_read_2,
 	.bs_r_4 = shpcic_mem_read_4,
 	.bs_rm_1 = shpcic_mem_read_multi_1,
 	.bs_rm_2 = shpcic_mem_read_multi_2,
 	.bs_rm_4 = shpcic_mem_read_multi_4,
 	.bs_rr_1 = shpcic_mem_read_region_1,
 	.bs_rr_2 = shpcic_mem_read_region_2,
 	.bs_rr_4 = shpcic_mem_read_region_4,
 	.bs_w_1 = shpcic_mem_write_1,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shpcic.c,v 1.12 2008/03/27 02:05:43 uwe Exp $	*/
+/*	$NetBSD: shpcic.c,v 1.13 2009/08/02 00:06:44 nonaka Exp $	*/
 /*
  * Copyright (c) 2005 NONAKA Kimihiro
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -16,27 +16,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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: shpcic.c,v 1.12 2008/03/27 02:05:43 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic.c,v 1.13 2009/08/02 00:06:44 nonaka Exp $");
 #include "opt_pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pciconf.h>
 @@ -414,26 +414,33 @@ shpcic_iomem_alloc(void *v, bus_addr_t r
 	*bshp = *bpap = rstart;
 	return (0);
+}
 void
 shpcic_iomem_free(void *v, bus_space_handle_t bsh, bus_size_t size)
+{
 	/* Nothing to do */
+}
 paddr_t
 shpcic_iomem_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
 	return (paddr_t)-1;
+}
 /*
  * shpcic bus space io/mem read/write
  */
 /* read */
 static inline uint8_t __shpcic_io_read_1(bus_space_handle_t bsh,
     bus_size_t offset);
 static inline uint16_t __shpcic_io_read_2(bus_space_handle_t bsh,
     bus_size_t offset);
 static inline uint32_t __shpcic_io_read_4(bus_space_handle_t bsh,
     bus_size_t offset);
 static inline uint8_t __shpcic_mem_read_1(bus_space_handle_t bsh,
     bus_size_t offset);
 static inline uint16_t __shpcic_mem_read_2(bus_space_handle_t bsh,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shpcicvar.h,v 1.6 2005/12/11 12:18:58 christos Exp $	*/
+/*	$NetBSD: shpcicvar.h,v 1.7 2009/08/02 00:06:44 nonaka Exp $	*/
 /*-
  * Copyright (c) 2005 NONAKA Kimihiro
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -47,26 +47,28 @@ void shpcic_intr_disestablish(void *ih);
 /*
  * shpcic io/mem bus space
  */
 int shpcic_iomem_map(void *v, bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp);
 void shpcic_iomem_unmap(void *v, bus_space_handle_t bsh, bus_size_t size);
 int shpcic_iomem_subregion(void *v, bus_space_handle_t bsh, bus_size_t offset,
     bus_size_t size, bus_space_handle_t *nbshp);
 int shpcic_iomem_alloc(void *v, bus_addr_t rstart, bus_addr_t rend,
     bus_size_t size, bus_size_t alignment, bus_size_t boundary, int flags,
     bus_addr_t *bpap, bus_space_handle_t *bshp);
 void shpcic_iomem_free(void *v, bus_space_handle_t bsh, bus_size_t size);
 paddr_t shpcic_iomem_mmap(void *v, bus_addr_t addr, off_t off, int prot,
     int flags);
 /* read single */
 uint8_t shpcic_io_read_1(void *v, bus_space_handle_t bsh, bus_size_t offset);
 uint16_t shpcic_io_read_2(void *v, bus_space_handle_t bsh, bus_size_t offset);
 uint32_t shpcic_io_read_4(void *v, bus_space_handle_t bsh, bus_size_t offset);
 uint8_t shpcic_mem_read_1(void *v, bus_space_handle_t bsh, bus_size_t offset);
 uint16_t shpcic_mem_read_2(void *v, bus_space_handle_t bsh, bus_size_t offset);
 uint32_t shpcic_mem_read_4(void *v, bus_space_handle_t bsh, bus_size_t offset);
 /* read multi */
 void shpcic_io_read_multi_1(void *v, bus_space_handle_t bsh,
     bus_size_t offset, uint8_t *addr, bus_size_t count);
 void shpcic_io_read_multi_2(void *v, bus_space_handle_t bsh,