From owner-p4-projects@FreeBSD.ORG  Mon Mar  5 23:01:29 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 3FE8116A404; Mon,  5 Mar 2007 23:01:29 +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 05B2816A402
	for <perforce@freebsd.org>; Mon,  5 Mar 2007 23:01:29 +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 EAA2713C467
	for <perforce@freebsd.org>; Mon,  5 Mar 2007 23:01:28 +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 l25N1S4s070410
	for <perforce@freebsd.org>; Mon, 5 Mar 2007 23:01:28 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l25N1SCK070403
	for perforce@freebsd.org; Mon, 5 Mar 2007 23:01:28 GMT
	(envelope-from piso@freebsd.org)
Date: Mon, 5 Mar 2007 23:01:28 GMT
Message-Id: <200703052301.l25N1SCK070403@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 115381 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, 05 Mar 2007 23:01:29 -0000

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

Change 115381 by piso@piso_newluxor on 2007/03/05 23:01:11

	Restore the sos's intendation style.

Affected files ...

.. //depot/projects/soc2006/intr_filter/dev/ata/ata-pci.c#7 edit
.. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#15 edit

Differences ...

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

@@ -339,12 +339,12 @@
 
 int
 ata_pci_setup_intr(device_t dev, device_t child, struct resource *irq, 
-    int flags, driver_filter_t *filter, driver_intr_t *function, 
-    void *argument, void **cookiep)
+		   int flags, driver_filter_t *filter, 
+		   driver_intr_t *function, void *argument, void **cookiep)
 {
     if (ata_legacy(dev)) {
-	    return BUS_SETUP_INTR(device_get_parent(dev), child, irq, 
-	               flags, filter, function, argument, cookiep);
+	return BUS_SETUP_INTR(device_get_parent(dev), child, irq, 
+			      flags, filter, function, argument, cookiep);
     }
     else {
 	struct ata_pci_controller *controller = device_get_softc(dev);

==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#15 (text) ====

@@ -535,8 +535,8 @@
 	if (device_get_parent(child) != dev)
 		return (EINVAL);
 
-	/* Interrupt handlers must be FAST or MPSAFE. */
-	if ((filter == NULL) && !(flags & INTR_MPSAFE))
+	/* Interrupt handlers must be FILTER or MPSAFE. */
+	if ((ihand != NULL) && !(flags & INTR_MPSAFE))
 		return (EINVAL);
 
 	sc = device_get_softc(dev);