32c32
< __FBSDID("$FreeBSD: head/sys/dev/isp/isp_sbus.c 166165 2007-01-21 19:32:51Z marius $");
---
> __FBSDID("$FreeBSD: head/sys/dev/isp/isp_sbus.c 166177 2007-01-23 00:02:29Z mjacob $");
477,493d476
< /*
< * Should be BUS_SPACE_MAXSIZE, but MAXPHYS is larger than BUS_SPACE_MAXSIZE
< */
< #define ISP_NSEGS ((MAXPHYS / PAGE_SIZE) + 1)
<
< #if __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(sbs->sbus_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)
< #endif
<
512,516c495,498
< if (isp_dma_tag_create(BUS_DMA_ROOTARG, 1, BUS_SPACE_MAXADDR_24BIT+1,
< BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR_32BIT,
< NULL, NULL, BUS_SPACE_MAXSIZE_32BIT, ISP_NSEGS,
< BUS_SPACE_MAXADDR_24BIT, 0,
< &sbs->dmat)) {
---
> if (isp_dma_tag_create(BUS_DMA_ROOTARG(sbs->sbus_dev), 1,
> BUS_SPACE_MAXADDR_24BIT+1, BUS_SPACE_MAXADDR_32BIT,
> BUS_SPACE_MAXADDR_32BIT, NULL, NULL, BUS_SPACE_MAXSIZE_32BIT,
> ISP_NSEGS, BUS_SPACE_MAXADDR_24BIT, 0, &sbs->dmat)) {