diff options
| author | Peter Wemm <peter@FreeBSD.org> | 1999-04-16 21:22:55 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 1999-04-16 21:22:55 +0000 |
| commit | 6182fdbda82d66e069d86382987606cbba1972b1 (patch) | |
| tree | 8b86f578632961e1cd2aed57a2be13d993257d35 /sys/sys/rman.h | |
| parent | 24c38be4da1f835f2125da7d5fa3632bc028131d (diff) | |
| download | src-6182fdbda82d66e069d86382987606cbba1972b1.tar.gz src-6182fdbda82d66e069d86382987606cbba1972b1.zip | |
Bring the 'new-bus' to the i386. This extensively changes the way the
i386 platform boots, it is no longer ISA-centric, and is fully dynamic.
Most old drivers compile and run without modification via 'compatability
shims' to enable a smoother transition. eisa, isapnp and pccard* are
not yet using the new resource manager. Once fully converted, all drivers
will be loadable, including PCI and ISA.
(Some other changes appear to have snuck in, including a port of Soren's
ATA driver to the Alpha. Soren, back this out if you need to.)
This is a checkpoint of work-in-progress, but is quite functional.
The bulk of the work was done over the last few years by Doug Rabson and
Garrett Wollman.
Approved by: core
Notes
Notes:
svn path=/head/; revision=45720
Diffstat (limited to 'sys/sys/rman.h')
| -rw-r--r-- | sys/sys/rman.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sys/sys/rman.h b/sys/sys/rman.h index 224d9edc692a..278e33cba9d2 100644 --- a/sys/sys/rman.h +++ b/sys/sys/rman.h @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: rman.h,v 1.1 1998/10/29 01:48:30 wollman Exp $ */ #ifndef _SYS_RMAN_H_ @@ -51,6 +51,8 @@ struct resource { u_long r_end; /* index of the last entry (inclusive) */ u_int r_flags; void *r_virtual; /* virtual address of this resource */ + bus_space_tag_t r_bustag; /* bus_space tag */ + bus_space_handle_t r_bushandle; /* bus_space handle */ struct device *r_dev; /* device which has allocated this resource */ struct rman *r_rm; /* resource manager from whence this came */ }; @@ -88,8 +90,15 @@ struct resource *rman_reserve_resource(struct rman *rm, u_long start, u_long end, u_long count, u_int flags, struct device *dev); +#define rman_get_start(r) ((r)->r_start) +#define rman_get_end(r) ((r)->r_end) +#define rman_get_flags(r) ((r)->r_flags) #define rman_set_virtual(r,v) ((r)->r_virtual = (v)) #define rman_get_virtual(r) ((r)->r_virtual) +#define rman_set_bustag(r,t) ((r)->r_bustag = (t)) +#define rman_get_bustag(r) ((r)->r_bustag) +#define rman_set_bushandle(r,h) ((r)->r_bushandle = (h)) +#define rman_get_bushandle(r) ((r)->r_bushandle) extern struct rman_head rman_head; #endif /* KERNEL */ |