PERFORCE change 115116 for review
Paolo Pisati
piso at FreeBSD.org
Tue Feb 27 13:05:36 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=115116
Change 115116 by piso at piso_newluxor on 2007/02/27 13:04:52
Reduce diff against HEAD.
Affected files ...
.. //depot/projects/soc2006/intr_filter/dev/aac/aac.c#9 edit
.. //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#4 edit
.. //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#7 edit
.. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#10 edit
.. //depot/projects/soc2006/intr_filter/dev/bfe/if_bfereg.h#4 edit
.. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#17 edit
.. //depot/projects/soc2006/intr_filter/dev/em/if_em.h#8 edit
.. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#8 edit
.. //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_pci.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#11 edit
.. //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#5 edit
.. //depot/projects/soc2006/intr_filter/dev/mlx/mlx.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/mly/mly.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#8 edit
.. //depot/projects/soc2006/intr_filter/dev/ncv/ncr53c500_pccard.c#5 edit
.. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#4 edit
.. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#9 edit
.. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#7 edit
.. //depot/projects/soc2006/intr_filter/dev/ppbus/ppbconf.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/ppbus/pps.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#5 edit
.. //depot/projects/soc2006/intr_filter/dev/puc/puc.c#10 edit
.. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#16 edit
.. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#6 edit
.. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#13 edit
.. //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/vibes.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#3 edit
.. //depot/projects/soc2006/intr_filter/dev/zs/zs.c#4 edit
Differences ...
==== //depot/projects/soc2006/intr_filter/dev/aac/aac.c#9 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/aac/aacvar.h#4 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/arcmsr/arcmsr.c#7 (text+ko) ====
@@ -2119,7 +2119,7 @@
bus_setup_intr(dev, irqres, INTR_TYPE_CAM|INTR_ENTROPY|INTR_MPSAFE
, NULL, arcmsr_interrupt, acb, &acb->ih)) {
arcmsr_free_resource(acb);
- printf("arcmsr%d: unable to register interrupt handler!\n",unit);
+ printf("arcmsr%d: unable to register interrupt handler!\n", unit);
return ENXIO;
}
acb->irqres=irqres;
==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfe.c#10 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/bfe/if_bfereg.h#4 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/em/if_em.c#17 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/em/if_em.h#8 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#8 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/ipmi/ipmi_pci.c#4 (text) ====
@@ -262,6 +262,7 @@
break;
case SMIC_MODE:
device_printf(dev, "using SMIC interface\n");
+
error = ipmi_smic_attach(sc);
if (error)
goto bad;
==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwi.c#11 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/iwi/if_iwivar.h#5 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/mlx/mlx.c#4 (text+ko) ====
@@ -364,8 +364,7 @@
device_printf(sc->mlx_dev, "can't allocate interrupt\n");
return(ENXIO);
}
- error = bus_setup_intr(sc->mlx_dev, sc->mlx_irq, INTR_TYPE_BIO |
- INTR_ENTROPY, NULL, mlx_intr, sc, &sc->mlx_intr);
+ error = bus_setup_intr(sc->mlx_dev, sc->mlx_irq, INTR_TYPE_BIO | INTR_ENTROPY, NULL, mlx_intr, sc, &sc->mlx_intr);
if (error) {
device_printf(sc->mlx_dev, "can't set up interrupt\n");
return(ENXIO);
==== //depot/projects/soc2006/intr_filter/dev/mly/mly.c#6 (text+ko) ====
@@ -380,8 +380,7 @@
mly_printf(sc, "can't allocate interrupt\n");
goto fail;
}
- if (bus_setup_intr(sc->mly_dev, sc->mly_irq, INTR_TYPE_CAM |
- INTR_ENTROPY, NULL, mly_intr, sc, &sc->mly_intr)) {
+ if (bus_setup_intr(sc->mly_dev, sc->mly_irq, INTR_TYPE_CAM | INTR_ENTROPY, NULL, mly_intr, sc, &sc->mly_intr)) {
mly_printf(sc, "can't set up interrupt\n");
goto fail;
}
==== //depot/projects/soc2006/intr_filter/dev/msk/if_msk.c#6 (text+ko) ====
@@ -1783,8 +1783,9 @@
taskqueue_start_threads(&sc->msk_tq, 1, PI_NET, "%s taskq",
device_get_nameunit(sc->msk_dev));
/* Hook interrupt last to avoid having to lock softc. */
- error = bus_setup_intr(dev, sc->msk_res[0], INTR_TYPE_NET |
+ error = bus_setup_intr(dev, sc->msk_irq[0], INTR_TYPE_NET |
INTR_MPSAFE, msk_intr, NULL, sc, &sc->msk_intrhand[0]);
+
if (error != 0) {
device_printf(dev, "couldn't set up interrupt handler\n");
taskqueue_free(sc->msk_tq);
==== //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#8 (text+ko) ====
@@ -2422,18 +2422,6 @@
else
sc->big_bytes = MJUMPAGESIZE;
- err = mxge_alloc_rings(sc);
- if (err != 0) {
- device_printf(sc->dev, "failed to allocate rings\n");
- return err;
- }
-
- err = bus_setup_intr(sc->dev, sc->irq_res,
- INTR_TYPE_NET | INTR_MPSAFE,
- NULL, mxge_intr, sc, &sc->ih);
- if (err != 0) {
- goto abort_with_rings;
- }
/* get the lanai pointers to the send and receive rings */
==== //depot/projects/soc2006/intr_filter/dev/ncv/ncr53c500_pccard.c#5 (text+ko) ====
@@ -246,8 +246,7 @@
return(ENXIO);
}
error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_CAM | INTR_ENTROPY,
- NULL, ncv_pccard_intr, (void *)sc,
- &sc->ncv_intrhand);
+ NULL, ncv_pccard_intr, (void *)sc, &sc->ncv_intrhand);
if (error) {
ncv_release_resource(dev);
return(error);
==== //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#6 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#4 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#9 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#7 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/ppbus/ppbconf.c#4 (text+ko) ====
@@ -428,7 +428,7 @@
return (EINVAL);
if ((error = BUS_SETUP_INTR(device_get_parent(bus), child, r, flags,
- filt, ihand, arg, cookiep)))
+ filt, ihand, arg, cookiep)))
return (error);
/* store the resource and the cookie for eventually forcing
==== //depot/projects/soc2006/intr_filter/dev/ppbus/pps.c#6 (text+ko) ====
@@ -205,8 +205,8 @@
/* attach the interrupt handler */
if ((error = bus_setup_intr(ppsdev, sc->intr_resource,
- INTR_TYPE_TTY, ppsintr, NULL, sc,
- &sc->intr_cookie))) {
+ (INTR_TYPE_TTY | INTR_MPSAFE), ppsintr, NULL,
+ sc, &sc->intr_cookie))) {
ppb_release_bus(ppbus, ppsdev);
return (error);
}
==== //depot/projects/soc2006/intr_filter/dev/ppc/ppc.c#5 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/puc/puc.c#10 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/re/if_re.c#16 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#6 (text) ====
==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#13 (text) ====
==== //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#6 (text+ko) ====
@@ -316,8 +316,7 @@
}
if (scp->irq != NULL)
- bus_setup_intr(dev, scp->irq, INTR_TYPE_AV, NULL,
- gusc_intr, scp, &ih);
+ snd_setup_intr(dev, scp->irq, 0, gusc_intr, scp, &ih);
bus_generic_attach(dev);
return (0);
==== //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#6 (text+ko) ====
@@ -445,8 +445,7 @@
#if __FreeBSD_version >= 700031
driver_filter_t *filter,
#endif
- driver_filter_t *filter, driver_intr_t *intr, void *arg,
- void **cookiep)
+ driver_intr_t *intr, void *arg, void **cookiep)
{
sc_p scp;
csa_res *resp;
==== //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10kx.c#6 (text+ko) ====
@@ -2835,8 +2835,7 @@
i = 0;
sc->irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &i, RF_ACTIVE | RF_SHAREABLE);
- if ((sc->irq == NULL) || bus_setup_intr(dev, sc->irq, INTR_MPSAFE |
- INTR_TYPE_AV, NULL, emu_intr, sc, &sc->ih)) {
+ if ((sc->irq == NULL) || snd_setup_intr(dev, sc->irq, INTR_MPSAFE, emu_intr, sc, &sc->ih)) {
device_printf(dev, "unable to map interrupt\n");
goto bad;
}
==== //depot/projects/soc2006/intr_filter/dev/sound/pci/vibes.c#4 (text+ko) ====
@@ -762,7 +762,7 @@
sc->irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->irqid,
0, ~0, 1, RF_ACTIVE | RF_SHAREABLE);
if (!sc->irq ||
- bus_setup_intr(dev, sc->irq, INTR_TYPE_AV, NULL, sv_intr, sc, &sc->ih)) {
+ snd_setup_intr(dev, sc->irq, 0, sv_intr, sc, &sc->ih)) {
device_printf(dev, "sv_attach: Unable to map interrupt\n");
goto fail;
}
==== //depot/projects/soc2006/intr_filter/dev/zs/z8530var.h#3 (text+ko) ====
==== //depot/projects/soc2006/intr_filter/dev/zs/zs.c#4 (text+ko) ====
More information about the p4-projects
mailing list