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?)
This commit is contained in:
parent
860d8e2312
commit
e251ed48e9
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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 */
|
||||
|
@ -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;
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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)
|
||||
|
@ -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 */
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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 */
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user