d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow /dev/dsp to be opened seperately for reading and writing.

Browse Source
This commit is contained in:
Cameron Grant 2000-04-05 01:13:42 +00:00
parent 119a24a450
commit bd18f33408
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=59021
3 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/dev/sound/pcm/datatypes.h
View File

@ -137,6 +137,7 @@ typedef void (pcm_swap_t)(void *data, int dir);
/* descriptor of audio device */
struct _snddev_info {
pcm_channel *play, *rec, **aplay, **arec, fakechan;
int *ref;
unsigned playcount, reccount, chancount;
snd_mixer mixer;
u_long magic;

32
sys/dev/sound/pcm/dsp.c
View File

@ -57,6 +57,7 @@ getchns(snddev_info *d, int chan, pcm_channel **rdch, pcm_channel **wrch)
if ((d->flags & SD_F_SIMPLEX) && (d->flags & SD_F_PRIO_SET)) {
*rdch = (d->flags & SD_F_PRIO_RD)? d->arec[chan] : &d->fakechan;
*wrch = (d->flags & SD_F_PRIO_WR)? d->aplay[chan] : &d->fakechan;
d->fakechan.flags |= CHN_F_BUSY;
} else {
*rdch = d->arec[chan];
*wrch = d->aplay[chan];
@ -76,24 +77,31 @@ setchns(snddev_info *d, int chan)
int
dsp_open(snddev_info *d, int chan, int oflags, int devtype)
{
pcm_channel *rdch = NULL, *wrch = NULL;
pcm_channel *rdch, *wrch;
u_int32_t fmt;
if (chan >= d->chancount) return ENODEV;
if (d->aplay[chan] || d->arec[chan]) return EBUSY;
if ((d->flags & SD_F_SIMPLEX) && (d->ref[chan] > 0)) return EBUSY;
rdch = d->arec[chan];
wrch = d->aplay[chan];
if (oflags & FREAD) {
rdch = allocchn(d, PCMDIR_REC);
if (!rdch) return EBUSY;
if (rdch == NULL) {
rdch = allocchn(d, PCMDIR_REC);
if (!rdch) return EBUSY;
} else return EBUSY;
}
if (oflags & FWRITE) {
wrch = allocchn(d, PCMDIR_PLAY);
if (!wrch) {
if (rdch) rdch->flags &= ~CHN_F_BUSY;
return EBUSY;
}
if (wrch == NULL) {
wrch = allocchn(d, PCMDIR_PLAY);
if (!wrch && (oflags & FREAD)) {
rdch->flags &= ~CHN_F_BUSY;
return EBUSY;
}
} else return EBUSY;
}
d->aplay[chan] = wrch;
d->arec[chan] = rdch;
d->ref[chan]++;
switch (devtype) {
case SND_DEV_DSP16:
fmt = AFMT_S16_LE;
@ -115,7 +123,7 @@ dsp_open(snddev_info *d, int chan, int oflags, int devtype)
return ENXIO;
}
if (rdch) {
if (rdch && (oflags & FREAD)) {
chn_reset(rdch);
if (oflags & O_NONBLOCK) rdch->flags |= CHN_F_NBIO;
if (fmt) {
@ -125,7 +133,7 @@ dsp_open(snddev_info *d, int chan, int oflags, int devtype)
rdch->blocksize = 2048;
}
}
if (wrch) {
if (wrch && (oflags & FWRITE)) {
chn_reset(wrch);
if (oflags & O_NONBLOCK) wrch->flags |= CHN_F_NBIO;
if (fmt) {
@ -143,6 +151,8 @@ dsp_close(snddev_info *d, int chan, int devtype)
{
pcm_channel *rdch, *wrch;
d->ref[chan]--;
if (d->ref[chan]) return 0;
d->flags &= ~SD_F_TRANSIENT;
rdch = d->arec[chan];
wrch = d->aplay[chan];

5
sys/dev/sound/pcm/sound.c
View File

@ -183,6 +183,11 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec)
d->arec = (pcm_channel **)malloc(sz, M_DEVBUF, M_NOWAIT);
if (!d->arec) goto no;
bzero(d->arec, sz);
sz = (numplay + numrec) * sizeof(int);
d->ref = (int *)malloc(sz, M_DEVBUF, M_NOWAIT);
if (!d->ref) goto no;
bzero(d->ref, sz);
}
if (numplay > 0) {