PERFORCE change 109696 for review

[Sam Leffler]

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

Change 109696 by sam at 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)
 {