summaryrefslogtreecommitdiff
path: root/sys/dev/firewire
diff options
context:
space:
mode:
authorHidetoshi Shimokawa <simokawa@FreeBSD.org>2003-10-25 15:05:59 +0000
committerHidetoshi Shimokawa <simokawa@FreeBSD.org>2003-10-25 15:05:59 +0000
commit65290832bdbb7ca162529a3ed3c3c8b2aeea2d8f (patch)
tree0659896039a7285c30c840a888e66d0fe4bb21f0 /sys/dev/firewire
parenta4468d635235d6b2087e92d40d7c140fa3d01fed (diff)
Notes
Diffstat (limited to 'sys/dev/firewire')
-rw-r--r--sys/dev/firewire/fwohci_pci.c6
-rw-r--r--sys/dev/firewire/fwohcivar.h1
2 files changed, 6 insertions, 1 deletions
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index ac2a3288a0b9..795aade86b76 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -288,6 +288,9 @@ fwohci_pci_attach(device_t self)
/* XXX splcam() should mask this irq for sbp.c*/
err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_CAM,
(driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_cam);
+ /* XXX splbio() should mask this irq for physio()/fwmem_strategy() */
+ err = bus_setup_intr(self, sc->irq_res, INTR_TYPE_BIO,
+ (driver_intr_t *) fwohci_dummy_intr, sc, &sc->ih_bio);
#endif
if (err) {
device_printf(self, "Could not setup irq, %d\n", err);
@@ -372,7 +375,8 @@ fwohci_pci_detach(device_t self)
device_printf(self, "Could not tear down irq, %d\n",
err);
#if __FreeBSD_version < 500000
- err = bus_teardown_intr(self, sc->irq_res, sc->ih_cam);
+ bus_teardown_intr(self, sc->irq_res, sc->ih_cam);
+ bus_teardown_intr(self, sc->irq_res, sc->ih_bio);
#endif
sc->ih = NULL;
}
diff --git a/sys/dev/firewire/fwohcivar.h b/sys/dev/firewire/fwohcivar.h
index 92b679bbe3f0..9a9fbd891e73 100644
--- a/sys/dev/firewire/fwohcivar.h
+++ b/sys/dev/firewire/fwohcivar.h
@@ -51,6 +51,7 @@ typedef struct fwohci_softc {
void *ih;
#if __FreeBSD_version < 500000
void *ih_cam;
+ void *ih_bio;
#endif
struct resource *bsr;
struct resource *irq_res;