diff options
| author | Matt Jacob <mjacob@FreeBSD.org> | 2007-02-23 23:13:46 +0000 |
|---|---|---|
| committer | Matt Jacob <mjacob@FreeBSD.org> | 2007-02-23 23:13:46 +0000 |
| commit | 5f53837698273880e82098a076820978edb89979 (patch) | |
| tree | 082dc7d6da7503d796a201c42840084611d2896d /sys/dev/isp | |
| parent | 6e50e38fcce8c444397d635c689c842a5af05dae (diff) | |
Notes
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_freebsd.h | 6 | ||||
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 3 | ||||
| -rw-r--r-- | sys/dev/isp/isp_sbus.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/sys/dev/isp/isp_freebsd.h b/sys/dev/isp/isp_freebsd.h index c8247e84c9ce..5aa091b5aa29 100644 --- a/sys/dev/isp/isp_freebsd.h +++ b/sys/dev/isp/isp_freebsd.h @@ -492,6 +492,12 @@ int isp_mstohz(int); bus_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, \ busdma_lock_mutex, &Giant, z) #endif +#if __FreeBSD_version < 700031 +#define isp_setup_intr(d, i, f, U, if, ifa, hp) \ + bus_setup_intr(d, i, f, if, ifa, hp) +#else +#define isp_setup_intr bus_setup_intr +#endif /* Should be BUS_SPACE_MAXSIZE, but MAXPHYS is larger than BUS_SPACE_MAXSIZE */ #define ISP_NSEGS ((MAXPHYS / PAGE_SIZE) + 1) diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 64dcddff8d2b..5205c0bcae70 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -1170,7 +1170,8 @@ isp_pci_attach(device_t dev) locksetup++; #endif - if (bus_setup_intr(dev, irq, ISP_IFLAGS, NULL, isp_pci_intr, isp, &pcs->ih)) { + if (isp_setup_intr(dev, irq, ISP_IFLAGS, NULL, isp_pci_intr, isp, + &pcs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; } diff --git a/sys/dev/isp/isp_sbus.c b/sys/dev/isp/isp_sbus.c index 6da80e5c5f3d..fd8566a4d1f1 100644 --- a/sys/dev/isp/isp_sbus.c +++ b/sys/dev/isp/isp_sbus.c @@ -311,7 +311,7 @@ isp_sbus_attach(device_t dev) goto bad; } - if (bus_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, + if (isp_setup_intr(dev, sbs->sbus_ires, ISP_IFLAGS, NULL, isp_sbus_intr, isp, &sbs->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; |