diff options
| -rw-r--r-- | sys/arch/sparc64/include/bus.h | 18 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/machdep.c | 23 |
2 files changed, 2 insertions, 39 deletions
diff --git a/sys/arch/sparc64/include/bus.h b/sys/arch/sparc64/include/bus.h index 38ab7a81f64..0d8a8bd3e29 100644 --- a/sys/arch/sparc64/include/bus.h +++ b/sys/arch/sparc64/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.18 2006/01/06 18:53:05 millert Exp $ */ +/* $OpenBSD: bus.h,v 1.19 2006/06/07 19:13:07 miod Exp $ */ /* $NetBSD: bus.h,v 1.31 2001/09/21 15:30:41 wiz Exp $ */ /*- @@ -352,22 +352,6 @@ bus_space_barrier(t, h, o, s, f) #define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ -/* - * Device space probe assistant. - * The optional callback function's arguments are: - * the temporary virtual address - * the passed `arg' argument - */ -int bus_space_probe( - bus_space_tag_t, - bus_addr_t, - bus_size_t, /* probe size */ - size_t, /* offset */ - int, /* flags */ - int (*)(void *, void *), /* callback function */ - void *); /* callback arg */ - - #define BUS_SPACE_ALIGNED_POINTER(p, t) ALIGNED_POINTER(p, t) /* diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c index 79efe3d3a7d..9b665ad871b 100644 --- a/sys/arch/sparc64/sparc64/machdep.c +++ b/sys/arch/sparc64/sparc64/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.81 2006/03/15 21:03:39 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.82 2006/06/07 19:13:08 miod Exp $ */ /* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */ /*- @@ -1860,27 +1860,6 @@ sparc_bus_mmap(bus_space_tag_t t, bus_space_tag_t t0, bus_addr_t paddr, return ((paddr + off) | PMAP_NC); } -/* - * Establish a temporary bus mapping for device probing. */ -int -bus_space_probe(bus_space_tag_t tag, bus_addr_t paddr, bus_size_t size, - size_t offset, int flags, int (*callback)(void *, void *), void *arg) -{ - bus_space_handle_t bh; - paddr_t tmp; - int result; - - if (bus_space_map(tag, paddr, size, flags, &bh) != 0) - return (0); - - tmp = bh.bh_ptr; - result = (probeget(tmp + offset, tag->asi, size) != -1); - if (result && callback != NULL) - result = (*callback)((char *)(u_long)tmp, arg); - bus_space_unmap(tag, bh, size); - return (result); -} - void * bus_intr_allocate(bus_space_tag_t t, int (*handler)(void *), void *arg, int number, int pil, |