From owner-p4-projects@FreeBSD.ORG  Fri Nov 10 19:05:09 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 0E5FA16A416; Fri, 10 Nov 2006 19:05:09 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id CE1F216A415
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 19:05:08 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D993A43D5C
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 19:05:07 +0000 (GMT)
	(envelope-from sam@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 kAAJ57el094472
	for <perforce@freebsd.org>; Fri, 10 Nov 2006 19:05:07 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAAJ579Z094469
	for perforce@freebsd.org; Fri, 10 Nov 2006 19:05:07 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 10 Nov 2006 19:05:07 GMT
Message-Id: <200611101905.kAAJ579Z094469@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109696 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: Fri, 10 Nov 2006 19:05:09 -0000

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

Change 109696 by sam@sam_ebb on 2006/11/10 19:04:09

	re-enable interrupts; they don't fire as before now that
	we're poking the right registers

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/avila_ata.c#5 (text+ko) ====

@@ -81,9 +81,7 @@
 	} sc_intr[1];			/* NB: 1/channel */
 };
 
-#if 0
 static void ata_avila_intr(void *);
-#endif
 bs_protos(ata);
 
 static int
@@ -154,11 +152,10 @@
 	    AVILA_IDE_IRQ, AVILA_IDE_IRQ, 1, RF_ACTIVE);
 	if (!sc->sc_irq)
 		panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ);
-#if 0
 	bus_setup_intr(dev, sc->sc_irq,
 	    INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY,
 	    ata_avila_intr, sc, &sc->sc_ih);
-#endif
+
 bootverbose=1;
 	/* attach channel on this controller */
 	device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0));
@@ -189,7 +186,6 @@
 	return 0;
 }
 
-#if 0
 static void
 ata_avila_intr(void *xsc)
 {
@@ -201,7 +197,6 @@
 	if (sc->sc_intr[0].cb != NULL)
 		sc->sc_intr[0].cb(sc->sc_intr[0].arg);
 }
-#endif
 
 static struct resource *
 ata_avila_alloc_resource(device_t dev, device_t child, int type, int *rid,
@@ -410,7 +405,6 @@
 	return ata_probe(dev);
 }
 
-#include <sys/kdb.h>
 static int
 avila_channel_attach(device_t dev)
 {