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

Redo previous newbus related change to be kinder to

Browse Source 
multi-release support.
This commit is contained in:
Matt Jacob 2007-02-23 23:13:46 +00:00
parent 6e50e38fcc
commit 5f53837698
5 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/isp/isp_freebsd.h
View File

@ -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)

3
sys/dev/isp/isp_pci.c
View File

@ -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;
}

2
sys/dev/isp/isp_sbus.c
View File

@ -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;

7
sys/dev/mpt/mpt.h
View File

@ -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

2
sys/dev/mpt/mpt_pci.c
View File

@ -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;