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.c6
-rw-r--r--sys/dev/sound/isa/gusmidi.c4
-rw-r--r--sys/dev/sound/isa/mpu.c2
-rw-r--r--sys/dev/sound/isa/opl.c6
-rw-r--r--sys/dev/sound/isa/sb16.c2
-rw-r--r--sys/dev/sound/isa/uartsio.c2
-rw-r--r--sys/dev/sound/midi/midi.c42
-rw-r--r--sys/dev/sound/midi/sequencer.c66
-rw-r--r--sys/dev/sound/pcm/channel.c4
-rw-r--r--sys/dev/sound/pcm/channel.h2
-rw-r--r--sys/dev/sound/pcm/dsp.c20
-rw-r--r--sys/dev/sound/pcm/mixer.c6
-rw-r--r--sys/dev/sound/pcm/mixer.h2
-rw-r--r--sys/dev/sound/pcm/sndstat.c4
14 files changed, 84 insertions, 84 deletions
diff --git a/sys/dev/sound/isa/emu8000.c b/sys/dev/sound/isa/emu8000.c
index 7067a8f..ea434e6 100644
--- a/sys/dev/sound/isa/emu8000.c
+++ b/sys/dev/sound/isa/emu8000.c
@@ -743,19 +743,19 @@ emupnp_attach(device_t dev)
}
static int
-emu_open(dev_t i_dev, int flags, int mode, struct proc *p)
+emu_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
return (0);
}
static int
-emu_close(dev_t i_dev, int flags, int mode, struct proc *p)
+emu_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
return (0);
}
static int
-emu_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+emu_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
diff --git a/sys/dev/sound/isa/gusmidi.c b/sys/dev/sound/isa/gusmidi.c
index 88193bf..797d168 100644
--- a/sys/dev/sound/isa/gusmidi.c
+++ b/sys/dev/sound/isa/gusmidi.c
@@ -214,7 +214,7 @@ gusmidi_init(device_t dev)
}
static int
-gusmidi_open(dev_t i_dev, int flags, int mode, struct proc *p)
+gusmidi_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
@@ -242,7 +242,7 @@ gusmidi_open(dev_t i_dev, int flags, int mode, struct proc *p)
}
static int
-gusmidi_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+gusmidi_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
diff --git a/sys/dev/sound/isa/mpu.c b/sys/dev/sound/isa/mpu.c
index a8cf490..14d1653 100644
--- a/sys/dev/sound/isa/mpu.c
+++ b/sys/dev/sound/isa/mpu.c
@@ -408,7 +408,7 @@ mpusbc_attach(device_t dev)
}
static int
-mpu_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+mpu_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
diff --git a/sys/dev/sound/isa/opl.c b/sys/dev/sound/isa/opl.c
index a4a0e66..5ebf974 100644
--- a/sys/dev/sound/isa/opl.c
+++ b/sys/dev/sound/isa/opl.c
@@ -764,7 +764,7 @@ oplsbc_attach(device_t dev)
}
static int
-opl_open(dev_t i_dev, int flags, int mode, struct proc *p)
+opl_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
@@ -805,7 +805,7 @@ opl_open(dev_t i_dev, int flags, int mode, struct proc *p)
}
static int
-opl_close(dev_t i_dev, int flags, int mode, struct proc *p)
+opl_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
@@ -838,7 +838,7 @@ opl_close(dev_t i_dev, int flags, int mode, struct proc *p)
}
static int
-opl_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+opl_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index cfc2363..53c4242 100644
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -150,7 +150,7 @@ sb_dspwr(struct sb_info *sb, u_char val)
}
}
#if __FreeBSD_version > 500000
- if (curproc->p_intr_nesting_level == 0)
+ if (curthread->td_intr_nesting_level == 0)
printf("sb_dspwr(0x%02x) timed out.\n", val);
#endif
return 0;
diff --git a/sys/dev/sound/isa/uartsio.c b/sys/dev/sound/isa/uartsio.c
index 297e986..3577ce5 100644
--- a/sys/dev/sound/isa/uartsio.c
+++ b/sys/dev/sound/isa/uartsio.c
@@ -261,7 +261,7 @@ uartsio_attach(device_t dev)
}
static int
-uartsio_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+uartsio_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
sc_p scp;
mididev_info *devinfo;
diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index ad62804..e577398 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -268,16 +268,16 @@ mididev_info_number(void)
*/
static int
-midiopen(dev_t i_dev, int flags, int mode, struct proc * p)
+midiopen(dev_t i_dev, int flags, int mode, struct thread *td)
{
int ret;
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_MIDIN:
- ret = midi_open(i_dev, flags, mode, p);
+ ret = midi_open(i_dev, flags, mode, td);
break;
case MIDI_DEV_STATUS:
- ret = midistat_open(i_dev, flags, mode, p);
+ ret = midistat_open(i_dev, flags, mode, td);
break;
default:
ret = ENXIO;
@@ -288,16 +288,16 @@ midiopen(dev_t i_dev, int flags, int mode, struct proc * p)
}
static int
-midiclose(dev_t i_dev, int flags, int mode, struct proc * p)
+midiclose(dev_t i_dev, int flags, int mode, struct thread *td)
{
int ret;
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_MIDIN:
- ret = midi_close(i_dev, flags, mode, p);
+ ret = midi_close(i_dev, flags, mode, td);
break;
case MIDI_DEV_STATUS:
- ret = midistat_close(i_dev, flags, mode, p);
+ ret = midistat_close(i_dev, flags, mode, td);
break;
default:
ret = ENXIO;
@@ -345,13 +345,13 @@ midiwrite(dev_t i_dev, struct uio * buf, int flag)
}
static int
-midiioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p)
+midiioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
int ret;
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_MIDIN:
- ret = midi_ioctl(i_dev, cmd, arg, mode, p);
+ ret = midi_ioctl(i_dev, cmd, arg, mode, td);
break;
default:
ret = ENXIO;
@@ -362,13 +362,13 @@ midiioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p)
}
static int
-midipoll(dev_t i_dev, int events, struct proc * p)
+midipoll(dev_t i_dev, int events, struct thread *td)
{
int ret;
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_MIDIN:
- ret = midi_poll(i_dev, events, p);
+ ret = midi_poll(i_dev, events, td);
break;
default:
ret = ENXIO;
@@ -383,7 +383,7 @@ midipoll(dev_t i_dev, int events, struct proc * p)
*/
int
-midi_open(dev_t i_dev, int flags, int mode, struct proc * p)
+midi_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
int dev, unit, ret;
mididev_info *d;
@@ -422,13 +422,13 @@ midi_open(dev_t i_dev, int flags, int mode, struct proc * p)
if (d->open == NULL)
ret = 0;
else
- ret = d->open(i_dev, flags, mode, p);
+ ret = d->open(i_dev, flags, mode, td);
return (ret);
}
int
-midi_close(dev_t i_dev, int flags, int mode, struct proc * p)
+midi_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
int dev, unit, ret;
mididev_info *d;
@@ -468,7 +468,7 @@ midi_close(dev_t i_dev, int flags, int mode, struct proc * p)
if (d->close == NULL)
ret = 0;
else
- ret = d->close(i_dev, flags, mode, p);
+ ret = d->close(i_dev, flags, mode, td);
return (ret);
}
@@ -570,7 +570,7 @@ midi_write(dev_t i_dev, struct uio * buf, int flag)
*/
int
-midi_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p)
+midi_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
int ret = ENOSYS, dev, unit;
mididev_info *d;
@@ -583,7 +583,7 @@ midi_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p)
return (ENXIO);
if (d->ioctl)
- ret = d->ioctl(i_dev, cmd, arg, mode, p);
+ ret = d->ioctl(i_dev, cmd, arg, mode, td);
if (ret != ENOSYS)
return ret;
@@ -715,7 +715,7 @@ midi_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p)
}
int
-midi_poll(dev_t i_dev, int events, struct proc * p)
+midi_poll(dev_t i_dev, int events, struct thread *td)
{
int unit, dev, ret, lim;
mididev_info *d;
@@ -742,7 +742,7 @@ midi_poll(dev_t i_dev, int events, struct proc * p)
lim = d->midi_dbuf_out.unit_size;
if (d->midi_dbuf_out.fl < lim)
/* No enough space, record select. */
- selrecord(p, &d->midi_dbuf_out.sel);
+ selrecord(td, &d->midi_dbuf_out.sel);
else
/* We can write now. */
ret |= events & (POLLOUT | POLLWRNORM);
@@ -758,7 +758,7 @@ midi_poll(dev_t i_dev, int events, struct proc * p)
lim = d->midi_dbuf_in.unit_size;
if (d->midi_dbuf_in.rl < lim)
/* No data ready, record select. */
- selrecord(p, &d->midi_dbuf_in.sel);
+ selrecord(td, &d->midi_dbuf_in.sel);
else
/* We can write now. */
ret |= events & (POLLIN | POLLRDNORM);
@@ -811,7 +811,7 @@ midi_sync(mididev_info *d)
*/
int
-midistat_open(dev_t i_dev, int flags, int mode, struct proc * p)
+midistat_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
if (midistatbusy)
return (EBUSY);
@@ -827,7 +827,7 @@ midistat_open(dev_t i_dev, int flags, int mode, struct proc * p)
}
int
-midistat_close(dev_t i_dev, int flags, int mode, struct proc * p)
+midistat_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
midistatbusy = 0;
diff --git a/sys/dev/sound/midi/sequencer.c b/sys/dev/sound/midi/sequencer.c
index d8beba2..ab35f81 100644
--- a/sys/dev/sound/midi/sequencer.c
+++ b/sys/dev/sound/midi/sequencer.c
@@ -131,7 +131,7 @@ struct seq_softc {
*/
int output_threshould; /* Sequence output threshould */
snd_sync_parm sync_parm; /* AIOSYNC parameter set */
- struct proc *sync_proc; /* AIOSYNCing process */
+ struct thread *sync_thread; /* AIOSYNCing thread */
};
typedef struct seq_softc *sc_p;
@@ -187,8 +187,8 @@ static int seq_local(sc_p scp, u_char *event);
static int seq_sysex(sc_p scp, u_char *event);
static void seq_timer(void *arg);
static int seq_reset(sc_p scp);
-static int seq_openmidi(sc_p scp, mididev_info *md, int flags, int mode, struct proc *p);
-static int seq_closemidi(sc_p scp, mididev_info *md, int flags, int mode, struct proc *p);
+static int seq_openmidi(sc_p scp, mididev_info *md, int flags, int mode, struct thread *p);
+static int seq_closemidi(sc_p scp, mididev_info *md, int flags, int mode, struct thread *p);
static void seq_panic(sc_p scp);
static int seq_sync(sc_p scp);
@@ -268,7 +268,7 @@ seq_initunit(int unit)
}
int
-seq_open(dev_t i_dev, int flags, int mode, struct proc *p)
+seq_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
int unit;
sc_p scp;
@@ -319,7 +319,7 @@ seq_open(dev_t i_dev, int flags, int mode, struct proc *p)
}
int
-seq_close(dev_t i_dev, int flags, int mode, struct proc *p)
+seq_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
int unit;
sc_p scp;
@@ -551,7 +551,7 @@ seq_write(dev_t i_dev, struct uio *buf, int flag)
}
int
-seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
int unit, midiunit, ret, tmp, arg2;
sc_p scp;
@@ -644,7 +644,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
TAILQ_FOREACH(md, &scp->midi_open, md_linkseq) {
if ((md->flags & MIDI_F_WRITING) != 0) {
arg2 = *(int *)arg;
- midi_ioctl(MIDIMKDEV(major(i_dev), md->unit, SND_DEV_MIDIN), cmd, (caddr_t)&arg2, mode, p);
+ midi_ioctl(MIDIMKDEV(major(i_dev), md->unit, SND_DEV_MIDIN), cmd, (caddr_t)&arg2, mode, td);
}
}
@@ -661,7 +661,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
TAILQ_FOREACH(md, &scp->midi_open, md_linkseq) {
if ((md->flags & MIDI_F_WRITING) != 0) {
arg2 = *(int *)arg;
- midi_ioctl(MIDIMKDEV(major(i_dev), md->unit, SND_DEV_MIDIN), cmd, (caddr_t)&arg2, mode, p);
+ midi_ioctl(MIDIMKDEV(major(i_dev), md->unit, SND_DEV_MIDIN), cmd, (caddr_t)&arg2, mode, td);
}
}
@@ -773,7 +773,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
case SNDCTL_SEQ_NRSYNTHS:
*(int *)arg = mididev_info_number();
@@ -790,7 +790,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
case SNDCTL_FM_4OP_ENABLE:
midiunit = *(int *)arg;
@@ -799,7 +799,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
case SNDCTL_SYNTH_INFO:
synthinfo = (struct synth_info *)arg;
@@ -809,7 +809,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
case SNDCTL_SEQ_OUTOFBAND:
event = (struct seq_event_rec *)arg;
@@ -825,7 +825,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
case SNDCTL_PMGR_IFACE:
patinfo = (struct patmgr_info *)arg;
@@ -835,7 +835,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
case SNDCTL_PMGR_ACCESS:
patinfo = (struct patmgr_info *)arg;
@@ -845,7 +845,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), midiunit, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
case SNDCTL_SEQ_THRESHOLD:
tmp = *(int *)arg;
@@ -871,7 +871,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
mtx_unlock(&sd->flagqueue_mtx);
if (ret != 0)
break;
- ret = midi_ioctl(MIDIMKDEV(major(i_dev), 0, SND_DEV_MIDIN), cmd, arg, mode, p);
+ ret = midi_ioctl(MIDIMKDEV(major(i_dev), 0, SND_DEV_MIDIN), cmd, arg, mode, td);
break;
}
@@ -879,7 +879,7 @@ seq_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
}
int
-seq_poll(dev_t i_dev, int events, struct proc *p)
+seq_poll(dev_t i_dev, int events, struct thread *td)
{
int unit, ret, lim;
sc_p scp;
@@ -916,7 +916,7 @@ seq_poll(dev_t i_dev, int events, struct proc *p)
lim = sd->midi_dbuf_out.unit_size;
if (sd->midi_dbuf_out.fl < lim)
/* No enough space, record select. */
- selrecord(p, &sd->midi_dbuf_out.sel);
+ selrecord(td, &sd->midi_dbuf_out.sel);
else
/* We can write now. */
ret |= events & (POLLOUT | POLLWRNORM);
@@ -932,7 +932,7 @@ seq_poll(dev_t i_dev, int events, struct proc *p)
lim = sd->midi_dbuf_in.unit_size;
if (sd->midi_dbuf_in.rl < lim)
/* No data ready, record select. */
- selrecord(p, &sd->midi_dbuf_in.sel);
+ selrecord(td, &sd->midi_dbuf_in.sel);
else
/* We can write now. */
ret |= events & (POLLIN | POLLRDNORM);
@@ -1849,7 +1849,7 @@ seq_timer(void *arg)
}
static int
-seq_openmidi(sc_p scp, mididev_info *md, int flags, int mode, struct proc *p)
+seq_openmidi(sc_p scp, mididev_info *md, int flags, int mode, struct thread *td)
{
int midiunit, err, insync;
@@ -1859,7 +1859,7 @@ seq_openmidi(sc_p scp, mididev_info *md, int flags, int mode, struct proc *p)
DEB(printf("seq_openmidi: opening midi unit %d.\n", midiunit));
- err = midi_open(MIDIMKDEV(MIDI_CDEV_MAJOR, midiunit, SND_DEV_MIDIN), flags, mode, p);
+ err = midi_open(MIDIMKDEV(MIDI_CDEV_MAJOR, midiunit, SND_DEV_MIDIN), flags, mode, td);
if (err != 0) {
printf("seq_openmidi: failed to open midi device %d.\n", midiunit);
return (err);
@@ -1887,7 +1887,7 @@ seq_openmidi(sc_p scp, mididev_info *md, int flags, int mode, struct proc *p)
}
static int
-seq_closemidi(sc_p scp, mididev_info *md, int flags, int mode, struct proc *p)
+seq_closemidi(sc_p scp, mididev_info *md, int flags, int mode, struct thread *td)
{
int midiunit, insync;
@@ -1901,7 +1901,7 @@ seq_closemidi(sc_p scp, mididev_info *md, int flags, int mode, struct proc *p)
DEB(printf("seq_closemidi: closing midi unit %d.\n", midiunit));
- midi_close(MIDIMKDEV(MIDI_CDEV_MAJOR, midiunit, SND_DEV_MIDIN), flags, mode, p);
+ midi_close(MIDIMKDEV(MIDI_CDEV_MAJOR, midiunit, SND_DEV_MIDIN), flags, mode, td);
mtx_lock(&md->flagqueue_mtx);
md->intr = NULL;
md->intrarg = NULL;
@@ -2152,7 +2152,7 @@ lookup_mididev(sc_p scp, int unit, int mode, mididev_info **mdp)
if (md->unit == unit) {
*mdp = md;
if (mode == LOOKUP_CLOSE)
- return seq_closemidi(scp, md, scp->fflags, MIDIDEV_MODE, curproc);
+ return seq_closemidi(scp, md, scp->fflags, MIDIDEV_MODE, curthread);
return (md != NULL && MIDICONFED(md)) ? 0 : ENXIO;
}
@@ -2162,7 +2162,7 @@ lookup_mididev(sc_p scp, int unit, int mode, mididev_info **mdp)
md = get_mididev_info_unit(unit);
if (md != NULL) {
*mdp = md;
- ret = seq_openmidi(scp, md, scp->fflags, MIDIDEV_MODE, curproc);
+ ret = seq_openmidi(scp, md, scp->fflags, MIDIDEV_MODE, curthread);
return ret;
}
}
@@ -2172,22 +2172,22 @@ lookup_mididev(sc_p scp, int unit, int mode, mididev_info **mdp)
/* XXX These functions are actually redundant. */
static int
-seqopen(dev_t i_dev, int flags, int mode, struct proc * p)
+seqopen(dev_t i_dev, int flags, int mode, struct thread *td)
{
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_SEQ:
- return seq_open(i_dev, flags, mode, p);
+ return seq_open(i_dev, flags, mode, td);
}
return (ENXIO);
}
static int
-seqclose(dev_t i_dev, int flags, int mode, struct proc * p)
+seqclose(dev_t i_dev, int flags, int mode, struct thread *td)
{
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_SEQ:
- return seq_close(i_dev, flags, mode, p);
+ return seq_close(i_dev, flags, mode, td);
}
return (ENXIO);
@@ -2216,22 +2216,22 @@ seqwrite(dev_t i_dev, struct uio * buf, int flag)
}
static int
-seqioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc * p)
+seqioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_SEQ:
- return seq_ioctl(i_dev, cmd, arg, mode, p);
+ return seq_ioctl(i_dev, cmd, arg, mode, td);
}
return (ENXIO);
}
static int
-seqpoll(dev_t i_dev, int events, struct proc * p)
+seqpoll(dev_t i_dev, int events, struct thread *td)
{
switch (MIDIDEV(i_dev)) {
case MIDI_DEV_SEQ:
- return seq_poll(i_dev, events, p);
+ return seq_poll(i_dev, events, td);
}
return (ENXIO);
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 8cf2d88..dc843ee 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -498,7 +498,7 @@ chn_sync(struct pcm_channel *c, int threshold)
/* called externally, handle locking */
int
-chn_poll(struct pcm_channel *c, int ev, struct proc *p)
+chn_poll(struct pcm_channel *c, int ev, struct thread *td)
{
struct snd_dbuf *bs = c->bufsoft;
int ret;
@@ -510,7 +510,7 @@ chn_poll(struct pcm_channel *c, int ev, struct proc *p)
if (chn_polltrigger(c) && chn_pollreset(c))
ret = ev;
else
- selrecord(p, sndbuf_getsel(bs));
+ selrecord(curthread, sndbuf_getsel(bs));
return ret;
}
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 6743f4a..118cf5d 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -73,7 +73,7 @@ int chn_read(struct pcm_channel *c, struct uio *buf);
u_int32_t chn_start(struct pcm_channel *c, int force);
int chn_sync(struct pcm_channel *c, int threshold);
int chn_flush(struct pcm_channel *c);
-int chn_poll(struct pcm_channel *c, int ev, struct proc *p);
+int chn_poll(struct pcm_channel *c, int ev, struct thread *td);
int chn_init(struct pcm_channel *c, void *devinfo, int dir);
int chn_kill(struct pcm_channel *c);
diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
index 6a4bfc6..4ae4e67 100644
--- a/sys/dev/sound/pcm/dsp.c
+++ b/sys/dev/sound/pcm/dsp.c
@@ -169,7 +169,7 @@ relchns(dev_t dev, struct pcm_channel *rdch, struct pcm_channel *wrch, u_int32_t
}
static int
-dsp_open(dev_t i_dev, int flags, int mode, struct proc *p)
+dsp_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
struct pcm_channel *rdch, *wrch;
struct snddev_info *d;
@@ -229,9 +229,9 @@ dsp_open(dev_t i_dev, int flags, int mode, struct proc *p)
if (rdch == NULL) {
/* not already open, try to get a channel */
if (devtype == SND_DEV_DSPREC)
- rdch = pcm_chnalloc(d, PCMDIR_REC, p->p_pid, PCMCHAN(i_dev));
+ rdch = pcm_chnalloc(d, PCMDIR_REC, td->td_proc->p_pid, PCMCHAN(i_dev));
else
- rdch = pcm_chnalloc(d, PCMDIR_REC, p->p_pid, -1);
+ rdch = pcm_chnalloc(d, PCMDIR_REC, td->td_proc->p_pid, -1);
if (!rdch) {
/* no channel available, exit */
pcm_unlock(d);
@@ -251,7 +251,7 @@ dsp_open(dev_t i_dev, int flags, int mode, struct proc *p)
/* open for write */
if (wrch == NULL) {
/* not already open, try to get a channel */
- wrch = pcm_chnalloc(d, PCMDIR_PLAY, p->p_pid, -1);
+ wrch = pcm_chnalloc(d, PCMDIR_PLAY, td->td_proc->p_pid, -1);
if (!wrch) {
/* no channel available */
if (rdch && (flags & FREAD)) {
@@ -310,7 +310,7 @@ dsp_open(dev_t i_dev, int flags, int mode, struct proc *p)
}
static int
-dsp_close(dev_t i_dev, int flags, int mode, struct proc *p)
+dsp_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
struct pcm_channel *rdch, *wrch;
struct snddev_info *d;
@@ -429,7 +429,7 @@ dsp_write(dev_t i_dev, struct uio *buf, int flag)
}
static int
-dsp_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+dsp_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
struct pcm_channel *wrch, *rdch;
struct snddev_info *d;
@@ -446,7 +446,7 @@ dsp_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
dev_t pdev;
pdev = makedev(SND_CDEV_MAJOR, PCMMKMINOR(PCMUNIT(i_dev), SND_DEV_CTL, 0));
- return mixer_ioctl(pdev, cmd, arg, mode, p);
+ return mixer_ioctl(pdev, cmd, arg, mode, td);
}
s = spltty();
@@ -961,7 +961,7 @@ dsp_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
}
static int
-dsp_poll(dev_t i_dev, int events, struct proc *p)
+dsp_poll(dev_t i_dev, int events, struct thread *td)
{
struct pcm_channel *wrch = NULL, *rdch = NULL;
intrmask_t s;
@@ -974,12 +974,12 @@ dsp_poll(dev_t i_dev, int events, struct proc *p)
if (wrch) {
e = (events & (POLLOUT | POLLWRNORM));
if (e)
- ret |= chn_poll(wrch, e, p);
+ ret |= chn_poll(wrch, e, td);
}
if (rdch) {
e = (events & (POLLIN | POLLRDNORM));
if (e)
- ret |= chn_poll(rdch, e, p);
+ ret |= chn_poll(rdch, e, td);
}
relchns(i_dev, rdch, wrch, SD_F_PRIO_RD | SD_F_PRIO_WR);
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index cddb515..d4894a5 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -392,7 +392,7 @@ mixer_hwvol_step(device_t dev, int left_step, int right_step)
/* ----------------------------------------------------------------------- */
static int
-mixer_open(dev_t i_dev, int flags, int mode, struct proc *p)
+mixer_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
struct snd_mixer *m;
intrmask_t s;
@@ -409,7 +409,7 @@ mixer_open(dev_t i_dev, int flags, int mode, struct proc *p)
}
static int
-mixer_close(dev_t i_dev, int flags, int mode, struct proc *p)
+mixer_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
struct snd_mixer *m;
intrmask_t s;
@@ -431,7 +431,7 @@ mixer_close(dev_t i_dev, int flags, int mode, struct proc *p)
}
int
-mixer_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p)
+mixer_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td)
{
struct snd_mixer *m;
intrmask_t s;
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 054d79d..4f51bf2 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -29,7 +29,7 @@
int mixer_init(device_t dev, kobj_class_t cls, void *devinfo);
int mixer_uninit(device_t dev);
int mixer_reinit(device_t dev);
-int mixer_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct proc *p);
+int mixer_ioctl(dev_t i_dev, u_long cmd, caddr_t arg, int mode, struct thread *td);
int mixer_hwvol_init(device_t dev);
void mixer_hwvol_mute(device_t dev);
diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c
index dd786e9..b3b0999 100644
--- a/sys/dev/sound/pcm/sndstat.c
+++ b/sys/dev/sound/pcm/sndstat.c
@@ -109,7 +109,7 @@ SYSCTL_PROC(_hw_snd, OID_AUTO, verbose, CTLTYPE_INT | CTLFLAG_RW,
0, sizeof(int), sysctl_hw_sndverbose, "I", "");
static int
-sndstat_open(dev_t i_dev, int flags, int mode, struct proc *p)
+sndstat_open(dev_t i_dev, int flags, int mode, struct thread *td)
{
intrmask_t s;
int err;
@@ -137,7 +137,7 @@ sndstat_open(dev_t i_dev, int flags, int mode, struct proc *p)
}
static int
-sndstat_close(dev_t i_dev, int flags, int mode, struct proc *p)
+sndstat_close(dev_t i_dev, int flags, int mode, struct thread *td)
{
intrmask_t s;
OpenPOWER on IntegriCloud