Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ba63929 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: pcm: Check PCM state by a common helper function 



Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2ae48354

sound/core/pcm_lib.c

+29 −52
Original line number Diff line number Diff line
@@ -2019,6 +2019,22 @@ typedef int (*transfer_f)(struct snd_pcm_substream *substream, unsigned int hwof 
			  unsigned long data, unsigned int off,

			  snd_pcm_uframes_t size);



static int pcm_accessible_state(struct snd_pcm_runtime *runtime)

{

	switch (runtime->status->state) {

	case SNDRV_PCM_STATE_PREPARED:

	case SNDRV_PCM_STATE_RUNNING:

	case SNDRV_PCM_STATE_PAUSED:

		return 0;

	case SNDRV_PCM_STATE_XRUN:

		return -EPIPE;

	case SNDRV_PCM_STATE_SUSPENDED:

		return -ESTRPIPE;

	default:

		return -EBADFD;

	}

}



static snd_pcm_sframes_t snd_pcm_lib_write1(struct snd_pcm_substream *substream, 

					    unsigned long data,

					    snd_pcm_uframes_t size,
@@ -2035,21 +2051,9 @@ static snd_pcm_sframes_t snd_pcm_lib_write1(struct snd_pcm_substream *substream, 
		return 0;



	snd_pcm_stream_lock_irq(substream);

	switch (runtime->status->state) {

	case SNDRV_PCM_STATE_PREPARED:

	case SNDRV_PCM_STATE_RUNNING:

	case SNDRV_PCM_STATE_PAUSED:

		break;

	case SNDRV_PCM_STATE_XRUN:

		err = -EPIPE;

		goto _end_unlock;

	case SNDRV_PCM_STATE_SUSPENDED:

		err = -ESTRPIPE;

		goto _end_unlock;

	default:

		err = -EBADFD;

	err = pcm_accessible_state(runtime);

	if (err < 0)

		goto _end_unlock;

	}



	runtime->twake = runtime->control->avail_min ? : 1;

	if (runtime->status->state == SNDRV_PCM_STATE_RUNNING)
@@ -2085,16 +2089,9 @@ static snd_pcm_sframes_t snd_pcm_lib_write1(struct snd_pcm_substream *substream, 
		snd_pcm_stream_lock_irq(substream);

		if (err < 0)

			goto _end_unlock;

		switch (runtime->status->state) {

		case SNDRV_PCM_STATE_XRUN:

			err = -EPIPE;

			goto _end_unlock;

		case SNDRV_PCM_STATE_SUSPENDED:

			err = -ESTRPIPE;

		err = pcm_accessible_state(runtime);

		if (err < 0)

			goto _end_unlock;

		default:

			break;

		}

		appl_ptr += frames;

		if (appl_ptr >= runtime->boundary)

			appl_ptr -= runtime->boundary;
@@ -2265,26 +2262,13 @@ static snd_pcm_sframes_t snd_pcm_lib_read1(struct snd_pcm_substream *substream, 
		return 0;



	snd_pcm_stream_lock_irq(substream);

	switch (runtime->status->state) {

	case SNDRV_PCM_STATE_PREPARED:

		if (size >= runtime->start_threshold) {

			err = snd_pcm_start(substream);

	err = pcm_accessible_state(runtime);

	if (err < 0)

		goto _end_unlock;

		}

		break;

	case SNDRV_PCM_STATE_DRAINING:

	case SNDRV_PCM_STATE_RUNNING:

	case SNDRV_PCM_STATE_PAUSED:

		break;

	case SNDRV_PCM_STATE_XRUN:

		err = -EPIPE;

		goto _end_unlock;

	case SNDRV_PCM_STATE_SUSPENDED:

		err = -ESTRPIPE;

		goto _end_unlock;

	default:

		err = -EBADFD;

	if (runtime->status->state == SNDRV_PCM_STATE_PREPARED &&

	    size >= runtime->start_threshold) {

		err = snd_pcm_start(substream);

		if (err < 0)

			goto _end_unlock;

	}
@@ -2329,16 +2313,9 @@ static snd_pcm_sframes_t snd_pcm_lib_read1(struct snd_pcm_substream *substream, 
		snd_pcm_stream_lock_irq(substream);

		if (err < 0)

			goto _end_unlock;

		switch (runtime->status->state) {

		case SNDRV_PCM_STATE_XRUN:

			err = -EPIPE;

			goto _end_unlock;

		case SNDRV_PCM_STATE_SUSPENDED:

			err = -ESTRPIPE;

		err = pcm_accessible_state(runtime);

		if (err < 0)

			goto _end_unlock;

		default:

			break;

		}

		appl_ptr += frames;

		if (appl_ptr >= runtime->boundary)

			appl_ptr -= runtime->boundary;