diff options
| author | mjacob <mjacob@FreeBSD.org> | 2007-02-23 23:13:46 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2007-02-23 23:13:46 +0000 |
| commit | 29bd153cd3b17ad2ab807f017bb42c5370b11b36 (patch) | |
| tree | 082dc7d6da7503d796a201c42840084611d2896d /sys/dev/mpt | |
| parent | 61da08318e61ba89994efed94d3375b1bdcff69b (diff) | |
| download | FreeBSD-src-29bd153cd3b17ad2ab807f017bb42c5370b11b36.zip FreeBSD-src-29bd153cd3b17ad2ab807f017bb42c5370b11b36.tar.gz | |
Redo previous newbus related change to be kinder to
multi-release support.
Diffstat (limited to 'sys/dev/mpt')
| -rw-r--r-- | sys/dev/mpt/mpt.h | 7 | ||||
| -rw-r--r-- | sys/dev/mpt/mpt_pci.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sys/dev/mpt/mpt.h b/sys/dev/mpt/mpt.h index d33d374..5a8292f 100644 --- a/sys/dev/mpt/mpt.h +++ b/sys/dev/mpt/mpt.h @@ -258,6 +258,13 @@ struct mpt_map_info { }; void mpt_map_rquest(void *, bus_dma_segment_t *, int, int); +/* **************************** NewBUS interrupt Crock ************************/ +#if __FreeBSD_version < 700031 +#define mpt_setup_intr(d, i, f, U, if, ifa, hp) \ + bus_setup_intr(d, i, f, if, ifa, hp) +#else +#define mpt_setup_intr bus_setup_intr +#endif /**************************** Kernel Thread Support ***************************/ #if __FreeBSD_version > 500005 diff --git a/sys/dev/mpt/mpt_pci.c b/sys/dev/mpt/mpt_pci.c index 2850d0b..d65c9c9 100644 --- a/sys/dev/mpt/mpt_pci.c +++ b/sys/dev/mpt/mpt_pci.c @@ -563,7 +563,7 @@ mpt_pci_attach(device_t dev) mpt_disable_ints(mpt); /* Register the interrupt handler */ - if (bus_setup_intr(dev, mpt->pci_irq, MPT_IFLAGS, NULL, mpt_pci_intr, + if (mpt_setup_intr(dev, mpt->pci_irq, MPT_IFLAGS, NULL, mpt_pci_intr, mpt, &mpt->ih)) { device_printf(dev, "could not setup interrupt\n"); goto bad; |
