diff options
Diffstat (limited to 'sys/dev')
37 files changed, 65 insertions, 97 deletions
diff --git a/sys/dev/advansys/adv_eisa.c b/sys/dev/advansys/adv_eisa.c index 465f675..69a2a39 100644 --- a/sys/dev/advansys/adv_eisa.c +++ b/sys/dev/advansys/adv_eisa.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: adv_eisa.c,v 1.2 1998/12/22 18:14:09 gibbs Exp $ + * $Id: adv_eisa.c,v 1.3 1999/04/18 15:50:33 peter Exp $ */ #include "eisa.h" @@ -316,7 +316,7 @@ adveisaattach(device_t dev) /* * Enable our interrupt handler. */ - bus_setup_intr(dev, irq, adv_intr, adv, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_CAM, adv_intr, adv, &ih); /* Attach sub-devices - always succeeds */ adv_attach(adv); @@ -342,7 +342,6 @@ static device_method_t adv_eisa_methods[] = { static driver_t adv_eisa_driver = { "adv", adv_eisa_methods, - DRIVER_TYPE_CAM, 1, /* unused */ }; diff --git a/sys/dev/ahb/ahb.c b/sys/dev/ahb/ahb.c index 6e0db43..86ba09b 100644 --- a/sys/dev/ahb/ahb.c +++ b/sys/dev/ahb/ahb.c @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahb.c,v 1.10 1999/04/23 23:29:00 gibbs Exp $ + * $Id: ahb.c,v 1.11 1999/05/06 20:16:31 ken Exp $ */ #include "eisa.h" @@ -369,7 +369,7 @@ ahbattach(device_t dev) goto error_exit; /* Enable our interrupt */ - bus_setup_intr(dev, irq, ahbintr, ahb, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_CAM, ahbintr, ahb, &ih); return (0); error_exit: @@ -1347,7 +1347,6 @@ static device_method_t ahb_eisa_methods[] = { static driver_t ahb_eisa_driver = { "ahb", ahb_eisa_methods, - DRIVER_TYPE_CAM, 1, /* unused */ }; diff --git a/sys/dev/aic7xxx/ahc_eisa.c b/sys/dev/aic7xxx/ahc_eisa.c index fe02ca6..e0c0c51 100644 --- a/sys/dev/aic7xxx/ahc_eisa.c +++ b/sys/dev/aic7xxx/ahc_eisa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.6 1999/04/18 15:50:33 peter Exp $ + * $Id: ahc_eisa.c,v 1.7 1999/04/23 23:29:00 gibbs Exp $ */ #include "eisa.h" @@ -465,7 +465,6 @@ static device_method_t ahc_eisa_methods[] = { static driver_t ahc_eisa_driver = { "ahc", ahc_eisa_methods, - DRIVER_TYPE_CAM, 1, /* unused */ }; diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c index 818e491..7f8fd69 100644 --- a/sys/dev/aic7xxx/ahc_pci.c +++ b/sys/dev/aic7xxx/ahc_pci.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_pci.c,v 1.8 1999/03/23 07:26:41 gibbs Exp $ + * $Id: ahc_pci.c,v 1.9 1999/04/23 23:30:21 gibbs Exp $ */ #include <pci.h> @@ -162,7 +162,6 @@ static device_method_t ahc_pci_methods[] = { static driver_t ahc_pci_driver = { "ahc", ahc_pci_methods, - DRIVER_TYPE_CAM, sizeof(struct ahc_softc) }; diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c index 215e0a4..cc68263 100644 --- a/sys/dev/aic7xxx/aic7xxx.c +++ b/sys/dev/aic7xxx/aic7xxx.c @@ -36,7 +36,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx.c,v 1.24 1999/04/26 22:03:44 ken Exp $ + * $Id: aic7xxx.c,v 1.25 1999/05/06 20:16:17 ken Exp $ */ /* * A few notes on features of the driver. @@ -1377,8 +1377,8 @@ ahc_attach(struct ahc_softc *ahc) s = splcam(); /* Hook up our interrupt handler */ - if ((error = bus_setup_intr(ahc->device, ahc->irq, ahc_intr, - ahc, &ahc->ih)) != 0) { + if ((error = bus_setup_intr(ahc->device, ahc->irq, INTR_TYPE_CAM, + ahc_intr, ahc, &ahc->ih)) != 0) { device_printf(ahc->device, "bus_setup_intr() failed: %d\n", error); goto fail; diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 2426bbc..69b0cc9 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -25,7 +25,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: ata-all.c,v 1.10 1999/04/21 10:58:07 peter Exp $ + * $Id: ata-all.c,v 1.11 1999/04/22 08:07:44 sos Exp $ */ #include "ata.h" @@ -141,7 +141,7 @@ ata_isaattach(device_t dev) return (ENOMEM); } scp = device_get_softc(dev); - return bus_setup_intr(dev, irq, ataintr, scp, &ih); + return bus_setup_intr(dev, irq, INTR_TYPE_BIO, ataintr, scp, &ih); } static device_method_t ata_isa_methods[] = { @@ -154,7 +154,6 @@ static device_method_t ata_isa_methods[] = { static driver_t ata_isa_driver = { "ata-isa", ata_isa_methods, - DRIVER_TYPE_BIO, sizeof(int), }; @@ -314,9 +313,11 @@ ata_pciattach(device_t dev) irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0,1,RF_ACTIVE); if (sysctrl) - bus_setup_intr(dev, irq, promise_intr, scp, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_BIO, + promise_intr, scp, &ih); else - bus_setup_intr(dev, irq, ataintr, scp, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_BIO, + ataintr, scp, &ih); } printf("ata%d at 0x%04x irq %d on ata-pci%d\n", lun, iobase_1, isa_apic_irq(irq1), unit); @@ -339,7 +340,7 @@ ata_pciattach(device_t dev) irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0,1,RF_ACTIVE); if (!sysctrl) - bus_setup_intr(dev, irq, ataintr, scp, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_BIO, ataintr, scp, &ih); } printf("ata%d at 0x%04x irq %d on ata-pci%d\n", lun, iobase_2, isa_apic_irq(irq2), unit); @@ -357,7 +358,6 @@ static device_method_t ata_pci_methods[] = { static driver_t ata_pci_driver = { "ata-pci", ata_pci_methods, - DRIVER_TYPE_BIO, sizeof(int), }; diff --git a/sys/dev/atkbdc/atkbd_atkbdc.c b/sys/dev/atkbdc/atkbd_atkbdc.c index 1d7ee62..8942681 100644 --- a/sys/dev/atkbdc/atkbd_atkbdc.c +++ b/sys/dev/atkbdc/atkbd_atkbdc.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/dev/atkbdc/atkbd_isa.c b/sys/dev/atkbdc/atkbd_isa.c index 1d7ee62..8942681 100644 --- a/sys/dev/atkbdc/atkbd_isa.c +++ b/sys/dev/atkbdc/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/dev/atkbdc/atkbdc_isa.c b/sys/dev/atkbdc/atkbdc_isa.c index 8e5a62b..5342c52 100644 --- a/sys/dev/atkbdc/atkbdc_isa.c +++ b/sys/dev/atkbdc/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/dev/atkbdc/atkbdc_subr.c b/sys/dev/atkbdc/atkbdc_subr.c index 8e5a62b..5342c52 100644 --- a/sys/dev/atkbdc/atkbdc_subr.c +++ b/sys/dev/atkbdc/atkbdc_subr.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/dev/atkbdc/psm.c b/sys/dev/atkbdc/psm.c index 70361ff..c6f69a7 100644 --- a/sys/dev/atkbdc/psm.c +++ b/sys/dev/atkbdc/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/dev/bktr/bktr_i2c.c b/sys/dev/bktr/bktr_i2c.c index 176d069..63ea8d0 100644 --- a/sys/dev/bktr/bktr_i2c.c +++ b/sys/dev/bktr/bktr_i2c.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt848_i2c.c,v 1.1 1998/10/31 11:26:38 nsouch Exp $ + * $Id: bt848_i2c.c,v 1.2 1998/11/07 14:30:48 nsouch Exp $ * */ @@ -129,7 +129,6 @@ static device_method_t bti2c_methods[] = { static driver_t bti2c_driver = { "bti2c", bti2c_methods, - DRIVER_TYPE_MISC, sizeof(struct bti2c_softc), }; diff --git a/sys/dev/buslogic/bt.c b/sys/dev/buslogic/bt.c index 23de96c..afa8856 100644 --- a/sys/dev/buslogic/bt.c +++ b/sys/dev/buslogic/bt.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt.c,v 1.19 1999/05/05 06:45:09 imp Exp $ + * $Id: bt.c,v 1.20 1999/05/06 20:16:20 ken Exp $ */ /* @@ -868,7 +868,8 @@ bt_attach(device_t dev) /* * Setup interrupt. */ - error = bus_setup_intr(dev, bt->irq, bt_intr, bt, &bt->ih); + error = bus_setup_intr(dev, bt->irq, INTR_TYPE_CAM, + bt_intr, bt, &bt->ih); if (error) { device_printf(dev, "bus_setup_intr() failed: %d\n", error); return (error); diff --git a/sys/dev/buslogic/bt_eisa.c b/sys/dev/buslogic/bt_eisa.c index 19cdd8c..fc369c8 100644 --- a/sys/dev/buslogic/bt_eisa.c +++ b/sys/dev/buslogic/bt_eisa.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_eisa.c,v 1.5 1999/04/20 09:53:05 dfr Exp $ + * $Id: bt_eisa.c,v 1.6 1999/04/24 06:46:10 peter Exp $ */ #include "eisa.h" @@ -333,7 +333,6 @@ static device_method_t bt_eisa_methods[] = { static driver_t bt_eisa_driver = { "bt", bt_eisa_methods, - DRIVER_TYPE_CAM, sizeof(struct bt_softc), }; diff --git a/sys/dev/buslogic/bt_isa.c b/sys/dev/buslogic/bt_isa.c index f2150a7..c9d52c3 100644 --- a/sys/dev/buslogic/bt_isa.c +++ b/sys/dev/buslogic/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/dev/buslogic/bt_pci.c b/sys/dev/buslogic/bt_pci.c index c5dd842..b126364 100644 --- a/sys/dev/buslogic/bt_pci.c +++ b/sys/dev/buslogic/bt_pci.c @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: bt_pci.c,v 1.5 1999/04/18 15:50:35 peter Exp $ + * $Id: bt_pci.c,v 1.6 1999/04/23 23:30:22 gibbs Exp $ */ #include "pci.h" @@ -224,7 +224,6 @@ static device_method_t bt_pci_methods[] = { static driver_t bt_pci_driver = { "bt", bt_pci_methods, - DRIVER_TYPE_CAM, sizeof(struct bt_softc), }; diff --git a/sys/dev/dpt/dpt_eisa.c b/sys/dev/dpt/dpt_eisa.c index a8b2448..e38ea66 100644 --- a/sys/dev/dpt/dpt_eisa.c +++ b/sys/dev/dpt/dpt_eisa.c @@ -33,7 +33,7 @@ */ /* - * $Id: dpt_eisa.c,v 1.4 1998/09/15 08:33:35 gibbs Exp $ + * $Id: dpt_eisa.c,v 1.5 1999/04/18 15:50:33 peter Exp $ */ #include "eisa.h" @@ -174,7 +174,7 @@ dpt_eisa_attach(device_t dev) /* Register with the XPT */ dpt_attach(dpt); - bus_setup_intr(dev, irq, dpt_intr, dpt, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_CAM, dpt_intr, dpt, &ih); splx(s); @@ -250,7 +250,6 @@ static device_method_t dpt_eisa_methods[] = { static driver_t dpt_eisa_driver = { "dpt", dpt_eisa_methods, - DRIVER_TYPE_CAM, 1, /* unused */ }; diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c index d219649..d6142e0 100644 --- a/sys/dev/eisa/eisaconf.c +++ b/sys/dev/eisa/eisaconf.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: eisaconf.c,v 1.41 1999/04/19 13:34:25 peter Exp $ + * $Id: eisaconf.c,v 1.42 1999/05/06 22:17:26 peter Exp $ */ #include "opt_eisa.h" @@ -132,7 +132,6 @@ static device_method_t mainboard_methods[] = { static driver_t mainboard_driver = { "mainboard", mainboard_methods, - DRIVER_TYPE_MISC, 1, }; @@ -483,7 +482,6 @@ static device_method_t eisa_methods[] = { static driver_t eisa_driver = { "eisa", eisa_methods, - DRIVER_TYPE_MISC, 1, /* no softc */ }; diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c index 8a96166..81ba5a2 100644 --- a/sys/dev/ep/if_ep_eisa.c +++ b/sys/dev/ep/if_ep_eisa.c @@ -19,7 +19,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: 3c5x9.c,v 1.10 1997/09/21 21:35:21 gibbs Exp $ + * $Id: 3c5x9.c,v 1.11 1999/04/18 15:50:33 peter Exp $ */ #include "eisa.h" @@ -274,7 +274,7 @@ ep_eisa_attach(device_t dev) ep_attach(sc); - bus_setup_intr(dev, irq, ep_intr, sc, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_NET, ep_intr, sc, &ih); return 0; @@ -299,7 +299,6 @@ static device_method_t ep_eisa_methods[] = { static driver_t ep_eisa_driver = { "ep", ep_eisa_methods, - DRIVER_TYPE_NET, 1, /* unused */ }; diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index f0a082f..197975b 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.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/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 53b8d4d..4d7d5ef 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.66 1999/03/20 04:51:25 wes Exp $ + * $Id: if_fxp.c,v 1.67 1999/04/16 21:22:51 peter Exp $ */ /* @@ -556,7 +556,8 @@ fxp_attach(device_t dev) goto fail; } - error = bus_setup_intr(dev, sc->irq, fxp_intr, sc, &sc->ih); + error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, + fxp_intr, sc, &sc->ih); if (error) { device_printf(dev, "could not setup irq\n"); goto fail; @@ -690,7 +691,6 @@ static device_method_t fxp_methods[] = { static driver_t fxp_driver = { "fxp", fxp_methods, - DRIVER_TYPE_NET, sizeof(struct fxp_softc), }; diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c index 7af9db7..cfcd10d 100644 --- a/sys/dev/iicbus/if_ic.c +++ b/sys/dev/iicbus/if_ic.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ic.c,v 1.2 1998/10/31 11:31:07 nsouch Exp $ + * $Id: if_ic.c,v 1.3 1998/12/07 21:58:16 archie Exp $ */ /* @@ -114,7 +114,6 @@ static device_method_t ic_methods[] = { static driver_t ic_driver = { "ic", ic_methods, - DRIVER_TYPE_MISC, sizeof(struct ic_softc), }; diff --git a/sys/dev/iicbus/iic.c b/sys/dev/iicbus/iic.c index 7925aa2..942d1b8 100644 --- a/sys/dev/iicbus/iic.c +++ b/sys/dev/iicbus/iic.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: iic.c,v 1.7 1999/02/13 18:01:55 nsouch Exp $ + * $Id: iic.c,v 1.8 1999/05/07 10:09:46 phk Exp $ * */ #include <sys/param.h> @@ -82,7 +82,6 @@ static device_method_t iic_methods[] = { static driver_t iic_driver = { "iic", iic_methods, - DRIVER_TYPE_MISC, sizeof(struct iic_softc), }; diff --git a/sys/dev/iicbus/iicbb.c b/sys/dev/iicbus/iicbb.c index 3b02454..1502ca4 100644 --- a/sys/dev/iicbus/iicbb.c +++ b/sys/dev/iicbus/iicbb.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: iicbb.c,v 1.2 1998/11/04 22:07:24 nsouch Exp $ + * $Id: iicbb.c,v 1.3 1999/01/28 15:50:24 roger Exp $ * */ @@ -102,7 +102,6 @@ static device_method_t iicbb_methods[] = { static driver_t iicbb_driver = { "iicbb", iicbb_methods, - DRIVER_TYPE_MISC, sizeof(struct iicbb_softc), }; diff --git a/sys/dev/iicbus/iicbus.c b/sys/dev/iicbus/iicbus.c index 12174a2..50e1dd1 100644 --- a/sys/dev/iicbus/iicbus.c +++ b/sys/dev/iicbus/iicbus.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: iicbus.c,v 1.7 1999/01/09 18:08:24 nsouch Exp $ + * $Id: iicbus.c,v 1.8 1999/04/11 02:55:52 eivind Exp $ * */ @@ -114,7 +114,6 @@ static device_method_t iicbus_methods[] = { static driver_t iicbus_driver = { "iicbus", iicbus_methods, - DRIVER_TYPE_MISC, sizeof(struct iicbus_softc), }; diff --git a/sys/dev/iicbus/iicsmb.c b/sys/dev/iicbus/iicsmb.c index 060c548..4319ca0 100644 --- a/sys/dev/iicbus/iicsmb.c +++ b/sys/dev/iicbus/iicsmb.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: iicsmb.c,v 1.1.1.1 1998/09/03 20:51:50 nsouch Exp $ + * $Id: iicsmb.c,v 1.2 1998/10/31 11:31:07 nsouch Exp $ * */ @@ -130,7 +130,6 @@ static device_method_t iicsmb_methods[] = { static driver_t iicsmb_driver = { "iicsmb", iicsmb_methods, - DRIVER_TYPE_MISC, sizeof(struct iicsmb_softc), }; diff --git a/sys/dev/pcf/pcf.c b/sys/dev/pcf/pcf.c index 12ac372..94d685b 100644 --- a/sys/dev/pcf/pcf.c +++ b/sys/dev/pcf/pcf.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pcf.c,v 1.7 1999/05/02 21:51:17 peter Exp $ + * $Id: pcf.c,v 1.8 1999/05/06 18:54:18 peter Exp $ * */ #include <sys/param.h> @@ -136,7 +136,6 @@ static device_method_t pcf_methods[] = { static driver_t pcf_driver = { "pcf", pcf_methods, - DRIVER_TYPE_MISC, sizeof(struct pcf_softc), }; diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index aa707cc..ae991fa 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.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: pci.c,v 1.98 1999/05/08 18:09:53 peter Exp $ + * $Id: pci.c,v 1.99 1999/05/08 20:28:01 peter Exp $ * */ @@ -931,7 +931,6 @@ compat_pci_handler(module_t mod, int type, void *data) bzero(driver, sizeof(driver_t)); driver->name = dvp->pd_name; driver->methods = pci_compat_methods; - driver->type = 0; /* XXX fixup in pci_map_int() */ driver->softc = sizeof(struct pci_devinfo *); driver->priv = dvp; devclass_add_driver(pci_devclass, driver); @@ -1373,7 +1372,6 @@ static device_method_t pci_methods[] = { static driver_t pci_driver = { "pci", pci_methods, - DRIVER_TYPE_MISC, 1, /* no softc */ }; diff --git a/sys/dev/ppbus/lpbb.c b/sys/dev/ppbus/lpbb.c index cd8ff24..e3ce6f0 100644 --- a/sys/dev/ppbus/lpbb.c +++ b/sys/dev/ppbus/lpbb.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: lpbb.c,v 1.3 1998/12/07 21:58:16 archie Exp $ + * $Id: lpbb.c,v 1.4 1999/01/10 12:04:54 nsouch Exp $ * */ @@ -91,7 +91,6 @@ static device_method_t lpbb_methods[] = { static driver_t lpbb_driver = { "lpbb", lpbb_methods, - DRIVER_TYPE_MISC, sizeof(struct lpbb_softc), }; diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c index b9624eb..478ddc1 100644 --- a/sys/dev/sio/sio.c +++ b/sys/dev/sio/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/dev/smbus/smb.c b/sys/dev/smbus/smb.c index 8944e5d..364661f 100644 --- a/sys/dev/smbus/smb.c +++ b/sys/dev/smbus/smb.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: smb.c,v 1.8 1999/02/14 14:36:45 nsouch Exp $ + * $Id: smb.c,v 1.9 1999/05/07 10:09:50 phk Exp $ * */ #include <sys/param.h> @@ -83,7 +83,6 @@ static device_method_t smb_methods[] = { static driver_t smb_driver = { "smb", smb_methods, - DRIVER_TYPE_MISC, sizeof(struct smb_softc), }; diff --git a/sys/dev/smbus/smbus.c b/sys/dev/smbus/smbus.c index 4171a0f..cd16f3c 100644 --- a/sys/dev/smbus/smbus.c +++ b/sys/dev/smbus/smbus.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: smbus.c,v 1.7 1999/01/09 18:08:24 nsouch Exp $ + * $Id: smbus.c,v 1.8 1999/02/13 17:57:19 nsouch Exp $ * */ #include <sys/param.h> @@ -88,7 +88,6 @@ static device_method_t smbus_methods[] = { static driver_t smbus_driver = { "smbus", smbus_methods, - DRIVER_TYPE_MISC, sizeof(struct smbus_softc), }; diff --git a/sys/dev/usb/ohci_pci.c b/sys/dev/usb/ohci_pci.c index 1aea5f1..45add26 100644 --- a/sys/dev/usb/ohci_pci.c +++ b/sys/dev/usb/ohci_pci.c @@ -161,7 +161,8 @@ ohci_pci_attach(device_t dev) return ENOMEM; } - error = bus_setup_intr(dev, res, (driver_intr_t *) ohci_intr, sc, &ih); + error = bus_setup_intr(dev, res, INTR_TYPE_BIO, + (driver_intr_t *) ohci_intr, sc, &ih); if (error) { device_printf(dev, "could not setup irq\n"); return error; @@ -231,7 +232,6 @@ static device_method_t ohci_methods[] = { static driver_t ohci_driver = { "ohci", ohci_methods, - DRIVER_TYPE_BIO, sizeof(ohci_softc_t), }; diff --git a/sys/dev/usb/uhci_pci.c b/sys/dev/usb/uhci_pci.c index c00a6bf..775ca44 100644 --- a/sys/dev/usb/uhci_pci.c +++ b/sys/dev/usb/uhci_pci.c @@ -1,4 +1,4 @@ -/* FreeBSD $Id: uhci_pci.c,v 1.6 1999/04/16 21:22:53 peter Exp $ */ +/* FreeBSD $Id: uhci_pci.c,v 1.7 1999/05/01 23:30:06 n_hibma Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -158,7 +158,8 @@ uhci_pci_attach(device_t dev) return ENOMEM; } - error = bus_setup_intr(dev, res, (driver_intr_t *) uhci_intr, sc, &ih); + error = bus_setup_intr(dev, res, INTR_TYPE_BIO, + (driver_intr_t *) uhci_intr, sc, &ih); if (error) { device_printf(dev, "could not setup irq\n"); return error; @@ -245,7 +246,6 @@ static device_method_t uhci_methods[] = { static driver_t uhci_driver = { "uhci", uhci_methods, - DRIVER_TYPE_BIO, sizeof(uhci_softc_t), }; diff --git a/sys/dev/usb/uhub.c b/sys/dev/usb/uhub.c index 2b18976..4863a1e 100644 --- a/sys/dev/usb/uhub.c +++ b/sys/dev/usb/uhub.c @@ -99,7 +99,6 @@ static device_method_t uhubroot_methods[] = { static driver_t uhubroot_driver = { "uhub", uhubroot_methods, - DRIVER_TYPE_MISC, sizeof(struct uhub_softc) }; #endif diff --git a/sys/dev/usb/usb_port.h b/sys/dev/usb/usb_port.h index 1866958..87ed0d3 100644 --- a/sys/dev/usb/usb_port.h +++ b/sys/dev/usb/usb_port.h @@ -160,7 +160,6 @@ static device_method_t __CONCAT(dname,_methods)[] = { \ static driver_t __CONCAT(dname,_driver) = { \ #dname, \ __CONCAT(dname,_methods), \ - DRIVER_TYPE_MISC, \ sizeof(struct __CONCAT(dname,_softc)) \ } diff --git a/sys/dev/vx/if_vx_eisa.c b/sys/dev/vx/if_vx_eisa.c index 808e369..03e50a3 100644 --- a/sys/dev/vx/if_vx_eisa.c +++ b/sys/dev/vx/if_vx_eisa.c @@ -164,7 +164,7 @@ vx_eisa_attach(device_t dev) vxattach(sc); - if (bus_setup_intr(dev, irq, vxintr, sc, &ih)) { + if (bus_setup_intr(dev, irq, INTR_TYPE_NET, vxintr, sc, &ih)) { vxfree(sc); goto bad; } @@ -192,7 +192,6 @@ static device_method_t vx_eisa_methods[] = { static driver_t vx_eisa_driver = { "vx", vx_eisa_methods, - DRIVER_TYPE_NET, 1, /* unused */ }; |