diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-21 21:22:18 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2009-07-21 21:22:18 +0000 |
| commit | 2019cfde39e1ce5163fae9ccdc7b78d4b49de3bd (patch) | |
| tree | d371c176b62bc0914cbb6101309212f6619cad3d /sys/dev | |
| parent | 5acaa50d26933a61038df518878fb211fd042aac (diff) | |
Make rbus_new_body() invocable from outside cardbus.c, to allow md code
to use it to allocate a ``every operation will fail'' rbus in case of
error.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cardbus/rbus.c | 9 | ||||
| -rw-r--r-- | sys/dev/cardbus/rbus.h | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sys/dev/cardbus/rbus.c b/sys/dev/cardbus/rbus.c index 2f27b01a237..5da5e0275db 100644 --- a/sys/dev/cardbus/rbus.c +++ b/sys/dev/cardbus/rbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus.c,v 1.12 2009/07/21 21:20:05 miod Exp $ */ +/* $OpenBSD: rbus.c,v 1.13 2009/07/21 21:22:17 miod Exp $ */ /* $NetBSD: rbus.c,v 1.3 1999/11/06 06:20:53 soren Exp $ */ /* * Copyright (c) 1999 @@ -55,9 +55,6 @@ #endif -STATIC rbus_tag_t rbus_new_body(bus_space_tag_t, rbus_tag_t, struct extent *, - bus_addr_t, bus_addr_t, bus_addr_t, int); - int rbus_space_alloc(rbus_tag_t rbt, bus_addr_t addr, bus_size_t size, bus_addr_t mask, bus_addr_t align, int flags, bus_addr_t *addrp, @@ -189,13 +186,13 @@ rbus_space_free(rbus_tag_t rbt, bus_space_handle_t bsh, bus_size_t size, } /* - * STATIC rbus_tag_t + * rbus_tag_t * rbus_new_body(bus_space_tag_t bt, rbus_tag_t parent, * struct extent *ex, bus_addr_t start, bus_size_t end, * bus_addr_t offset, int flags) * */ -STATIC rbus_tag_t +rbus_tag_t rbus_new_body(bus_space_tag_t bt, rbus_tag_t parent, struct extent *ex, bus_addr_t start, bus_addr_t end, bus_addr_t offset, int flags) { diff --git a/sys/dev/cardbus/rbus.h b/sys/dev/cardbus/rbus.h index 2446712ddc4..8ee4fb34299 100644 --- a/sys/dev/cardbus/rbus.h +++ b/sys/dev/cardbus/rbus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rbus.h,v 1.6 2006/06/21 11:27:03 fkr Exp $ */ +/* $OpenBSD: rbus.h,v 1.7 2009/07/21 21:22:17 miod Exp $ */ /* $NetBSD: rbus.h,v 1.3 1999/12/15 12:28:55 kleink Exp $ */ /* * Copyright (c) 1999 @@ -132,6 +132,10 @@ int rbus_space_free(rbus_tag_t, bus_space_handle_t, bus_size_t, * rbus_new is a constructor which make an rbus instance from a parent * rbus. */ + +rbus_tag_t rbus_new_body(bus_space_tag_t, rbus_tag_t, struct extent *, + bus_addr_t, bus_addr_t, bus_addr_t, int); + rbus_tag_t rbus_new(rbus_tag_t, bus_addr_t, bus_size_t, bus_addr_t, int); rbus_tag_t rbus_new_root_delegate(bus_space_tag_t, bus_addr_t, bus_size_t, |