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

Commit c7025637 authored by James Courtier-Dutton's avatar James Courtier-Dutton Committed by Jaroslav Kysela
Browse files

[ALSA] Support multiple capture rates on p16v. 



EMU10K1/EMU10K2 driver
The capture rate does in fact vary, but it only captures anything if
the HD Capture source is set to I2S or AC97. I have not tested if the sound
is actually captured from an physical input of some type or not.
TODO: Get SPDIF capture working.

Signed-off-by: default avatarJames Courtier-Dutton <James@superbug.co.uk>
parent 14c7e472

sound/pci/emu10k1/p16v.c

+35 −18
Original line number Diff line number Diff line
@@ -138,9 +138,9 @@ static snd_pcm_hardware_t snd_p16v_capture_hw = { 
				 SNDRV_PCM_INFO_BLOCK_TRANSFER |

				 SNDRV_PCM_INFO_MMAP_VALID),

	.formats =		SNDRV_PCM_FMTBIT_S32_LE,

       .rates =                SNDRV_PCM_RATE_48000,

       .rate_min =             48000,

       .rate_max =             48000,

	.rates =		SNDRV_PCM_RATE_192000 | SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_44100, 

	.rate_min =		44100,

	.rate_max =		192000,

	.channels_min =		2,

	.channels_max =		2,

	.buffer_bytes_max =	(32*1024),
@@ -151,7 +151,6 @@ static snd_pcm_hardware_t snd_p16v_capture_hw = { 
	.fifo_size =		0,

};





static void snd_p16v_pcm_free_substream(snd_pcm_runtime_t *runtime)

{

	emu10k1_pcm_t *epcm = runtime->private_data;
@@ -362,7 +361,25 @@ static int snd_p16v_pcm_prepare_capture(snd_pcm_substream_t *substream) 
	emu10k1_t *emu = snd_pcm_substream_chip(substream);

	snd_pcm_runtime_t *runtime = substream->runtime;

	int channel = substream->pcm->device - emu->p16v_device_offset;

	//printk("prepare:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size,  frames_to_bytes(runtime, 1));

	u32 tmp;

	//printk("prepare capture:channel_number=%d, rate=%d, format=0x%x, channels=%d, buffer_size=%ld, period_size=%ld, frames_to_bytes=%d\n",channel, runtime->rate, runtime->format, runtime->channels, runtime->buffer_size, runtime->period_size,  frames_to_bytes(runtime, 1));

	tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);

        switch (runtime->rate) {

	case 44100:

	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0800);

	  break;

	case 96000:

	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0400);

	  break;

	case 192000:

	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0200);

	  break;

	case 48000:

	default:

	  snd_emu10k1_ptr_write(emu, A_SPDIF_SAMPLERATE, channel, (tmp & ~0x0e00) | 0x0000);

	  break;

	}

	/* FIXME: Check emu->buffer.size before actually writing to it. */

	snd_emu10k1_ptr20_write(emu, 0x13, channel, 0);

	snd_emu10k1_ptr20_write(emu, CAPTURE_DMA_ADDR, channel, runtime->dma_addr);

	snd_emu10k1_ptr20_write(emu, CAPTURE_BUFFER_SIZE, channel, frames_to_bytes(runtime, runtime->buffer_size)<<16); // buffer size in bytes