summaryrefslogtreecommitdiff
path: root/sys/arch/i386/include
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2004-05-04 17:06:34 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2004-05-04 17:06:34 +0000
commit9afc597bd18344fb24961cd3921d07c31710eda3 (patch)
treef325ee4f29e943a2e690962e16c9839b25145194 /sys/arch/i386/include
parent5f1fa125235e4cbb1e0d78240a58a1e299f4461d (diff)
Move _bus_space_unmap() to machdep.c so it can be used not
only by the rbus code. Also knf it and sync with bus_space_unmap(). ok millert@
Diffstat (limited to 'sys/arch/i386/include')
-rw-r--r--sys/arch/i386/include/bus.h5
-rw-r--r--sys/arch/i386/include/rbus_machdep.h5
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/i386/include/bus.h b/sys/arch/i386/include/bus.h
index f88ed6afd10..13c9544d312 100644
--- a/sys/arch/i386/include/bus.h
+++ b/sys/arch/i386/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.35 2003/04/17 03:42:14 drahn Exp $ */
+/* $OpenBSD: bus.h,v 1.36 2004/05/04 17:06:33 grange Exp $ */
/* $NetBSD: bus.h,v 1.6 1996/11/10 03:19:25 thorpej Exp $ */
/*-
@@ -100,6 +100,9 @@ int _bus_space_map(bus_space_tag_t t, bus_addr_t addr,
bus_size_t size, int cacheable, bus_space_handle_t *bshp);
void bus_space_unmap(bus_space_tag_t t, bus_space_handle_t bsh,
bus_size_t size);
+/* like bus_space_unmap(), but without extent map deallocation */
+void _bus_space_unmap(bus_space_tag_t, bus_space_handle_t,
+ bus_size_t, bus_addr_t *);
int bus_space_subregion(bus_space_tag_t t, bus_space_handle_t bsh,
bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp);
diff --git a/sys/arch/i386/include/rbus_machdep.h b/sys/arch/i386/include/rbus_machdep.h
index 70725e6f0e2..cc214020061 100644
--- a/sys/arch/i386/include/rbus_machdep.h
+++ b/sys/arch/i386/include/rbus_machdep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rbus_machdep.h,v 1.3 2002/07/23 17:53:24 drahn Exp $ */
+/* $OpenBSD: rbus_machdep.h,v 1.4 2004/05/04 17:06:33 grange Exp $ */
/* $NetBSD: rbus_machdep.h,v 1.2 1999/10/15 06:43:05 haya Exp $ */
/*
@@ -37,9 +37,6 @@
struct pci_attach_args; /* XXX */
-void _bus_space_unmap(bus_space_tag_t, bus_space_handle_t,
- bus_size_t, bus_addr_t *);
-
#define md_space_map(bt, physaddr, size, flags, bshp) \
_bus_space_map((bt), (physaddr), (size), (flags), (bshp))