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

don't panic if we try to add a channel we said we wouldn't

Browse Source
This commit is contained in:
cg 2000-06-06 22:24:53 +00:00
parent 1a9a581259
commit 37f5f22631
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,11 @@ pcm_addchan(device_t dev, int dir, pcm_channel *templ, void *devinfo)
snddev_info *d = device_get_softc(dev);
pcm_channel *ch;
if (((dir == PCMDIR_PLAY)? d->play : d->rec) == NULL) {
device_printf(dev, "bad channel add (%s)\n",
(dir == PCMDIR_PLAY)? "play" : "record");
return 1;
}
ch = (dir == PCMDIR_PLAY)? &d->play[d->playcount] : &d->rec[d->reccount];
*ch = *templ;
if (chn_init(ch, devinfo, dir)) {
@ -193,14 +198,16 @@ pcm_register(device_t dev, void *devinfo, int numplay, int numrec)
M_DEVBUF, M_NOWAIT);
if (!d->play) goto no;
bzero(d->play, numplay * sizeof(pcm_channel));
}
} else
d->play = NULL;
if (numrec > 0) {
d->rec = (pcm_channel *)malloc(numrec * sizeof(pcm_channel),
M_DEVBUF, M_NOWAIT);
if (!d->rec) goto no;
bzero(d->rec, numrec * sizeof(pcm_channel));
}
} else
d->rec = NULL;
if (numplay == 0 || numrec == 0)
d->flags |= SD_F_SIMPLEX;