From baf2de77c9925014d03b440257fc14e32e996eaa Mon Sep 17 00:00:00 2001 From: piso Date: Fri, 23 Feb 2007 20:11:27 +0000 Subject: o break newbus api: add a new argument of type driver_filter_t to bus_setup_intr() o add an int return code to all fast handlers o retire INTR_FAST/IH_FAST For more info: http://docs.freebsd.org/cgi/getmsg.cgi?fetch=465712+0+current/freebsd-current Approved by: re (implicit?) --- sys/dev/pdq/if_fea.c | 2 +- sys/dev/si/si_eisa.c | 2 +- sys/dev/wl/if_wl.c | 2 +- sys/i4b/capi/iavc/iavc_isa.c | 2 +- sys/i4b/capi/iavc/iavc_pci.c | 2 +- sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c | 2 +- sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c | 2 +- sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c | 4 ++-- sys/i4b/layer1/isic/i4b_avm_a1.c | 2 +- sys/i4b/layer1/isic/i4b_elsa_pcc16.c | 2 +- sys/i4b/layer1/isic/i4b_elsa_qs1p.c | 2 +- sys/i4b/layer1/isic/i4b_isic_pnp.c | 2 +- sys/i4b/layer1/isic/i4b_itk_ix1.c | 2 +- sys/i4b/layer1/isic/i4b_tel_s016.c | 2 +- sys/i4b/layer1/isic/i4b_tel_s0163.c | 2 +- sys/i4b/layer1/isic/i4b_tel_s08.c | 2 +- sys/i4b/layer1/isic/i4b_usr_sti.c | 2 +- sys/i4b/layer1/itjc/i4b_itjc_pci.c | 2 +- sys/i4b/layer1/iwic/i4b_iwic_pci.c | 2 +- sys/pc98/cbus/olpt.c | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/sys/dev/pdq/if_fea.c b/sys/dev/pdq/if_fea.c index 19ba31e..a2cb27f 100644 --- a/sys/dev/pdq/if_fea.c +++ b/sys/dev/pdq/if_fea.c @@ -235,7 +235,7 @@ pdq_eisa_attach (dev) } error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, - pdq_eisa_ifintr, dev, &sc->irq_ih); + NULL, pdq_eisa_ifintr, dev, &sc->irq_ih); if (error) { device_printf(dev, "Failed to setup interrupt handler.\n"); error = ENXIO; diff --git a/sys/dev/si/si_eisa.c b/sys/dev/si/si_eisa.c index edb0a8e..c2ee533 100644 --- a/sys/dev/si/si_eisa.c +++ b/sys/dev/si/si_eisa.c @@ -102,7 +102,7 @@ si_eisa_attach(device_t dev) } sc->sc_irq = rman_get_start(sc->sc_irq_res); error = bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_TTY, - si_intr, sc,&ih); + NULL, si_intr, sc,&ih); if (error) { device_printf(dev, "couldn't activate interrupt"); goto fail; diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index cf131f8..474235e 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -573,7 +573,7 @@ wlattach(device_t device) printf(", Freq %d MHz",sc->freq24); /* 2.4 Gz */ printf("\n"); /* 2.4 Gz */ - bus_setup_intr(device, sc->res_irq, INTR_TYPE_NET, wlintr, sc, &sc->intr_cookie); + bus_setup_intr(device, sc->res_irq, INTR_TYPE_NET, NULL, wlintr, sc, &sc->intr_cookie); if (bootverbose) wldump(sc); diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c index b837d06..9401044 100644 --- a/sys/i4b/capi/iavc/iavc_isa.c +++ b/sys/i4b/capi/iavc/iavc_isa.c @@ -243,7 +243,7 @@ iavc_isa_attach(device_t dev) /* setup the interrupt */ if(bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void*))iavc_isa_intr, + NULL, (void(*)(void*))iavc_isa_intr, sc, &ih)) { printf("iavc%d: irq setup failed\n", unit); diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c index bd05ce6..6e5012a 100644 --- a/sys/i4b/capi/iavc/iavc_pci.c +++ b/sys/i4b/capi/iavc/iavc_pci.c @@ -250,7 +250,7 @@ iavc_pci_attach(device_t dev) /* setup the interrupt */ if(bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void*))iavc_pci_intr, + NULL, (void(*)(void*))iavc_pci_intr, sc, &ih)) { printf("iavc%d: irq setup failed\n", unit); return(ENXIO); diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c index 17396a0..eafe0d4 100644 --- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c +++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c @@ -495,7 +495,7 @@ avma1pp2_attach_avma1pp(device_t dev) goto fail; } - error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, avma1pp2_intr, sc, &ih); + error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, NULL, avma1pp2_intr, sc, &ih); if (error) { bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sc_resources.irq); diff --git a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c index cee08b1..294bea0 100644 --- a/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c +++ b/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c @@ -516,7 +516,7 @@ avm_pnp_attach(device_t dev) /* not needed */ sc->sc_irq = rman_get_start(sc->sc_resources.irq); bus_setup_intr(dev,sc->sc_resources.irq,INTR_TYPE_NET, - (void(*)(void*))avm_pnp_intr, sc,&ih); + NULL, (void(*)(void*))avm_pnp_intr, sc,&ih); sc->sc_unit = unit; /* end of new-bus stuff */ diff --git a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c index ef2c76c..534ccdf 100644 --- a/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c +++ b/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c @@ -206,7 +206,7 @@ ihfc_pnp_probe(device_t dev) /* setup interrupt routine now to avvoid stray * * interrupts. */ - bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, (void(*)(void*)) + bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, NULL, (void(*)(void*)) HFC_INTR, sc, &dummy); flag = 1; @@ -298,7 +298,7 @@ ihfc_isa_probe(device_t dev) /* setup interrupt routine now to avvoid stray * * interrupts. */ - bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, (void(*)(void*)) + bus_setup_intr(dev, S_IRQ, INTR_TYPE_NET, NULL, (void(*)(void*)) HFC_INTR, sc, &dummy); flag = 1; diff --git a/sys/i4b/layer1/isic/i4b_avm_a1.c b/sys/i4b/layer1/isic/i4b_avm_a1.c index 3ea7753..587865a 100644 --- a/sys/i4b/layer1/isic/i4b_avm_a1.c +++ b/sys/i4b/layer1/isic/i4b_avm_a1.c @@ -253,7 +253,7 @@ isic_probe_avma1(device_t dev) /* register interupt routine */ bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void *))(isicintr), + NULL, (void(*)(void *))(isicintr), sc, &ih); /* check IRQ validity */ diff --git a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c index 7578ad8..8f2d83f 100644 --- a/sys/i4b/layer1/isic/i4b_elsa_pcc16.c +++ b/sys/i4b/layer1/isic/i4b_elsa_pcc16.c @@ -356,7 +356,7 @@ isic_probe_Epcc16(device_t dev) /* register interupt routine */ bus_setup_intr(dev,sc->sc_resources.irq,INTR_TYPE_NET, - (void(*)(void *))(isicintr), + NULL, (void(*)(void *))(isicintr), sc,&ih); diff --git a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c index a8baf98..ba0a345 100644 --- a/sys/i4b/layer1/isic/i4b_elsa_qs1p.c +++ b/sys/i4b/layer1/isic/i4b_elsa_qs1p.c @@ -325,7 +325,7 @@ eqs1p_pci_attach(device_t dev) } if(bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void*))isicintr, + NULL, (void(*)(void*))isicintr, sc, &ih)) { printf("isic%d: Couldn't set up irq for ELSA MicroLink ISDN/PCI!\n", unit); diff --git a/sys/i4b/layer1/isic/i4b_isic_pnp.c b/sys/i4b/layer1/isic/i4b_isic_pnp.c index 562e69a..1ebabaf 100644 --- a/sys/i4b/layer1/isic/i4b_isic_pnp.c +++ b/sys/i4b/layer1/isic/i4b_isic_pnp.c @@ -321,7 +321,7 @@ isic_pnp_attach(device_t dev) { /* setup intr routine */ bus_setup_intr(dev,sc->sc_resources.irq,INTR_TYPE_NET, - (void(*)(void*))isicintr, + NULL, (void(*)(void*))isicintr, sc,&ih); return 0; } diff --git a/sys/i4b/layer1/isic/i4b_itk_ix1.c b/sys/i4b/layer1/isic/i4b_itk_ix1.c index efff61b2b..d405325 100644 --- a/sys/i4b/layer1/isic/i4b_itk_ix1.c +++ b/sys/i4b/layer1/isic/i4b_itk_ix1.c @@ -281,7 +281,7 @@ isic_probe_itkix1(device_t dev) bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void *))(isicintr), + NULL, (void(*)(void *))(isicintr), sc, &ih); #if defined(ITK_PROBE_DEBUG) diff --git a/sys/i4b/layer1/isic/i4b_tel_s016.c b/sys/i4b/layer1/isic/i4b_tel_s016.c index d4f32c1..0c1dcc2 100644 --- a/sys/i4b/layer1/isic/i4b_tel_s016.c +++ b/sys/i4b/layer1/isic/i4b_tel_s016.c @@ -304,7 +304,7 @@ isic_probe_s016(device_t dev) bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void *))(isicintr), + NULL, (void(*)(void *))(isicintr), sc, &ih); /* get the irq number */ diff --git a/sys/i4b/layer1/isic/i4b_tel_s0163.c b/sys/i4b/layer1/isic/i4b_tel_s0163.c index 4dcc5c4..501276b 100644 --- a/sys/i4b/layer1/isic/i4b_tel_s0163.c +++ b/sys/i4b/layer1/isic/i4b_tel_s0163.c @@ -341,7 +341,7 @@ isic_probe_s0163(device_t dev) /* register interupt routine */ bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void *))(isicintr), + NULL, (void(*)(void *))(isicintr), sc, &ih); return (0); diff --git a/sys/i4b/layer1/isic/i4b_tel_s08.c b/sys/i4b/layer1/isic/i4b_tel_s08.c index 285530b..6631e56 100644 --- a/sys/i4b/layer1/isic/i4b_tel_s08.c +++ b/sys/i4b/layer1/isic/i4b_tel_s08.c @@ -268,7 +268,7 @@ isic_probe_s08(device_t dev) bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void *))(isicintr), + NULL, (void(*)(void *))(isicintr), sc, &ih); return (0); diff --git a/sys/i4b/layer1/isic/i4b_usr_sti.c b/sys/i4b/layer1/isic/i4b_usr_sti.c index c9be86c..ab49dc0 100644 --- a/sys/i4b/layer1/isic/i4b_usr_sti.c +++ b/sys/i4b/layer1/isic/i4b_usr_sti.c @@ -400,7 +400,7 @@ isic_probe_usrtai(device_t dev) /* register interrupt routine */ bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void *))(isicintr), + NULL, (void(*)(void *))(isicintr), sc, &ih); /* check IRQ validity */ diff --git a/sys/i4b/layer1/itjc/i4b_itjc_pci.c b/sys/i4b/layer1/itjc/i4b_itjc_pci.c index 101ba9c..9c4ba8d 100644 --- a/sys/i4b/layer1/itjc/i4b_itjc_pci.c +++ b/sys/i4b/layer1/itjc/i4b_itjc_pci.c @@ -1568,7 +1568,7 @@ itjc_attach(device_t dev) ++res_init_level; error = bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - itjc_intr, sc, &ih); + NULL, itjc_intr, sc, &ih); if (error) { diff --git a/sys/i4b/layer1/iwic/i4b_iwic_pci.c b/sys/i4b/layer1/iwic/i4b_iwic_pci.c index 79c36f7..8041c29 100644 --- a/sys/i4b/layer1/iwic/i4b_iwic_pci.c +++ b/sys/i4b/layer1/iwic/i4b_iwic_pci.c @@ -231,7 +231,7 @@ iwic_pci_attach(device_t dev) sc->enabled = FALSE; if(bus_setup_intr(dev, sc->sc_resources.irq, INTR_TYPE_NET, - (void(*)(void*))iwic_pci_intr, + NULL, (void(*)(void*))iwic_pci_intr, sc, &ih)) { printf("iwic%d: Couldn't set up irq!\n", unit); diff --git a/sys/pc98/cbus/olpt.c b/sys/pc98/cbus/olpt.c index f3e5b9a..f0d0da7 100644 --- a/sys/pc98/cbus/olpt.c +++ b/sys/pc98/cbus/olpt.c @@ -348,7 +348,7 @@ lpt_attach(device_t dev) sc->res_port); return ENXIO; } - if (bus_setup_intr(dev, sc->res_irq, INTR_TYPE_TTY, lpt_intr, + if (bus_setup_intr(dev, sc->res_irq, INTR_TYPE_TTY, NULL, lpt_intr, sc, &sc->sc_ih)) { bus_release_resource(dev, SYS_RES_IOPORT, 0, sc->res_port); -- cgit v1.1