PERFORCE change 100058 for review

[Paolo Pisati]

http://perforce.freebsd.org/chv.cgi?CH=100058

Change 100058 by piso at piso_newluxor on 2006/06/26 14:03:38

	Add a filter parameter to nexus_setup_intr() and 
	ia64_setup_intr().

Affected files ...

.. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#3 edit
.. //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#2 edit
.. //depot/projects/soc2006/intr_filter/ia64/include/intr.h#2 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#3 (text+ko) ====

@@ -283,8 +283,9 @@
 }
 
 int
-ia64_setup_intr(const char *name, int irq, driver_intr_t handler, void *arg,
-		enum intr_type flags, void **cookiep, volatile long *cntp)
+ia64_setup_intr(const char *name, int irq, driver_intr_t handler, 
+		driver_filter_t filter,void *arg, enum intr_type flags, 
+		void **cookiep, volatile long *cntp)		
 {
 	struct ia64_intr *i;
 	int errcode;
@@ -331,7 +332,7 @@
 	}
 
 	/* Second, add this handler. */
-	errcode = intr_event_add_handler(i->event, name, handler, arg,
+	errcode = intr_event_add_handler(i->event, name, filter, handler, arg,
 	    intr_priority(flags), flags, cookiep);
 	if (errcode)
 		return errcode;

==== //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#2 (text+ko) ====

@@ -92,7 +92,7 @@
 static	int nexus_release_resource(device_t, device_t, int, int,
 				   struct resource *);
 static	int nexus_setup_intr(device_t, device_t, struct resource *, int flags,
-			     void (*)(void *), void *, void **);
+			     driver_filter_t filter, void (*)(void *), void *, void **);
 static	int nexus_teardown_intr(device_t, device_t, struct resource *,
 				void *);
 static struct resource_list *nexus_get_reslist(device_t dev, device_t child);
@@ -467,7 +467,8 @@
  */
 static int
 nexus_setup_intr(device_t bus, device_t child, struct resource *irq,
-		 int flags, void (*ihand)(void *), void *arg, void **cookiep)
+		 int flags, driver_filter_t filter, void (*ihand)(void *), 
+		 void *arg, void **cookiep)
 {
 	driver_t	*driver;
 	int		error;
@@ -490,7 +491,7 @@
 		return (error);
 
 	error = ia64_setup_intr(device_get_nameunit(child),
-	    rman_get_start(irq), ihand, arg, flags, cookiep, 0);
+	    rman_get_start(irq), filter, ihand, arg, flags, cookiep, 0);
 
 	return (error);
 }

==== //depot/projects/soc2006/intr_filter/ia64/include/intr.h#2 (text+ko) ====

@@ -51,9 +51,9 @@
 struct sapic;
 
 void ia64_add_sapic(struct sapic *sa);
-int ia64_setup_intr(const char *name, int irq, driver_intr_t handler,
-		    void *arg, enum intr_type flags, void **cookiep,
-		    volatile long *cntp);
+int ia64_setup_intr(const char *name, int irq, driver_intr_t handler, 
+		    driver_filter_t filter, void *arg, enum intr_type flags, 
+		    void **cookiep, volatile long *cntp);		    
 int ia64_teardown_intr(void *cookie);
 void ia64_dispatch_intr(void *frame, unsigned long vector);