summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/sound')
-rw-r--r--sys/dev/sound/isa/emu8000.c2
-rw-r--r--sys/dev/sound/isa/gusmidi.c2
-rw-r--r--sys/dev/sound/isa/mpu.c2
-rw-r--r--sys/dev/sound/isa/opl.c2
-rw-r--r--sys/dev/sound/isa/uartsio.c2
-rw-r--r--sys/dev/sound/midi/midi.c14
-rw-r--r--sys/dev/sound/midi/sequencer.c4
-rw-r--r--sys/dev/sound/midi/timer.c8
-rw-r--r--sys/dev/sound/pci/csamidi.c2
-rw-r--r--sys/dev/sound/pcm/sndstat.c2
10 files changed, 20 insertions, 20 deletions
diff --git a/sys/dev/sound/isa/emu8000.c b/sys/dev/sound/isa/emu8000.c
index 73ac39f..2442e2b 100644
--- a/sys/dev/sound/isa/emu8000.c
+++ b/sys/dev/sound/isa/emu8000.c
@@ -720,7 +720,7 @@ emu_attach(device_t dev)
/* Fill the softc for this unit. */
bcopy(&emu_synthinfo, &scp->synthinfo, sizeof(emu_synthinfo));
- mtx_init(&scp->mtx, "emumid", MTX_DEF);
+ mtx_init(&scp->mtx, "emumid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_SYNTH, &emu_op_desc, &midisynth_op_desc);
/* Fill the midi info. */
diff --git a/sys/dev/sound/isa/gusmidi.c b/sys/dev/sound/isa/gusmidi.c
index 37c99cc..e5788d1 100644
--- a/sys/dev/sound/isa/gusmidi.c
+++ b/sys/dev/sound/isa/gusmidi.c
@@ -194,7 +194,7 @@ gusmidi_init(device_t dev)
/* Fill the softc. */
scp->dev = dev;
- mtx_init(&scp->mtx, "gusmid", MTX_DEF);
+ mtx_init(&scp->mtx, "gusmid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &gusmidi_op_desc, &midisynth_op_desc);
/* Fill the midi info. */
diff --git a/sys/dev/sound/isa/mpu.c b/sys/dev/sound/isa/mpu.c
index f66466f..4f1f034 100644
--- a/sys/dev/sound/isa/mpu.c
+++ b/sys/dev/sound/isa/mpu.c
@@ -358,7 +358,7 @@ mpu_attach(device_t dev)
MIDI_DEBUG(printf("mpu: attaching.\n"));
- mtx_init(&scp->mtx, "mpumid", MTX_DEF);
+ mtx_init(&scp->mtx, "mpumid", NULL, MTX_DEF);
/* Allocate the resources, switch to uart mode. */
if (mpu_allocres(scp, dev) || mpu_uartmode(scp)) {
diff --git a/sys/dev/sound/isa/opl.c b/sys/dev/sound/isa/opl.c
index 6ee4e96..21eb453 100644
--- a/sys/dev/sound/isa/opl.c
+++ b/sys/dev/sound/isa/opl.c
@@ -717,7 +717,7 @@ opl_attach(device_t dev)
/* Fill the softc. */
bcopy(&opl_synthinfo, &scp->synthinfo, sizeof(opl_synthinfo));
snprintf(scp->synthinfo.name, 64, "Yamaha OPL%d FM", scp->model);
- mtx_init(&scp->mtx, "oplmid", MTX_DEF);
+ mtx_init(&scp->mtx, "oplmid", NULL, MTX_DEF);
bcopy(pv_map, scp->pv_map, sizeof(pv_map));
if (scp->model < MODEL_OPL3) { /* OPL2. */
scp->synthinfo.nr_voices = 9;
diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c
index 6554247..4170aeb 100644
--- a/sys/dev/sound/isa/uartsio.c
+++ b/sys/dev/sound/isa/uartsio.c
@@ -243,7 +243,7 @@ uartsio_attach(device_t dev)
/* Fill the softc. */
scp->dev = dev;
- mtx_init(&scp->mtx, "siomid", MTX_DEF);
+ mtx_init(&scp->mtx, "siomid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &uartsio_op_desc, &midisynth_op_desc);
/* Fill the midi info. */
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index 8b6e2a7..07d2660 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -200,7 +200,7 @@ get_mididev_info_unit(int unit)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
- mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
+ mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@@ -226,7 +226,7 @@ get_mididev_midi_unit(int unit)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
- mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
+ mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@@ -252,7 +252,7 @@ get_mididev_synth_unit(int unit)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
- mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
+ mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@@ -277,7 +277,7 @@ create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf)
/* XXX */
if (!midiinfo_mtx_init) {
midiinfo_mtx_init = 1;
- mtx_init(&midiinfo_mtx, "midinf", MTX_DEF);
+ mtx_init(&midiinfo_mtx, "midinf", NULL, MTX_DEF);
TAILQ_INIT(&midi_info);
}
@@ -290,9 +290,9 @@ create_mididev_info_unit(int type, mididev_info *mdinf, synthdev_info *syninf)
midibuf_init(&mdnew->midi_dbuf_in);
midibuf_init(&mdnew->midi_dbuf_out);
midibuf_init(&mdnew->midi_dbuf_passthru);
- mtx_init(&mdnew->flagqueue_mtx, "midflq", MTX_DEF);
- mtx_init(&mdnew->synth.vc_mtx, "synsvc", MTX_DEF);
- mtx_init(&mdnew->synth.status_mtx, "synsst", MTX_DEF);
+ mtx_init(&mdnew->flagqueue_mtx, "midflq", NULL, MTX_DEF);
+ mtx_init(&mdnew->synth.vc_mtx, "synsvc", NULL, MTX_DEF);
+ mtx_init(&mdnew->synth.status_mtx, "synsst", NULL, MTX_DEF);
mtx_lock(&midiinfo_mtx);
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index fa9f285..5115cc9 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -303,7 +303,7 @@ seq_init(void)
{
SEQ_DEBUG(printf("seq: initing.\n"));
- mtx_init(&seqinfo_mtx, "seqinf", MTX_DEF);
+ mtx_init(&seqinfo_mtx, "seqinf", NULL, MTX_DEF);
TAILQ_INIT(&seq_info);
seq_initunit(0);
@@ -2371,7 +2371,7 @@ create_seqdev_info_unit(int unit, seqdev_info *seq)
sdnew->unit = unit;
midibuf_init(&sdnew->midi_dbuf_in);
midibuf_init(&sdnew->midi_dbuf_out);
- mtx_init(&sdnew->flagqueue_mtx, "seqflq", MTX_DEF);
+ mtx_init(&sdnew->flagqueue_mtx, "seqflq", NULL, MTX_DEF);
cv_init(&sdnew->insync_cv, "seqins");
mtx_lock(&seqinfo_mtx);
diff --git a/sys/dev/sound/midi/timer.c b/sys/dev/sound/midi/timer.c
index 969153e..ba4bce0 100644
--- a/sys/dev/sound/midi/timer.c
+++ b/sys/dev/sound/midi/timer.c
@@ -141,7 +141,7 @@ create_timerdev_info_unit(timerdev_info *tmdinf)
/* XXX */
if (!timerinfo_mtx_init) {
timerinfo_mtx_init = 1;
- mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF);
+ mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF);
TAILQ_INIT(&timer_info);
}
@@ -150,7 +150,7 @@ create_timerdev_info_unit(timerdev_info *tmdinf)
if (tmdnew == NULL)
return NULL;
bcopy(tmdinf, tmdnew, sizeof(timerdev_info));
- mtx_init(&tmdnew->mtx, "tmrmtx", MTX_DEF);
+ mtx_init(&tmdnew->mtx, "tmrmtx", NULL, MTX_DEF);
mtx_lock(&timerinfo_mtx);
@@ -195,7 +195,7 @@ get_timerdev_info_unit(int unit)
/* XXX */
if (!timerinfo_mtx_init) {
timerinfo_mtx_init = 1;
- mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF);
+ mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF);
TAILQ_INIT(&timer_info);
}
@@ -224,7 +224,7 @@ get_timerdev_info(void)
/* XXX */
if (!timerinfo_mtx_init) {
timerinfo_mtx_init = 1;
- mtx_init(&timerinfo_mtx, "tmrinf", MTX_DEF);
+ mtx_init(&timerinfo_mtx, "tmrinf", NULL, MTX_DEF);
TAILQ_INIT(&timer_info);
}
diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c
index a0dd70c..be36048 100644
--- a/sys/dev/sound/pci/csamidi.c
+++ b/sys/dev/sound/pci/csamidi.c
@@ -192,7 +192,7 @@ csamidi_attach(device_t dev)
/* Fill the softc. */
scp->dev = dev;
- mtx_init(&scp->mtx, "csamid", MTX_DEF);
+ mtx_init(&scp->mtx, "csamid", NULL, MTX_DEF);
scp->devinfo = devinfo = create_mididev_info_unit(MDT_MIDI, &csamidi_op_desc, &midisynth_op_desc);
/* Fill the midi info. */
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index ae94737..5ff2080 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -343,7 +343,7 @@ sndstat_prepare(struct sbuf *s)
static int
sndstat_init(void)
{
- mtx_init(&sndstat_lock, "sndstat", 0);
+ mtx_init(&sndstat_lock, "sndstat", NULL, 0);
sndstat_dev = make_dev(&sndstat_cdevsw, SND_DEV_STATUS, UID_ROOT, GID_WHEEL, 0444, "sndstat");
return (sndstat_dev != 0)? 0 : ENXIO;
OpenPOWER on IntegriCloud