PERFORCE change 102145 for review
Paolo Pisati
piso at FreeBSD.org
Sat Jul 22 13:07:31 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=102145
Change 102145 by piso at piso_longino on 2006/07/22 13:07:21
compilation
Affected files ...
.. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#4 edit
.. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#7 edit
.. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#6 edit
Differences ...
==== //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#4 (text+ko) ====
@@ -84,6 +84,7 @@
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/kthread.h>
+#include <sys/interrupt.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mutex.h>
==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#7 (text) ====
@@ -32,6 +32,7 @@
#include <sys/bus.h>
#include <sys/conf.h>
#include <sys/kernel.h>
+#include <sys/interrupt.h>
#include <sys/malloc.h>
#include <sys/queue.h>
#include <sys/serial.h>
@@ -498,7 +499,7 @@
int
scc_bus_setup_intr(device_t dev, device_t child, struct resource *r, int flags,
- driver_filter_t *filter __unused, void (*ihand)(void *), void *arg,
+ driver_filter_t *filter, void (*ihand)(void *), void *arg,
void **cookiep)
{
struct scc_chan *ch;
@@ -510,14 +511,14 @@
return (EINVAL);
/* Interrupt handlers must be FAST or MPSAFE. */
- if (!(IS_FAST(filter, handler)) || ((flags & INTR_MPSAFE) == 0))
+ if (!(IS_FAST(filter, ihand)) || ((flags & INTR_MPSAFE) == 0))
return (EINVAL);
sc = device_get_softc(dev);
if (sc->sc_polled)
return (ENXIO);
- if (sc->sc_fastintr && !(IS_FAST(filter, handler))) {
+ if (sc->sc_fastintr && !(IS_FAST(filter, ihand))) {
sc->sc_fastintr = 0;
for (c = 0; c < sc->sc_class->cl_channels; c++) {
ch = &sc->sc_chan[c];
@@ -532,7 +533,7 @@
m = device_get_ivars(child);
m->m_hasintr = 1;
- m->m_fastintr = IS_FAST(filter, handler) ? 1 : 0;
+ m->m_fastintr = IS_FAST(filter, ihand) ? 1 : 0;
m->ih = ihand;
m->ih_arg = arg;
==== //depot/projects/soc2006/intr_filter/kern/subr_bus.c#6 (text+ko) ====
@@ -50,6 +50,7 @@
#include <sys/systm.h>
#include <sys/uio.h>
#include <sys/bus.h>
+#include <sys/interrupt.h>
#include <machine/stdarg.h>
More information about the p4-projects
mailing list