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

Fixed poll related problem which was exhibited by running

Browse Source 
amp (audio mpeg player) and with cards such as SB.
This commit is contained in:
Amancio Hasty 1997-11-24 07:31:20 +00:00
parent 7d70b772c1
commit b237a8422d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=31384
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/i386/isa/sound/audio.c
View File

@ -188,7 +188,6 @@ audio_write(int dev, struct fileinfo * file, snd_rw_buf * buf, int count)
p = 0;
c = count;
if ((audio_mode[dev] & AM_READ) &&
!(audio_devs[dev]->flags & DMA_DUPLEX)) { /* Direction change */
wr_buff_no[dev] = -1;
@ -253,7 +252,6 @@ audio_write(int dev, struct fileinfo * file, snd_rw_buf * buf, int count)
wr_buff_no[dev] = -1;
}
}
return count;
}
@ -442,7 +440,7 @@ audio_poll(int dev, struct fileinfo * file, int events, select_table * wait)
{
dev = dev >> 4;
if (events & (POLLOUT | POLLWRNORM)) {
if (events & (POLLIN | POLLRDNORM)) {
if ((audio_mode[dev] & AM_WRITE) &&
!(audio_devs[dev]->flags & DMA_DUPLEX))
return 0; /* Not recording */
@ -451,7 +449,7 @@ audio_poll(int dev, struct fileinfo * file, int events, select_table * wait)
return (DMAbuf_poll(dev, file, events, wait));
}
if (events & (POLLIN | POLLRDNORM)) {
if (events & (POLLOUT | POLLWRNORM)) {
if ((audio_mode[dev] & AM_READ) &&
!(audio_devs[dev]->flags & DMA_DUPLEX))
return 0; /* Wrong direction */