 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus_space.c,v 1.20.4.1 2009/09/16 03:45:45 snj Exp $	*/
+/*	$NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and 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
 @@ -21,27 +21,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: bus_space.c,v 1.20.4.1 2009/09/16 03:45:45 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_space.c,v 1.20.4.2 2009/09/29 23:53:14 snj Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <dev/isa/isareg.h>
 #include <machine/bus.h>
 #include <machine/pio.h>
 #include <machine/isa_machdep.h>
 @@ -189,28 +189,28 @@ bus_space_map(bus_space_tag_t t, bus_add
 		return(0);
+	}
 #endif	/* !XEN */
 	/*
 	 * For memory space, map the bus physical address to
 	 * a kernel virtual address.
 	 */
 	error = x86_mem_add_mapping(bpa, size,
 		(flags & BUS_SPACE_MAP_CACHEABLE) != 0, bshp);
 	if (error) {
 		if (extent_free(ex, bpa, size, EX_NOWAIT |
 		    (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
-			printf("x86_memio_map: pa 0x%lx, size 0x%lx\n",
+			printf("x86_memio_map: pa 0x%jx, size 0x%jx\n",
-			    bpa, size);
+			    (uintmax_t)bpa, (uintmax_t)size);
 			printf("x86_memio_map: can't free region\n");
+		}
+	}
 	return (error);
+}
 int
 _x86_memio_map(bus_space_tag_t t, bus_addr_t bpa, bus_size_t size,
 		int flags, bus_space_handle_t *bshp)
+{
 	/*
 @@ -276,28 +276,28 @@ bus_space_alloc(bus_space_tag_t t, bus_a
 		*bshp = *bpap = bpa;
 		return (0);
+	}
 	/*
 	 * For memory space, map the bus physical address to
 	 * a kernel virtual address.
 	 */
 	error = x86_mem_add_mapping(bpa, size,
 	    (flags & BUS_SPACE_MAP_CACHEABLE) != 0, bshp);
 	if (error) {
 		if (extent_free(iomem_ex, bpa, size, EX_NOWAIT |
 		    (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
-			printf("x86_memio_alloc: pa 0x%lx, size 0x%lx\n",
+			printf("x86_memio_alloc: pa 0x%jx, size 0x%jx\n",
-			    bpa, size);
+			    (uintmax_t)bpa, (uintmax_t)size);
 			printf("x86_memio_alloc: can't free region\n");
+		}
+	}
 	*bpap = bpa;
 	return (error);
+}
 int
 x86_mem_add_mapping(bus_addr_t bpa, bus_size_t size,
 		int cacheable, bus_space_handle_t *bshp)
+{
 @@ -454,28 +454,29 @@ bus_space_unmap(bus_space_tag_t t, bus_s
 		pmap_kremove(va, endva - va);
 		pmap_update(pmap_kernel());
 		/*
 		 * Free the kernel virtual mapping.
 		 */
 		uvm_km_free(kernel_map, va, endva - va, UVM_KMF_VAONLY);
 	} else
 		panic("x86_memio_unmap: bad bus space tag");
 ok:
 	if (extent_free(ex, bpa, size,
 	    EX_NOWAIT | (ioport_malloc_safe ? EX_MALLOCOK : 0))) {
-		printf("x86_memio_unmap: %s 0x%lx, size 0x%lx\n",
+		printf("x86_memio_unmap: %s 0x%jx, size 0x%jx\n",
-		    (t == X86_BUS_SPACE_IO) ? "port" : "pa", bpa, size);
+		    (t == X86_BUS_SPACE_IO) ? "port" : "pa",
 		    (uintmax_t)bpa, (uintmax_t)size);
 		printf("x86_memio_unmap: can't free region\n");
+	}
+}
 void
 bus_space_free(bus_space_tag_t t, bus_space_handle_t bsh, bus_size_t size)
+{
 	/* bus_space_unmap() does all that we need to do. */
 	bus_space_unmap(t, bsh, size);
+}
 int
 @@ -500,121 +501,121 @@ bus_space_mmap(bus_space_tag_t t, bus_ad
 	 * "addr" is the base address of the device we're mapping.
 	 * "off" is the offset into that device.
+	 *
 	 * Note we are called for each "page" in the device that
 	 * the upper layers want to map.
 	 */
 	return (x86_btop(addr + off));
+}
 void
 bus_space_set_multi_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 		      uint8_t v, size_t c)
+{
-	bus_addr_t addr = h + o;
+	vaddr_t addr = h + o;
 	if (t == X86_BUS_SPACE_IO)
 		while (c--)
 			outb(addr, v);
 	else
 		while (c--)
 			*(volatile uint8_t *)(addr) = v;
+}
 void
 bus_space_set_multi_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 		      uint16_t v, size_t c)
+{
-	bus_addr_t addr = h + o;
+	vaddr_t addr = h + o;
 	BUS_SPACE_ADDRESS_SANITY(addr, uint16_t, "bus addr");
 	if (t == X86_BUS_SPACE_IO)
 		while (c--)
 			outw(addr, v);
 	else
 		while (c--)
 			*(volatile uint16_t *)(addr) = v;
+}
 void
 bus_space_set_multi_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 		      uint32_t v, size_t c)
+{
-	bus_addr_t addr = h + o;
+	vaddr_t addr = h + o;
 	BUS_SPACE_ADDRESS_SANITY(addr, uint32_t, "bus addr");
 	if (t == X86_BUS_SPACE_IO)
 		while (c--)
 			outl(addr, v);
 	else
 		while (c--)
 			*(volatile uint32_t *)(addr) = v;
+}
 void
 bus_space_set_region_1(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 		      uint8_t v, size_t c)
+{
-	bus_addr_t addr = h + o;
+	vaddr_t addr = h + o;
 	if (t == X86_BUS_SPACE_IO)
 		for (; c != 0; c--, addr++)
 			outb(addr, v);
 	else
 		for (; c != 0; c--, addr++)
 			*(volatile uint8_t *)(addr) = v;
+}
 void
 bus_space_set_region_2(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 		       uint16_t v, size_t c)
+{
-	bus_addr_t addr = h + o;
+	vaddr_t addr = h + o;
 	BUS_SPACE_ADDRESS_SANITY(addr, uint16_t, "bus addr");
 	if (t == X86_BUS_SPACE_IO)
 		for (; c != 0; c--, addr += 2)
 			outw(addr, v);
 	else
 		for (; c != 0; c--, addr += 2)
 			*(volatile uint16_t *)(addr) = v;
+}
 void
 bus_space_set_region_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o,
 		       uint32_t v, size_t c)
+{
-	bus_addr_t addr = h + o;
+	vaddr_t addr = h + o;
 	BUS_SPACE_ADDRESS_SANITY(addr, uint32_t, "bus addr");
 	if (t == X86_BUS_SPACE_IO)
 		for (; c != 0; c--, addr += 4)
 			outl(addr, v);
 	else
 		for (; c != 0; c--, addr += 4)
 			*(volatile uint32_t *)(addr) = v;
+}
 void
 bus_space_copy_region_1(bus_space_tag_t t, bus_space_handle_t h1,
 			bus_size_t o1, bus_space_handle_t h2,
 			bus_size_t o2, size_t c)
+{
-	bus_addr_t addr1 = h1 + o1;
+	vaddr_t addr1 = h1 + o1;
-	bus_addr_t addr2 = h2 + o2;
+	vaddr_t addr2 = h2 + o2;
 	if (t == X86_BUS_SPACE_IO) {
 		if (addr1 >= addr2) {
 			/* src after dest: copy forward */
 			for (; c != 0; c--, addr1++, addr2++)
 				outb(addr2, inb(addr1));
 		} else {
 			/* dest after src: copy backwards */
 			for (addr1 += (c - 1), addr2 += (c - 1);
 			    c != 0; c--, addr1--, addr2--)
 				outb(addr2, inb(addr1));
+		}
 	} else {
 @@ -628,28 +629,28 @@ bus_space_copy_region_1(bus_space_tag_t
 			for (addr1 += (c - 1), addr2 += (c - 1);
 			    c != 0; c--, addr1--, addr2--)
 				*(volatile uint8_t *)(addr2) =
 				    *(volatile uint8_t *)(addr1);
+		}
+	}
+}
 void
 bus_space_copy_region_2(bus_space_tag_t t, bus_space_handle_t h1,
 			bus_size_t o1, bus_space_handle_t h2,
 			bus_size_t o2, size_t c)
+{
-	bus_addr_t addr1 = h1 + o1;
+	vaddr_t addr1 = h1 + o1;
-	bus_addr_t addr2 = h2 + o2;
+	vaddr_t addr2 = h2 + o2;
 	BUS_SPACE_ADDRESS_SANITY(addr1, uint16_t, "bus addr 1");
 	BUS_SPACE_ADDRESS_SANITY(addr2, uint16_t, "bus addr 2");
 	if (t == X86_BUS_SPACE_IO) {
 		if (addr1 >= addr2) {
 			/* src after dest: copy forward */
 			for (; c != 0; c--, addr1 += 2, addr2 += 2)
 				outw(addr2, inw(addr1));
 		} else {
 			/* dest after src: copy backwards */
 			for (addr1 += 2 * (c - 1), addr2 += 2 * (c - 1);
 			    c != 0; c--, addr1 -= 2, addr2 -= 2)
 @@ -666,28 +667,28 @@ bus_space_copy_region_2(bus_space_tag_t
 			for (addr1 += 2 * (c - 1), addr2 += 2 * (c - 1);
 			    c != 0; c--, addr1 -= 2, addr2 -= 2)
 				*(volatile uint16_t *)(addr2) =
 				    *(volatile uint16_t *)(addr1);
+		}
+	}
+}
 void
 bus_space_copy_region_4(bus_space_tag_t t, bus_space_handle_t h1,
 			bus_size_t o1, bus_space_handle_t h2,
 			bus_size_t o2, size_t c)
+{
-	bus_addr_t addr1 = h1 + o1;
+	vaddr_t addr1 = h1 + o1;
-	bus_addr_t addr2 = h2 + o2;
+	vaddr_t addr2 = h2 + o2;
 	BUS_SPACE_ADDRESS_SANITY(addr1, uint32_t, "bus addr 1");
 	BUS_SPACE_ADDRESS_SANITY(addr2, uint32_t, "bus addr 2");
 	if (t == X86_BUS_SPACE_IO) {
 		if (addr1 >= addr2) {
 			/* src after dest: copy forward */
 			for (; c != 0; c--, addr1 += 4, addr2 += 4)
 				outl(addr2, inl(addr1));
 		} else {
 			/* dest after src: copy backwards */
 			for (addr1 += 4 * (c - 1), addr2 += 4 * (c - 1);
 			    c != 0; c--, addr1 -= 4, addr2 -= 4)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bus.h,v 1.16 2008/04/28 20:23:40 martin Exp $	*/
+/*	$NetBSD: bus.h,v 1.16.10.1 2009/09/29 23:53:14 snj Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 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
 @@ -67,31 +67,31 @@
 #include <x86/busdefs.h>
 #ifdef BUS_SPACE_DEBUG
 #define	BUS_SPACE_ALIGNED_ADDRESS(p, t)				\
 	((((u_long)(p)) & (sizeof(t)-1)) == 0)
 #define BUS_SPACE_ALIGNED_POINTER(p, t) BUS_SPACE_ALIGNED_ADDRESS(p, t)
 #else
 #define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t)
 #endif /* BUS_SPACE_DEBUG */
 /*
  * Bus address and size types
  */
-typedef u_long bus_addr_t;
+typedef paddr_t bus_addr_t;
-typedef u_long bus_size_t;
+typedef paddr_t bus_size_t;
 typedef	int bus_space_tag_t;
-typedef	u_long bus_space_handle_t;
+typedef	vaddr_t bus_space_handle_t;
 int	_x86_memio_map(bus_space_tag_t t, bus_addr_t addr,
 	    bus_size_t size, int flags, bus_space_handle_t *bshp);
 void	_x86_memio_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
 	    bus_size_t size, bus_addr_t *);
 typedef struct x86_bus_dma_tag		*bus_dma_tag_t;
 typedef struct x86_bus_dmamap		*bus_dmamap_t;
 #define BUS_DMA_TAG_VALID(t)    ((t) != (bus_dma_tag_t)0)
 /*
  *	bus_dma_segment_t

 @@ -1,14 +1,14 @@
-/*	$NetBSD: isa_machdep.h,v 1.6 2008/06/27 11:03:13 cegger Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.6.6.1 2009/09/29 23:53:14 snj Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 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
 @@ -192,34 +192,34 @@ extern struct x86_bus_dma_tag isa_bus_dm
  * stuff that used to be in pccons.c
  */
 #define	MONO_BASE	0x3B4
 #define	MONO_BUF	0xB0000
 #define	CGA_BASE	0x3D4
 #define	CGA_BUF		0xB8000
 /*
  * Variables and macros to deal with the ISA I/O hole.
  * XXX These should be converted to machine- and bus-mapping-independent
  * function definitions, invoked through the softc.
  */
-extern u_long atdevbase;           /* kernel virtual address of "hole" */
+extern vaddr_t atdevbase;         /* kernel virtual address of "hole" */
 /*
  * Given a kernel virtual address for some location
  * in the "hole" I/O space, return a physical address.
  */
-#define ISA_PHYSADDR(v) ((void *) ((u_long)(v) - atdevbase + IOM_BEGIN))
+#define ISA_PHYSADDR(v) ((bus_addr_t)(v) - atdevbase + IOM_BEGIN)
 /*
  * Given a physical address in the "hole",
  * return a kernel virtual address.
  */
-#define ISA_HOLE_VADDR(p)  ((void *) ((u_long)(p) - IOM_BEGIN + atdevbase))
+#define ISA_HOLE_VADDR(p)  ((void *) ((vaddr_t)(p) - IOM_BEGIN + atdevbase))
 /*
  * Miscellanous functions.
  */
 void sysbeep(int, int);		/* beep with the system speaker */
 #endif /* _X86_ISA_MACHDEP_H_ XXX */