d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for the new prototype of bus_setup_intr().

Browse Source
This commit is contained in:
Olivier Houchard 2007-02-25 22:17:54 +00:00
parent 0031cdf4d7
commit 902222e77c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arm/xscale/ixp425/avila_ata.c
View File

@ -160,7 +160,7 @@ ata_avila_attach(device_t dev)
panic("Unable to allocate irq %u.\n", AVILA_IDE_IRQ);
bus_setup_intr(dev, sc->sc_irq,
INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY,
ata_avila_intr, sc, &sc->sc_ih);
NULL, ata_avila_intr, sc, &sc->sc_ih);
/* attach channel on this controller */
device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0));
@ -225,8 +225,8 @@ ata_avila_release_resource(device_t dev, device_t child, int type, int rid,
static int
ata_avila_setup_intr(device_t dev, device_t child, struct resource *irq,
int flags, driver_intr_t *function, void *argument,
void **cookiep)
int flags, driver_filter_t *filt,
driver_intr_t *function, void *argument, void **cookiep)
{
struct ata_avila_softc *sc = device_get_softc(dev);
int unit = ((struct ata_channel *)device_get_softc(child))->unit;

2
sys/arm/xscale/ixp425/ixp425_qmgr.c
View File

@ -225,7 +225,7 @@ ixpqmgr_attach(device_t dev)
panic("Unable to allocate the qmgr irqs.\n");
/* XXX could be a source of entropy */
bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE,
ixpqmgr_intr, NULL, &sc->sc_ih);
NULL, ixpqmgr_intr, NULL, &sc->sc_ih);
/* NB: softc is pre-zero'd */
for (i = 0; i < IX_QMGR_MAX_NUM_QUEUES; i++) {