PERFORCE change 102052 for review
Paolo Pisati
piso at FreeBSD.org
Fri Jul 21 11:42:09 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=102052
Change 102052 by piso at piso_longino on 2006/07/21 11:41:31
Axe INTR_FAST.
Affected files ...
.. //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#5 edit
.. //depot/projects/soc2006/intr_filter/dev/re/if_re.c#6 edit
.. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#5 edit
.. //depot/projects/soc2006/intr_filter/dev/sio/sio.c#5 edit
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/uart/uart_core.c#4 edit
.. //depot/projects/soc2006/intr_filter/i386/isa/clock.c#4 edit
.. //depot/projects/soc2006/intr_filter/i386/isa/npx.c#4 edit
.. //depot/projects/soc2006/intr_filter/powerpc/powermac/pswitch.c#4 edit
Differences ...
==== //depot/projects/soc2006/intr_filter/dev/fdc/fdc.c#5 (text+ko) ====
@@ -1762,8 +1762,8 @@
return (error);
}
error = bus_setup_intr(dev, fdc->res_irq,
- INTR_TYPE_BIO | INTR_ENTROPY | INTR_MPSAFE |
- ((fdc->flags & FDC_NOFAST) ? 0 : INTR_FAST),
+ INTR_TYPE_BIO | INTR_ENTROPY |
+ ((fdc->flags & FDC_NOFAST) ? INTR_MPSAFE : 0),
((fdc->flags & FDC_NOFAST) ? NULL : fdc_intr_fast),
((fdc->flags & FDC_NOFAST) ? fdc_intr : NULL),
fdc, &fdc->fdc_intr);
==== //depot/projects/soc2006/intr_filter/dev/re/if_re.c#6 (text+ko) ====
@@ -1286,8 +1286,8 @@
#endif
/* Hook interrupt last to avoid having to lock softc */
- error = bus_setup_intr(dev, sc->rl_irq, INTR_TYPE_NET | INTR_MPSAFE |
- INTR_FAST, re_intr, NULL, sc, &sc->rl_intrhand);
+ error = bus_setup_intr(dev, sc->rl_irq, INTR_TYPE_NET,
+ re_intr, NULL, sc, &sc->rl_intrhand);
if (error) {
device_printf(dev, "couldn't set up irq\n");
ether_ifdetach(ifp);
==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#5 (text) ====
@@ -219,7 +219,7 @@
if (ch->ch_ires == NULL)
continue;
error = bus_setup_intr(dev, ch->ch_ires,
- INTR_TYPE_TTY | INTR_FAST, scc_bfe_intr, NULL,
+ INTR_TYPE_TTY, scc_bfe_intr, NULL,
sc, &ch->ch_icookie);
if (error) {
error = bus_setup_intr(dev, ch->ch_ires,
==== //depot/projects/soc2006/intr_filter/dev/sio/sio.c#5 (text+ko) ====
@@ -1075,7 +1075,7 @@
com->irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE);
if (com->irqres) {
ret = bus_setup_intr(dev, com->irqres,
- INTR_TYPE_TTY | INTR_FAST,
+ INTR_TYPE_TTY,
siointr, NULL, com,
&com->cookie);
if (ret) {
==== //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#4 (text+ko) ====
@@ -357,11 +357,7 @@
return(ENXIO);
}
if ((error = bus_setup_intr(sc->bus_dev, sc->irq_res,
- ((mp_ncpus > 1) ? (INTR_MPSAFE
-#ifdef TW_OSLI_DEFERRED_INTR_USED
- | INTR_FAST
-#endif /* TW_OSLI_DEFERRED_INTR_USED */
- ) : 0) | INTR_TYPE_CAM,
+ INTR_TYPE_CAM | INTR_MPSAFE,
#ifdef TW_OSLI_DEFERRED_INTR_USED
twa_pci_intr_fast, NULL,
#else
==== //depot/projects/soc2006/intr_filter/dev/uart/uart_core.c#4 (text+ko) ====
@@ -403,7 +403,7 @@
RF_ACTIVE | RF_SHAREABLE);
if (sc->sc_ires != NULL) {
error = bus_setup_intr(dev,
- sc->sc_ires, INTR_TYPE_TTY | INTR_FAST,
+ sc->sc_ires, INTR_TYPE_TTY,
uart_intr, NULL, sc, &sc->sc_icookie);
if (error)
error = bus_setup_intr(dev,
==== //depot/projects/soc2006/intr_filter/i386/isa/clock.c#4 (text+ko) ====
@@ -824,8 +824,8 @@
* timecounter to user a simpler algorithm.
*/
if (!using_lapic_timer) {
- intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL,
- INTR_TYPE_CLK | INTR_FAST, NULL);
+ intr_add_handler("clk", 0, clkintr, NULL, NULL,
+ INTR_TYPE_CLK, NULL);
i8254_intsrc = intr_lookup_source(0);
if (i8254_intsrc != NULL)
i8254_pending =
@@ -858,8 +858,8 @@
/* Enable periodic interrupts from the RTC. */
rtc_statusb |= RTCSB_PINTR;
- intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL,
- INTR_TYPE_CLK | INTR_FAST, NULL);
+ intr_add_handler("rtc", 8, rtcintr, NULL, NULL,
+ INTR_TYPE_CLK, NULL);
writertc(RTC_STATUSB, rtc_statusb);
rtcin(RTC_INTR);
==== //depot/projects/soc2006/intr_filter/i386/isa/npx.c#4 (text+ko) ====
@@ -280,7 +280,7 @@
irq_res = bus_alloc_resource(dev, SYS_RES_IRQ, &irq_rid, irq_num,
irq_num, 1, RF_ACTIVE);
if (irq_res != NULL) {
- if (bus_setup_intr(dev, irq_res, INTR_TYPE_MISC | INTR_FAST,
+ if (bus_setup_intr(dev, irq_res, INTR_TYPE_MISC,
npx_intr, NULL, NULL, &irq_cookie) != 0)
panic("npx: can't create intr");
}
==== //depot/projects/soc2006/intr_filter/powerpc/powermac/pswitch.c#4 (text+ko) ====
@@ -121,8 +121,8 @@
return (ENXIO);
}
- if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC | INTR_FAST,
- (driver_filter_t *)pswitch_intr, NULL, dev, &sc->sc_ih) != 0) {
+ if (bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC,
+ pswitch_intr, NULL, dev, &sc->sc_ih) != 0) {
device_printf(dev, "could not setup interrupt\n");
bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irqrid,
sc->sc_irq);
More information about the p4-projects
mailing list