mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added POLLNVAL to poll->events

Browse source
This commit is contained in:
Jaroslav Kysela 2002-11-30 09:47:20 +00:00
parent d0526d603c
commit 098932ce57
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/control/control.c
View file

@ -178,7 +178,7 @@ int snd_ctl_poll_descriptors(snd_ctl_t *ctl, struct pollfd *pfds, unsigned int s
assert(ctl && pfds);
if (space > 0) {
pfds->fd = ctl->poll_fd;
pfds->events = POLLIN|POLLERR;
pfds->events = POLLIN|POLLERR|POLLNVAL;
return 1;
}
return 0;

6
src/hwdep/hwdep.c
View file

@ -265,13 +265,13 @@ int snd_hwdep_poll_descriptors(snd_hwdep_t *hwdep, struct pollfd *pfds, unsigned
pfds->fd = hwdep->poll_fd;
switch (hwdep->mode & O_ACCMODE) {
case O_WRONLY:
pfds->events = POLLOUT|POLLERR;
pfds->events = POLLOUT|POLLERR|POLLNVAL;
break;
case O_RDONLY:
pfds->events = POLLIN|POLLERR;
pfds->events = POLLIN|POLLERR|POLLNVAL;
break;
case O_RDWR:
pfds->events = POLLOUT|POLLIN|POLLERR;
pfds->events = POLLOUT|POLLIN|POLLERR|POLLNVAL;
break;
default:
return -EIO;

2
src/mixer/mixer.c
View file

@ -616,7 +616,7 @@ int snd_mixer_poll_descriptors_revents(snd_mixer_t *mixer, struct pollfd *pfds,
return -EINVAL;
res = 0;
for (idx = 0; idx < nfds; idx++)
res |= pfds->revents & (POLLIN|POLLERR);
res |= pfds->revents & (POLLIN|POLLERR|POLLNVAL);
*revents = res;
return 0;
}

2
src/pcm/pcm.c
View file

@ -1178,7 +1178,7 @@ int snd_pcm_poll_descriptors(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int s
assert(pcm && pfds);
if (space >= 1 && pfds) {
pfds->fd = pcm->poll_fd;
pfds->events = pcm->stream == SND_PCM_STREAM_PLAYBACK ? (POLLOUT|POLLERR) : (POLLIN|POLLERR);
pfds->events = pcm->stream == SND_PCM_STREAM_PLAYBACK ? (POLLOUT|POLLERR|POLLNVAL) : (POLLIN|POLLERR|POLLNVAL);
} else
return 0;
return 1;

2
src/rawmidi/rawmidi.c
View file

@ -411,7 +411,7 @@ int snd_rawmidi_poll_descriptors(snd_rawmidi_t *rawmidi, struct pollfd *pfds, un
assert(rawmidi);
if (space >= 1) {
pfds->fd = rawmidi->poll_fd;
pfds->events = rawmidi->stream == SND_RAWMIDI_STREAM_OUTPUT ? (POLLOUT|POLLERR) : (POLLIN|POLLERR);
pfds->events = rawmidi->stream == SND_RAWMIDI_STREAM_OUTPUT ? (POLLOUT|POLLERR|POLLNVAL) : (POLLIN|POLLERR|POLLNVAL);
return 1;
}
return 0;

4
src/seq/seq.c
View file

@ -315,11 +315,11 @@ int snd_seq_poll_descriptors(snd_seq_t *seq, struct pollfd *pfds, unsigned int s
assert(seq);
if ((events & POLLIN) && space >= 1) {
assert(seq->streams & SND_SEQ_OPEN_INPUT);
revents |= POLLIN|POLLERR;
revents |= POLLIN|POLLERR|POLLNVAL;
}
if ((events & POLLOUT) && space >= 1) {
assert(seq->streams & SND_SEQ_OPEN_OUTPUT);
revents |= POLLOUT|POLLERR;
revents |= POLLOUT|POLLERR|POLLNVAL;
}
if (!revents)
return 0;

6
src/timer/timer.c
View file

@ -297,13 +297,13 @@ int snd_timer_poll_descriptors(snd_timer_t *timer, struct pollfd *pfds, unsigned
pfds->fd = timer->poll_fd;
switch (timer->mode & O_ACCMODE) {
case O_WRONLY:
pfds->events = POLLOUT|POLLERR;
pfds->events = POLLOUT|POLLERR|POLLNVAL;
break;
case O_RDONLY:
pfds->events = POLLIN|POLLERR;
pfds->events = POLLIN|POLLERR|POLLNVAL;
break;
case O_RDWR:
pfds->events = POLLOUT|POLLIN|POLLERR;
pfds->events = POLLOUT|POLLIN|POLLERR|POLLNVAL;
break;
default:
return -EIO;