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

Commit 4dfd7954 authored by Stas Sergeev's avatar Stas Sergeev Committed by Takashi Iwai
Browse files

snd-pcsp: put back the compatibility code for the older alsa-libs 



The attached patch adds back the compatibility code, allowing the
driver to work with older alsa-libs.
The removal was premature, it breaks the real-life configs.

Signed-off-by: default avatarStas Sergeev <stsp@aknet.ru>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 3ccee690

sound/drivers/pcsp/pcsp_lib.c

+14 −5
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ module_param(nforce_wa, bool, 0444); 
MODULE_PARM_DESC(nforce_wa, "Apply NForce chipset workaround "

MODULE_PARM_DESC(nforce_wa, "Apply NForce chipset workaround "

		"(expect bad sound)");

		"(expect bad sound)");





#define DMIX_WANTS_S16	1



static void pcsp_start_timer(unsigned long dummy)

static void pcsp_start_timer(unsigned long dummy)

{

{

	hrtimer_start(&pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL);

	hrtimer_start(&pcsp_chip.timer, ktime_set(0, 0), HRTIMER_MODE_REL);
@@ -47,7 +49,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) 
{

{

	unsigned long flags;

	unsigned long flags;

	unsigned char timer_cnt, val;

	unsigned char timer_cnt, val;

	int periods_elapsed;

	int fmt_size, periods_elapsed;

	u64 ns;

	u64 ns;

	size_t period_bytes, buffer_bytes;

	size_t period_bytes, buffer_bytes;

	struct snd_pcm_substream *substream;

	struct snd_pcm_substream *substream;
@@ -92,8 +94,11 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) 
		goto exit_nr_unlock2;

		goto exit_nr_unlock2;





	runtime = substream->runtime;

	runtime = substream->runtime;

	/* assume it is u8 mono */

	fmt_size = snd_pcm_format_physical_width(runtime->format) >> 3;

	val = runtime->dma_area[chip->playback_ptr];

	/* assume it is mono! */

	val = runtime->dma_area[chip->playback_ptr + fmt_size - 1];

	if (snd_pcm_format_signed(runtime->format))

		val ^= 0x80;

	timer_cnt = val * CUR_DIV() / 256;

	timer_cnt = val * CUR_DIV() / 256;





	if (timer_cnt && chip->enable) {

	if (timer_cnt && chip->enable) {
@@ -111,7 +116,7 @@ enum hrtimer_restart pcsp_do_timer(struct hrtimer *handle) 




	period_bytes = snd_pcm_lib_period_bytes(substream);

	period_bytes = snd_pcm_lib_period_bytes(substream);

	buffer_bytes = snd_pcm_lib_buffer_bytes(substream);

	buffer_bytes = snd_pcm_lib_buffer_bytes(substream);

	chip->playback_ptr += PCSP_INDEX_INC();

	chip->playback_ptr += PCSP_INDEX_INC() * fmt_size;

	periods_elapsed = chip->playback_ptr - chip->period_ptr;

	periods_elapsed = chip->playback_ptr - chip->period_ptr;

	if (periods_elapsed < 0) {

	if (periods_elapsed < 0) {

		printk(KERN_WARNING "PCSP: playback_ptr inconsistent "

		printk(KERN_WARNING "PCSP: playback_ptr inconsistent "
@@ -270,7 +275,11 @@ static struct snd_pcm_hardware snd_pcsp_playback = { 
	.info = (SNDRV_PCM_INFO_INTERLEAVED |

	.info = (SNDRV_PCM_INFO_INTERLEAVED |

		 SNDRV_PCM_INFO_HALF_DUPLEX |

		 SNDRV_PCM_INFO_HALF_DUPLEX |

		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),

		 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID),

	.formats = SNDRV_PCM_FMTBIT_U8,

	.formats = (SNDRV_PCM_FMTBIT_U8

#if DMIX_WANTS_S16

		    | SNDRV_PCM_FMTBIT_S16_LE

#endif

	    ),

	.rates = SNDRV_PCM_RATE_KNOT,

	.rates = SNDRV_PCM_RATE_KNOT,

	.rate_min = PCSP_DEFAULT_SRATE,

	.rate_min = PCSP_DEFAULT_SRATE,

	.rate_max = PCSP_DEFAULT_SRATE,

	.rate_max = PCSP_DEFAULT_SRATE,