Deleted Added
full compact
26c26
< * $FreeBSD: head/sys/dev/sound/isa/sbc.c 64845 2000-08-19 18:17:15Z cg $
---
> * $FreeBSD: head/sys/dev/sound/isa/sbc.c 65644 2000-09-09 19:21:04Z cg $
61c61
< void *ih;
---
> void *ih[IRQ_MAX];
375,377c375,379
< device_printf(dev, "setting card to irq %d, drq %d", irq, dl);
< if (dl != dh) printf(", %d", dh);
< printf("\n");
---
> if (bootverbose) {
> device_printf(dev, "setting card to irq %d, drq %d", irq, dl);
> if (dl != dh) printf(", %d", dh);
> printf("\n");
> }
392c394
< if (bus_setup_intr(dev, scp->irq[i], INTR_TYPE_TTY, sbc_intr, &scp->ihl[i], &scp->ih))
---
> if (bus_setup_intr(dev, scp->irq[i], INTR_TYPE_TTY, sbc_intr, &scp->ihl[i], &scp->ih[i]))
429a432,440
> static int
> sbc_detach(device_t dev)
> {
> struct sbc_softc *scp = device_get_softc(dev);
>
> release_resource(scp);
> return bus_generic_detach(dev);
> }
>
651c662
< if (scp->irq[i] == NULL) {
---
> if (scp->irq[i] == NULL) {
681a693,695
> if (scp->ih[i] != NULL)
> bus_teardown_intr(scp->dev, scp->irq[i], scp->ih[i]);
> scp->ih[i] = NULL;
693c707
< DEVMETHOD(device_detach, bus_generic_detach),
---
> DEVMETHOD(device_detach, sbc_detach),