Commit 918f3a0e authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Jaroslav Kysela
Browse files

[ALSA] pcm: add snd_pcm_rate_to_rate_bit() helper 



Add a snd_pcm_rate_to_rate_bit() function to factor out common code used
by several drivers.

Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 7653d557

include/sound/pcm.h

+1 −0
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ snd_pcm_sframes_t snd_pcm_lib_readv(struct snd_pcm_substream *substream, 
extern const struct snd_pcm_hw_constraint_list snd_pcm_known_rates;



int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);

unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);



static inline void snd_pcm_set_runtime_buffer(struct snd_pcm_substream *substream,

					      struct snd_dma_buffer *bufp)

sound/core/pcm_misc.c

+18 −0
Original line number Diff line number Diff line
@@ -450,3 +450,21 @@ int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime) 
}



EXPORT_SYMBOL(snd_pcm_limit_hw_rates);



/**

 * snd_pcm_rate_to_rate_bit - converts sample rate to SNDRV_PCM_RATE_xxx bit

 * @rate: the sample rate to convert

 *

 * Returns the SNDRV_PCM_RATE_xxx flag that corresponds to the given rate, or

 * SNDRV_PCM_RATE_KNOT for an unknown rate.

 */

unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate)

{

	unsigned int i;



	for (i = 0; i < snd_pcm_known_rates.count; i++)

		if (snd_pcm_known_rates.list[i] == rate)

			return 1u << i;

	return SNDRV_PCM_RATE_KNOT;

}

EXPORT_SYMBOL(snd_pcm_rate_to_rate_bit);

sound/pci/bt87x.c

+1 −20
Original line number Diff line number Diff line
@@ -340,28 +340,9 @@ static struct snd_pcm_hardware snd_bt87x_analog_hw = { 


static int snd_bt87x_set_digital_hw(struct snd_bt87x *chip, struct snd_pcm_runtime *runtime)

{

	static struct {

		int rate;

		unsigned int bit;

	} ratebits[] = {

		{8000, SNDRV_PCM_RATE_8000},

		{11025, SNDRV_PCM_RATE_11025},

		{16000, SNDRV_PCM_RATE_16000},

		{22050, SNDRV_PCM_RATE_22050},

		{32000, SNDRV_PCM_RATE_32000},

		{44100, SNDRV_PCM_RATE_44100},

		{48000, SNDRV_PCM_RATE_48000}

	};

	int i;



	chip->reg_control |= CTL_DA_IOM_DA;

	runtime->hw = snd_bt87x_digital_hw;

	runtime->hw.rates = SNDRV_PCM_RATE_KNOT;

	for (i = 0; i < ARRAY_SIZE(ratebits); ++i)

		if (chip->dig_rate == ratebits[i].rate) {

			runtime->hw.rates = ratebits[i].bit;

			break;

		}

	runtime->hw.rates = snd_pcm_rate_to_rate_bit(chip->dig_rate);

	runtime->hw.rate_min = chip->dig_rate;

	runtime->hw.rate_max = chip->dig_rate;

	return 0;

sound/pci/rme32.c

+4 −17
Original line number Diff line number Diff line
@@ -258,19 +258,6 @@ static inline unsigned int snd_rme32_pcm_byteptr(struct rme32 * rme32) 
		& RME32_RCR_AUDIO_ADDR_MASK);

}



static int snd_rme32_ratecode(int rate)

{

	switch (rate) {

	case 32000: return SNDRV_PCM_RATE_32000;

	case 44100: return SNDRV_PCM_RATE_44100;

	case 48000: return SNDRV_PCM_RATE_48000;

	case 64000: return SNDRV_PCM_RATE_64000;

	case 88200: return SNDRV_PCM_RATE_88200;

	case 96000: return SNDRV_PCM_RATE_96000;

	}

	return 0;

}



/* silence callback for halfduplex mode */

static int snd_rme32_playback_silence(struct snd_pcm_substream *substream, int channel,	/* not used (interleaved data) */

				      snd_pcm_uframes_t pos,
@@ -887,7 +874,7 @@ static int snd_rme32_playback_spdif_open(struct snd_pcm_substream *substream) 
	if ((rme32->rcreg & RME32_RCR_KMODE) &&

	    (rate = snd_rme32_capture_getrate(rme32, &dummy)) > 0) {

		/* AutoSync */

		runtime->hw.rates = snd_rme32_ratecode(rate);

		runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

		runtime->hw.rate_min = rate;

		runtime->hw.rate_max = rate;

	}
@@ -929,7 +916,7 @@ static int snd_rme32_capture_spdif_open(struct snd_pcm_substream *substream) 
		if (isadat) {

			return -EIO;

		}

		runtime->hw.rates = snd_rme32_ratecode(rate);

		runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

		runtime->hw.rate_min = rate;

		runtime->hw.rate_max = rate;

	}
@@ -965,7 +952,7 @@ snd_rme32_playback_adat_open(struct snd_pcm_substream *substream) 
	if ((rme32->rcreg & RME32_RCR_KMODE) &&

	    (rate = snd_rme32_capture_getrate(rme32, &dummy)) > 0) {

                /* AutoSync */

                runtime->hw.rates = snd_rme32_ratecode(rate);

                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

                runtime->hw.rate_min = rate;

                runtime->hw.rate_max = rate;

	}
@@ -989,7 +976,7 @@ snd_rme32_capture_adat_open(struct snd_pcm_substream *substream) 
		if (!isadat) {

			return -EIO;

		}

                runtime->hw.rates = snd_rme32_ratecode(rate);

                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

                runtime->hw.rate_min = rate;

                runtime->hw.rate_max = rate;

        }

sound/pci/rme96.c

+4 −18
Original line number Diff line number Diff line
@@ -300,20 +300,6 @@ snd_rme96_capture_ptr(struct rme96 *rme96) 
		& RME96_RCR_AUDIO_ADDR_MASK) >> rme96->capture_frlog;

}



static int

snd_rme96_ratecode(int rate)

{

    switch (rate) {

    case 32000: return SNDRV_PCM_RATE_32000;

    case 44100: return SNDRV_PCM_RATE_44100;

    case 48000: return SNDRV_PCM_RATE_48000;

    case 64000: return SNDRV_PCM_RATE_64000;

    case 88200: return SNDRV_PCM_RATE_88200;

    case 96000: return SNDRV_PCM_RATE_96000;

    }

    return 0;

}



static int

snd_rme96_playback_silence(struct snd_pcm_substream *substream,

			   int channel, /* not used (interleaved data) */
@@ -1192,7 +1178,7 @@ snd_rme96_playback_spdif_open(struct snd_pcm_substream *substream) 
	    (rate = snd_rme96_capture_getrate(rme96, &dummy)) > 0)

	{

                /* slave clock */

                runtime->hw.rates = snd_rme96_ratecode(rate);

                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

                runtime->hw.rate_min = rate;

                runtime->hw.rate_max = rate;

	}
@@ -1219,7 +1205,7 @@ snd_rme96_capture_spdif_open(struct snd_pcm_substream *substream) 
                if (isadat) {

                        return -EIO;

                }

                runtime->hw.rates = snd_rme96_ratecode(rate);

                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

                runtime->hw.rate_min = rate;

                runtime->hw.rate_max = rate;

        }
@@ -1259,7 +1245,7 @@ snd_rme96_playback_adat_open(struct snd_pcm_substream *substream) 
	    (rate = snd_rme96_capture_getrate(rme96, &dummy)) > 0)

	{

                /* slave clock */

                runtime->hw.rates = snd_rme96_ratecode(rate);

                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

                runtime->hw.rate_min = rate;

                runtime->hw.rate_max = rate;

	}
@@ -1284,7 +1270,7 @@ snd_rme96_capture_adat_open(struct snd_pcm_substream *substream) 
                if (!isadat) {

                        return -EIO;

                }

                runtime->hw.rates = snd_rme96_ratecode(rate);

                runtime->hw.rates = snd_pcm_rate_to_rate_bit(rate);

                runtime->hw.rate_min = rate;

                runtime->hw.rate_max = rate;

        }