diff options
| author | Scott Long <scottl@FreeBSD.org> | 2003-07-01 15:52:06 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2003-07-01 15:52:06 +0000 |
| commit | f6b1c44d1f70d5f298b911f2c1dcd802b0d11339 (patch) | |
| tree | 1bbd76935b6d5917753df7328c69bd2f3c75f15a /sys/dev/ida | |
| parent | dfebdcdf7ca22f2767534b7df4b828f55b6e754f (diff) | |
Notes
Diffstat (limited to 'sys/dev/ida')
| -rw-r--r-- | sys/dev/ida/ida.c | 6 | ||||
| -rw-r--r-- | sys/dev/ida/ida_eisa.c | 2 | ||||
| -rw-r--r-- | sys/dev/ida/ida_pci.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/sys/dev/ida/ida.c b/sys/dev/ida/ida.c index c1417495d206..ea273a14c489 100644 --- a/sys/dev/ida/ida.c +++ b/sys/dev/ida/ida.c @@ -205,7 +205,8 @@ ida_init(struct ida_softc *ida) /*filter*/NULL, /*filterarg*/NULL, IDA_QCB_MAX * sizeof(struct ida_hardware_qcb), /*nsegments*/1, /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT, - /*flags*/0, &ida->hwqcb_dmat); + /*flags*/0, /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, + &ida->hwqcb_dmat); if (error) return (ENOMEM); @@ -215,7 +216,8 @@ ida_init(struct ida_softc *ida) /*lowaddr*/BUS_SPACE_MAXADDR, /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/MAXBSIZE, /*nsegments*/IDA_NSEG, - /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT, /*flags*/0, &ida->buffer_dmat); + /*maxsegsz*/BUS_SPACE_MAXSIZE_32BIT, /*flags*/0, + /*lockfunc*/busdma_lock_mutex, /*lockarg*/&Giant, &ida->buffer_dmat); if (error) return (ENOMEM); diff --git a/sys/dev/ida/ida_eisa.c b/sys/dev/ida/ida_eisa.c index a6f3419e408c..0c7ac5faa45e 100644 --- a/sys/dev/ida/ida_eisa.c +++ b/sys/dev/ida/ida_eisa.c @@ -303,6 +303,8 @@ ida_eisa_attach(device_t dev) /* nsegments */ IDA_NSEG, /* maxsegsize */ BUS_SPACE_MAXSIZE_32BIT, /* flags */ BUS_DMA_ALLOCNOW, + /* lockfunc */ NULL, + /* lockarg */ NULL, &ida->parent_dmat); if (error != 0) { diff --git a/sys/dev/ida/ida_pci.c b/sys/dev/ida/ida_pci.c index c836de0634a3..92cdba7e7f4a 100644 --- a/sys/dev/ida/ida_pci.c +++ b/sys/dev/ida/ida_pci.c @@ -267,7 +267,7 @@ ida_pci_attach(device_t dev) /*highaddr*/BUS_SPACE_MAXADDR, /*filter*/NULL, /*filterarg*/NULL, /*maxsize*/MAXBSIZE, /*nsegments*/IDA_NSEG, /*maxsegsize*/BUS_SPACE_MAXSIZE_32BIT, /*flags*/BUS_DMA_ALLOCNOW, - &ida->parent_dmat); + /*lockfunc*/NULL, /*lockarg*/NULL, &ida->parent_dmat); if (error != 0) { device_printf(dev, "can't allocate DMA tag\n"); ida_free(ida); |