diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-29 22:55:11 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-11-29 22:55:11 +0000 |
| commit | bde17508b795638ded93ae6976d40b145b7078e6 (patch) | |
| tree | 68391b84ae17a5232bca6900696cbb9b92502ab9 /sys/dev/isa/isavar.h | |
| parent | fc7f8028698e121cef42396d8352c0357be86aa7 (diff) | |
Missing pieces of new bus.h that CVS lost behind my back
Diffstat (limited to 'sys/dev/isa/isavar.h')
| -rw-r--r-- | sys/dev/isa/isavar.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h index 1a79d7e9f84..2701736b4c9 100644 --- a/sys/dev/isa/isavar.h +++ b/sys/dev/isa/isavar.h @@ -1,5 +1,5 @@ -/* $OpenBSD: isavar.h,v 1.19 1996/11/23 21:46:43 kstailey Exp $ */ -/* $NetBSD: isavar.h,v 1.23 1996/05/08 23:32:31 thorpej Exp $ */ +/* $OpenBSD: isavar.h,v 1.20 1996/11/29 22:55:04 niklas Exp $ */ +/* $NetBSD: isavar.h,v 1.24 1996/10/21 22:41:11 thorpej Exp $ */ /* * Copyright (c) 1995 Chris G. Demetriou @@ -45,7 +45,7 @@ */ #include <sys/queue.h> -#include <machine/bus.old.h> +#include <machine/bus.h> /* * Structures and definitions needed by the machine-dependent header. @@ -75,8 +75,9 @@ ERROR: COMPILING FOR UNSUPPORTED MACHINE, OR MORE THAN ONE. * ISA bus attach arguments */ struct isabus_attach_args { - char *iba_busname; /* XXX should be common */ - bus_chipset_tag_t iba_bc; /* XXX should be common */ + char *iba_busname; /* XXX should be common */ + bus_space_tag_t iba_iot; /* isa i/o space tag */ + bus_space_tag_t iba_memt; /* isa mem space tag */ isa_chipset_tag_t iba_ic; }; @@ -84,7 +85,9 @@ struct isabus_attach_args { * ISA driver attach arguments */ struct isa_attach_args { - bus_chipset_tag_t ia_bc; + bus_space_tag_t ia_iot; /* isa i/o space tag */ + bus_space_tag_t ia_memt; /* isa mem space tag */ + isa_chipset_tag_t ia_ic; int ia_iobase; /* base i/o address */ @@ -95,7 +98,7 @@ struct isa_attach_args { u_int ia_msize; /* size of i/o memory */ void *ia_aux; /* driver specific */ - bus_io_handle_t ia_delayioh; /* i/o handle for `delay port' */ + bus_space_handle_t ia_delaybah; /* i/o handle for `delay port' */ /* XXX need fixes, some are duplicated */ /* begin isapnp section */ @@ -139,16 +142,18 @@ struct isa_softc { TAILQ_HEAD(, isadev) sc_subdevs; /* list of all children */ - bus_chipset_tag_t sc_bc; + bus_space_tag_t sc_iot; /* isa io space tag */ + bus_space_tag_t sc_memt; /* isa mem space tag */ + isa_chipset_tag_t sc_ic; /* * This i/o handle is used to map port 0x84, which is - * read to provide a 1.25us delay. This i/o handle + * read to provide a 1.25us delay. This access handle * is mapped in isaattach(), and exported to drivers * via isa_attach_args. */ - bus_io_handle_t sc_delayioh; + bus_space_handle_t sc_delaybah; /* * This points to the isapnp_softc structure that holds |