From owner-p4-projects@FreeBSD.ORG  Sat Mar  3 16:14:01 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A481816A405; Sat,  3 Mar 2007 16:14:01 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5128116A400
	for <perforce@freebsd.org>; Sat,  3 Mar 2007 16:14:01 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 4488C13C49D
	for <perforce@freebsd.org>; Sat,  3 Mar 2007 16:14:01 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l23GE1mX013968
	for <perforce@freebsd.org>; Sat, 3 Mar 2007 16:14:01 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l23GE0QR013965
	for perforce@freebsd.org; Sat, 3 Mar 2007 16:14:00 GMT
	(envelope-from piso@freebsd.org)
Date: Sat, 3 Mar 2007 16:14:00 GMT
Message-Id: <200703031614.l23GE0QR013965@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 115279 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Mar 2007 16:14:02 -0000

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

Change 115279 by piso@piso_newluxor on 2007/03/03 16:13:42

	Restore pccard ability to support filtered drivers:
	
	o check for filter and ithread handlers
	o fix pccard_intr() return code

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#7 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#7 (text+ko) ====

@@ -119,7 +119,7 @@
 		    int rid, struct resource *r);
 static void	pccard_child_detached(device_t parent, device_t dev);
 static int      pccard_filter(void *arg);
-static int	pccard_intr(void *arg);
+static void	pccard_intr(void *arg);
 static int	pccard_setup_intr(device_t dev, device_t child,
 		    struct resource *irq, int flags, driver_filter_t *filt, 
 		    driver_intr_t *intr, void *arg, void **cookiep);
@@ -1235,13 +1235,13 @@
 	struct pccard_function *pf = ivar->pf;
 	int err;
 
-	if (pf->intr_handler != NULL)
+	if (pf->intr_filter != NULL || pf->intr_handler != NULL)
 		panic("Only one interrupt handler per function allowed");
 	err = bus_generic_setup_intr(dev, child, irq, flags, pccard_filter, 
 	    pccard_intr, pf, cookiep);
 	if (err != 0)
 		return (err);
-	pf->intr_filter = filter;
+	pf->intr_filter = filt;
 	pf->intr_handler = intr;
 	pf->intr_handler_arg = arg;
 	pf->intr_handler_cookie = *cookiep;