diff options
| author | mjacob <mjacob@FreeBSD.org> | 2006-09-03 01:26:55 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2006-09-03 01:26:55 +0000 |
| commit | 639497743e036a5c00c58f56d23ce30451e84c3c (patch) | |
| tree | 45fde791766f65fc906ef5f8e014e32937c08815 /sys/dev/isp/isp_pci.c | |
| parent | 90adef8e68b292028722a71467b979cea6453c4e (diff) | |
| download | FreeBSD-src-639497743e036a5c00c58f56d23ce30451e84c3c.zip FreeBSD-src-639497743e036a5c00c58f56d23ce30451e84c3c.tar.gz | |
Restore multi-version cleanliness.
Diffstat (limited to 'sys/dev/isp/isp_pci.c')
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 749ca33..6bb6956 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -1396,11 +1396,19 @@ imc(void *arg, bus_dma_segment_t *segs, int nseg, int error) #define ISP_NSEGS ((MAXPHYS / PAGE_SIZE) + 1) #if __FreeBSD_version < 500000 -#define isp_dma_tag_create bus_dma_tag_create +#define BUS_DMA_ROOTARG NULL +#define isp_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, z) \ + bus_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, z) +#elif __FreeBSD_version < 700020 +#define BUS_DMA_ROOTARG NULL +#define isp_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, z) \ + bus_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, \ + busdma_lock_mutex, &Giant, z) #else +#define BUS_DMA_ROOTARG bus_get_dma_tag(pcs->pci_dev) #define isp_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, z) \ bus_dma_tag_create(a, b, c, d, e, f, g, h, i, j, k, \ - busdma_lock_mutex, &Giant, z) + busdma_lock_mutex, &Giant, z) #endif static int @@ -1442,7 +1450,7 @@ isp_pci_mbxdma(ispsoftc_t *isp) #endif ISP_UNLOCK(isp); - if (isp_dma_tag_create(bus_get_dma_tag(pcs->pci_dev), 1, slim, llim, + if (isp_dma_tag_create(BUS_DMA_ROOTARG, 1, slim, llim, hlim, NULL, NULL, BUS_SPACE_MAXSIZE, ISP_NSEGS, slim, 0, &pcs->dmat)) { isp_prt(isp, ISP_LOGERR, "could not create master dma tag"); |
