summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound/midi
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2002-04-04 21:03:38 +0000
committerjhb <jhb@FreeBSD.org>2002-04-04 21:03:38 +0000
commitdb9aa81e239bb1c46b3b7ba560474cd954b78bf3 (patch)
treef7344c6a10fdc020dd02fe2ee1f244cb56f92bb6 /sys/dev/sound/midi
parent5b964d2945fa9a17daef9bc1e6dbbcb4f7154379 (diff)
downloadFreeBSD-src-db9aa81e239bb1c46b3b7ba560474cd954b78bf3.zip
FreeBSD-src-db9aa81e239bb1c46b3b7ba560474cd954b78bf3.tar.gz
Change callers of mtx_init() to pass in an appropriate lock type name. In
most cases NULL is passed, but in some cases such as network driver locks (which use the MTX_NETWORK_LOCK macro) and UMA zone locks, a name is used. Tested on: i386, alpha, sparc64
Diffstat (limited to 'sys/dev/sound/midi')
-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
3 files changed, 13 insertions, 13 deletions
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);
}
OpenPOWER on IntegriCloud