diff options
author | dfr <dfr@FreeBSD.org> | 1999-05-08 21:59:43 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 1999-05-08 21:59:43 +0000 |
commit | e4989c23fe81c5060ef3a4e0e3bb1bb4430d1a76 (patch) | |
tree | ba748fea961d917292e2b4a959796c7415efbf31 /sys/isa | |
parent | d1098a6692d3c3b23bc870a491d680451c3356a7 (diff) | |
download | FreeBSD-src-e4989c23fe81c5060ef3a4e0e3bb1bb4430d1a76.zip FreeBSD-src-e4989c23fe81c5060ef3a4e0e3bb1bb4430d1a76.tar.gz |
Move the declaration of the interrupt type from the driver structure
to the BUS_SETUP_INTR call.
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/atkbd_isa.c | 7 | ||||
-rw-r--r-- | sys/isa/atkbdc_isa.c | 3 | ||||
-rw-r--r-- | sys/isa/bt_isa.c | 3 | ||||
-rw-r--r-- | sys/isa/fd.c | 8 | ||||
-rw-r--r-- | sys/isa/psm.c | 7 | ||||
-rw-r--r-- | sys/isa/sio.c | 8 | ||||
-rw-r--r-- | sys/isa/syscons_isa.c | 3 | ||||
-rw-r--r-- | sys/isa/vga_isa.c | 3 |
8 files changed, 17 insertions, 25 deletions
diff --git a/sys/isa/atkbd_isa.c b/sys/isa/atkbd_isa.c index 1d7ee62..8942681 100644 --- a/sys/isa/atkbd_isa.c +++ b/sys/isa/atkbd_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atkbd_isa.c,v 1.2 1999/03/10 10:36:49 yokota Exp $ + * $Id: atkbd_isa.c,v 1.3 1999/04/16 21:22:34 peter Exp $ */ #include "atkbd.h" @@ -64,7 +64,6 @@ static device_method_t atkbd_methods[] = { static driver_t atkbd_driver = { ATKBD_DRIVER_NAME, atkbd_methods, - DRIVER_TYPE_TTY, sizeof(atkbd_softc_t), }; @@ -111,8 +110,8 @@ atkbdattach(device_t dev) /* declare our interrupt handler */ res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, irq, irq, 1, RF_SHAREABLE | RF_ACTIVE); - BUS_SETUP_INTR(device_get_parent(dev), dev, res, atkbd_isa_intr, sc, - &ih); + BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY, + atkbd_isa_intr, sc, &ih); return 0; } diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c index 8e5a62b..5342c52 100644 --- a/sys/isa/atkbdc_isa.c +++ b/sys/isa/atkbdc_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: atkbdc_isa.c,v 1.2 1999/04/16 23:39:15 peter Exp $ + * $Id: atkbdc_isa.c,v 1.3 1999/05/08 20:25:38 peter Exp $ */ #include "atkbdc.h" @@ -82,7 +82,6 @@ static device_method_t atkbdc_methods[] = { static driver_t atkbdc_driver = { ATKBDC_DRIVER_NAME, atkbdc_methods, - DRIVER_TYPE_MISC, sizeof(atkbdc_softc_t *), }; diff --git a/sys/isa/bt_isa.c b/sys/isa/bt_isa.c index f2150a7..c9d52c3 100644 --- a/sys/isa/bt_isa.c +++ b/sys/isa/bt_isa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_isa.c,v 1.9 1999/04/18 19:08:28 peter Exp $ + * $Id: bt_isa.c,v 1.10 1999/04/24 06:48:27 peter Exp $ */ #include <sys/param.h> @@ -330,7 +330,6 @@ static device_method_t bt_isa_methods[] = { static driver_t bt_isa_driver = { "bt", bt_isa_methods, - DRIVER_TYPE_CAM, sizeof(struct bt_softc), }; diff --git a/sys/isa/fd.c b/sys/isa/fd.c index f0a082f..197975b 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,7 +47,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.140 1999/05/07 10:10:30 phk Exp $ + * $Id: fd.c,v 1.141 1999/05/08 18:13:14 peter Exp $ * */ @@ -606,8 +606,8 @@ fdc_probe(device_t dev) goto out; } fdc->dmachan = fdc->res_drq->r_start; - error = BUS_SETUP_INTR(device_get_parent(dev), dev, - fdc->res_irq, fdc_intr, fdc, &fdc->fdc_intr); + error = BUS_SETUP_INTR(device_get_parent(dev), dev, fdc->res_irq, + INTR_TYPE_BIO, fdc_intr, fdc, &fdc->fdc_intr); /* First - lets reset the floppy controller */ outb(fdc->baseport + FDOUT, 0); @@ -2333,7 +2333,6 @@ static device_method_t fdc_methods[] = { static driver_t fdc_driver = { "fdc", fdc_methods, - DRIVER_TYPE_BIO, sizeof(struct fdc_data) }; @@ -2354,7 +2353,6 @@ static device_method_t fd_methods[] = { static driver_t fd_driver = { "fd", fd_methods, - DRIVER_TYPE_BIO, sizeof(struct fd_data) }; diff --git a/sys/isa/psm.c b/sys/isa/psm.c index 70361ff..c6f69a7 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.5 1999/04/18 15:12:11 peter Exp $ + * $Id: psm.c,v 1.6 1999/05/07 10:10:40 phk Exp $ */ /* @@ -305,7 +305,6 @@ static device_method_t psm_methods[] = { static driver_t psm_driver = { "psm", psm_methods, - DRIVER_TYPE_TTY, sizeof(struct psm_softc), }; @@ -1082,8 +1081,8 @@ psmattach(device_t dev) BUS_READ_IVAR(device_get_parent(dev), dev, KBDC_IVAR_IRQ, &irq); res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, irq, irq, 1, RF_SHAREABLE | RF_ACTIVE); - BUS_SETUP_INTR(device_get_parent(dev), dev, res, psmintr, sc, - &ih); + BUS_SETUP_INTR(device_get_parent(dev), dev, res, INTR_TYPE_TTY, + psmintr, sc, &ih); return (0); } diff --git a/sys/isa/sio.c b/sys/isa/sio.c index b9624eb..478ddc1 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.232 1999/05/07 17:52:01 mjacob Exp $ + * $Id: sio.c,v 1.233 1999/05/07 23:08:04 mckusick Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -350,7 +350,6 @@ static device_method_t sio_methods[] = { static driver_t sio_driver = { driver_name, sio_methods, - DRIVER_TYPE_TTY|DRIVER_TYPE_FAST, sizeof(struct com_s), }; @@ -1135,8 +1134,9 @@ determined_type: ; res = bus_alloc_resource(dev, SYS_RES_IRQ, &zero, 0ul, ~0ul, 1, RF_SHAREABLE | RF_ACTIVE); - BUS_SETUP_INTR(device_get_parent(dev), dev, res, siointr, com, - &ih); + BUS_SETUP_INTR(device_get_parent(dev), dev, res, + INTR_TYPE_TTY | INTR_TYPE_FAST, + siointr, com, &ih); return (0); } diff --git a/sys/isa/syscons_isa.c b/sys/isa/syscons_isa.c index e837cab..70391e5 100644 --- a/sys/isa/syscons_isa.c +++ b/sys/isa/syscons_isa.c @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons_isa.c,v 1.1 1999/01/23 16:53:30 dfr Exp $ + * $Id: syscons_isa.c,v 1.2 1999/04/16 21:22:35 peter Exp $ */ #include "sc.h" @@ -61,7 +61,6 @@ static device_method_t sc_methods[] = { static driver_t sc_driver = { "sc", sc_methods, - DRIVER_TYPE_TTY, 1, /* XXX */ }; diff --git a/sys/isa/vga_isa.c b/sys/isa/vga_isa.c index e198f39..e4fa79b 100644 --- a/sys/isa/vga_isa.c +++ b/sys/isa/vga_isa.c @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: vga_isa.c,v 1.5 1999/04/16 23:54:24 peter Exp $ + * $Id: vga_isa.c,v 1.6 1999/05/08 20:20:18 peter Exp $ */ #include "vga.h" @@ -90,7 +90,6 @@ static device_method_t isavga_methods[] = { static driver_t isavga_driver = { DRIVER_NAME, isavga_methods, - DRIVER_TYPE_TTY, sizeof(isavga_softc_t), }; |