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/aha | |
| parent | dfebdcdf7ca22f2767534b7df4b828f55b6e754f (diff) | |
Notes
Diffstat (limited to 'sys/dev/aha')
| -rw-r--r-- | sys/dev/aha/aha.c | 10 | ||||
| -rw-r--r-- | sys/dev/aha/aha_isa.c | 4 | ||||
| -rw-r--r-- | sys/dev/aha/aha_mca.c | 4 |
3 files changed, 18 insertions, 0 deletions
diff --git a/sys/dev/aha/aha.c b/sys/dev/aha/aha.c index 7fe6f25b56af..931788327e51 100644 --- a/sys/dev/aha/aha.c +++ b/sys/dev/aha/aha.c @@ -62,6 +62,8 @@ #include <sys/systm.h> #include <sys/malloc.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <machine/bus_pio.h> #include <machine/bus.h> @@ -492,6 +494,8 @@ aha_init(struct aha_softc* aha) /* nsegments */ AHA_NSEG, /* maxsegsz */ BUS_SPACE_MAXSIZE_24BIT, /* flags */ BUS_DMA_ALLOCNOW, + /* lockfunc */ busdma_lock_mutex, + /* lockarg */ &Giant, &aha->buffer_dmat) != 0) { goto error_exit; } @@ -511,6 +515,8 @@ aha_init(struct aha_softc* aha) /* nsegments */ 1, /* maxsegsz */ BUS_SPACE_MAXSIZE_24BIT, /* flags */ 0, + /* lockfunc */ busdma_lock_mutex, + /* lockarg */ &Giant, &aha->mailbox_dmat) != 0) { goto error_exit; } @@ -551,6 +557,8 @@ aha_init(struct aha_softc* aha) /* nsegments */ 1, /* maxsegsz */ BUS_SPACE_MAXSIZE_24BIT, /* flags */ 0, + /* lockfunc */ busdma_lock_mutex, + /* lockarg */ &Giant, &aha->ccb_dmat) != 0) { goto error_exit; } @@ -585,6 +593,8 @@ aha_init(struct aha_softc* aha) /* nsegments */ 1, /* maxsegsz */ BUS_SPACE_MAXSIZE_24BIT, /* flags */ 0, + /* lockfunc */ busdma_lock_mutex, + /* lockarg */ &Giant, &aha->sg_dmat) != 0) { goto error_exit; } diff --git a/sys/dev/aha/aha_isa.c b/sys/dev/aha/aha_isa.c index 095bd1b8a730..fa5c9f657232 100644 --- a/sys/dev/aha/aha_isa.c +++ b/sys/dev/aha/aha_isa.c @@ -34,6 +34,8 @@ #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <machine/bus_pio.h> #include <machine/bus.h> @@ -255,6 +257,8 @@ aha_isa_attach(device_t dev) /* nsegments */ ~0, /* maxsegsz */ BUS_SPACE_MAXSIZE_24BIT, /* flags */ 0, + /* lockfunc */ busdma_lock_mutex, + /* lockarg */ &Giant, &aha->parent_dmat) != 0) { aha_free(aha); bus_release_resource(dev, SYS_RES_IOPORT, aha->portrid, aha->port); diff --git a/sys/dev/aha/aha_mca.c b/sys/dev/aha/aha_mca.c index 761504e7d4fd..10ce088e1f39 100644 --- a/sys/dev/aha/aha_mca.c +++ b/sys/dev/aha/aha_mca.c @@ -31,6 +31,8 @@ #include <sys/types.h> #include <sys/param.h> #include <sys/kernel.h> +#include <sys/lock.h> +#include <sys/mutex.h> #include <sys/module.h> #include <sys/bus.h> @@ -184,6 +186,8 @@ aha_mca_attach (device_t dev) /* nsegments */ ~0, /* maxsegsz */ BUS_SPACE_MAXSIZE_24BIT, /* flags */ 0, + /* lockfunc */ busdma_lock_mutex, + /* lockarg */ &Giant, &sc->parent_dmat); if (error) { device_printf(dev, "bus_dma_tag_create() failed!\n"); |