From owner-p4-projects@FreeBSD.ORG  Mon Dec 18 16:26:40 2006
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 9C32616A47C; Mon, 18 Dec 2006 16:26:40 +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 5FF9016A417
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 16:26:40 +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 C073343CA6
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 16:26:39 +0000 (GMT)
	(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 kBIGQWRr074775
	for <perforce@freebsd.org>; Mon, 18 Dec 2006 16:26:32 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBIGQWDm074766
	for perforce@freebsd.org; Mon, 18 Dec 2006 16:26:32 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 18 Dec 2006 16:26:32 GMT
Message-Id: <200612181626.kBIGQWDm074766@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 111899 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: Mon, 18 Dec 2006 16:26:40 -0000

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

Change 111899 by piso@piso_newluxor on 2006/12/18 16:26:17

	We cannot use filters in the ata subsystem, so put
	a check to verify the condition.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#5 edit
.. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#4 edit

Differences ...

==== //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#5 (text+ko) ====

@@ -188,15 +188,16 @@
 
 static int
 ata_cbus_setup_intr(device_t dev, device_t child, struct resource *irq,
-	       int flags, driver_filter_t *filter __unused, driver_intr_t *intr, 
+	       int flags, driver_filter_t *filter, driver_intr_t *intr, 
 	       void *arg, void **cookiep)
 {
     struct ata_cbus_controller *controller = device_get_softc(dev);
     int unit = ((struct ata_channel *)device_get_softc(child))->unit;
 
-    /*
-     * XXX_FILTER this code doesn't take care of filters.
-     */
+    if (filter != NULL) {
+	    printf("ata-cbus.c: we cannot use a filter here\n");
+	    return (EINVAL);
+    }
     controller->interrupt[unit].function = intr;
     controller->interrupt[unit].argument = arg;
     *cookiep = controller;

==== //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#4 (text+ko) ====

@@ -345,10 +345,11 @@
     else {
 	struct ata_pci_controller *controller = device_get_softc(dev);
 	int unit = ((struct ata_channel *)device_get_softc(child))->unit;
-	
-	/*
-	 * XXX_FILTER this code doesn't take care of filters.
-	 */
+
+	if (filter != NULL) {
+		printf("ata-pci.c: we cannot use a filter here\n");
+		return (EINVAL);
+	}
 	controller->interrupt[unit].function = function;
 	controller->interrupt[unit].argument = argument;
 	*cookiep = controller;