mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-11-03 09:01:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

return ENODEV for disconnected devices

Browse source 
Return -ENODEV instead of -ENOTTY for disconnected devices.
This commit is contained in:
Clemens Ladisch 2006-03-03 14:08:58 +00:00
parent d730ff3556
commit 8f61812f1c
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pcm/pcm.c
View file

@ -2231,7 +2231,7 @@ int snd_pcm_wait(snd_pcm_t *pcm, int timeout)
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE; return -ESTRPIPE;
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
return -ENOTTY; /* linux VFS does this? */ return -ENODEV;
default: default:
return 1; return 1;
} }
@ -2287,7 +2287,7 @@ int snd_pcm_wait_nocheck(snd_pcm_t *pcm, int timeout)
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE; return -ESTRPIPE;
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
return -ENOTTY; /* linux VFS does this? */ return -ENODEV;
default: default:
return -EIO; return -EIO;
} }
@ -6350,7 +6350,7 @@ snd_pcm_sframes_t snd_pcm_read_areas(snd_pcm_t *pcm, const snd_pcm_channel_area_
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE; return -ESTRPIPE;
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }
@ -6424,7 +6424,7 @@ snd_pcm_sframes_t snd_pcm_write_areas(snd_pcm_t *pcm, const snd_pcm_channel_area
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE; return -ESTRPIPE;
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }

6
src/pcm/pcm_dmix.c
View file

@ -338,7 +338,7 @@ static int snd_pcm_dmix_sync_ptr(snd_pcm_t *pcm)
switch (snd_pcm_state(dmix->spcm)) { switch (snd_pcm_state(dmix->spcm)) {
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
dmix->state = SND_PCM_STATE_DISCONNECTED; dmix->state = SND_PCM_STATE_DISCONNECTED;
return -ENOTTY; return -ENODEV;
default: default:
break; break;
} }
@ -445,7 +445,7 @@ static int snd_pcm_dmix_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
return -EPIPE; return -EPIPE;
case SNDRV_PCM_STATE_DISCONNECTED: case SNDRV_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }
@ -467,7 +467,7 @@ static int snd_pcm_dmix_hwsync(snd_pcm_t *pcm)
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
return -EPIPE; return -EPIPE;
case SNDRV_PCM_STATE_DISCONNECTED: case SNDRV_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }

6
src/pcm/pcm_dshare.c
View file

@ -166,7 +166,7 @@ static int snd_pcm_dshare_sync_ptr(snd_pcm_t *pcm)
switch (snd_pcm_state(dshare->spcm)) { switch (snd_pcm_state(dshare->spcm)) {
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
dshare->state = SNDRV_PCM_STATE_DISCONNECTED; dshare->state = SNDRV_PCM_STATE_DISCONNECTED;
return -ENOTTY; return -ENODEV;
default: default:
break; break;
} }
@ -272,7 +272,7 @@ static int snd_pcm_dshare_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
return -EPIPE; return -EPIPE;
case SNDRV_PCM_STATE_DISCONNECTED: case SNDRV_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }
@ -292,7 +292,7 @@ static int snd_pcm_dshare_hwsync(snd_pcm_t *pcm)
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
return -EPIPE; return -EPIPE;
case SNDRV_PCM_STATE_DISCONNECTED: case SNDRV_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }

8
src/pcm/pcm_dsnoop.c
View file

@ -119,7 +119,7 @@ static int snd_pcm_dsnoop_sync_ptr(snd_pcm_t *pcm)
switch (snd_pcm_state(dsnoop->spcm)) { switch (snd_pcm_state(dsnoop->spcm)) {
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED; dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED;
return -ENOTTY; return -ENODEV;
default: default:
break; break;
} }
@ -190,7 +190,7 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
return SND_PCM_STATE_SUSPENDED; return SND_PCM_STATE_SUSPENDED;
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED; dsnoop->state = SNDRV_PCM_STATE_DISCONNECTED;
return -ENOTTY; return -ENODEV;
default: default:
break; break;
} }
@ -215,7 +215,7 @@ static int snd_pcm_dsnoop_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp)
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
return -EPIPE; return -EPIPE;
case SNDRV_PCM_STATE_DISCONNECTED: case SNDRV_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }
@ -235,7 +235,7 @@ static int snd_pcm_dsnoop_hwsync(snd_pcm_t *pcm)
case SNDRV_PCM_STATE_XRUN: case SNDRV_PCM_STATE_XRUN:
return -EPIPE; return -EPIPE;
case SNDRV_PCM_STATE_DISCONNECTED: case SNDRV_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
return -EBADFD; return -EBADFD;
} }

2
src/pcm/pcm_local.h
View file

@ -288,7 +288,7 @@ static inline int snd_pcm_check_error(snd_pcm_t *pcm, int err)
case SND_PCM_STATE_SUSPENDED: case SND_PCM_STATE_SUSPENDED:
return -ESTRPIPE; return -ESTRPIPE;
case SND_PCM_STATE_DISCONNECTED: case SND_PCM_STATE_DISCONNECTED:
return -ENOTTY; return -ENODEV;
default: default:
break; break;
} }