ALSA: ens1370: Define channel maps
Provide channel maps for individual stereo streams of ENS1370 and ENS1371. Note that the configuration of ENS1370 uses the secondary PCM as the front unlike ENS1371. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
3adc497f98
commit
7fb6861d62
|
@ -1260,6 +1260,14 @@ static struct snd_pcm_ops snd_ensoniq_capture_ops = {
|
||||||
.pointer = snd_ensoniq_capture_pointer,
|
.pointer = snd_ensoniq_capture_pointer,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct snd_pcm_chmap_elem surround_map[] = {
|
||||||
|
{ .channels = 1,
|
||||||
|
.map = { SNDRV_CHMAP_UNKNOWN } },
|
||||||
|
{ .channels = 2,
|
||||||
|
.map = { SNDRV_CHMAP_RL, SNDRV_CHMAP_RR } },
|
||||||
|
{ }
|
||||||
|
};
|
||||||
|
|
||||||
static int __devinit snd_ensoniq_pcm(struct ensoniq * ensoniq, int device,
|
static int __devinit snd_ensoniq_pcm(struct ensoniq * ensoniq, int device,
|
||||||
struct snd_pcm ** rpcm)
|
struct snd_pcm ** rpcm)
|
||||||
{
|
{
|
||||||
|
@ -1287,6 +1295,16 @@ static int __devinit snd_ensoniq_pcm(struct ensoniq * ensoniq, int device,
|
||||||
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
|
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
|
||||||
snd_dma_pci_data(ensoniq->pci), 64*1024, 128*1024);
|
snd_dma_pci_data(ensoniq->pci), 64*1024, 128*1024);
|
||||||
|
|
||||||
|
#ifdef CHIP1370
|
||||||
|
err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
|
||||||
|
surround_map, 2, 0, NULL);
|
||||||
|
#else
|
||||||
|
err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
|
||||||
|
snd_pcm_std_chmaps, 2, 0, NULL);
|
||||||
|
#endif
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
if (rpcm)
|
if (rpcm)
|
||||||
*rpcm = pcm;
|
*rpcm = pcm;
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -1317,6 +1335,16 @@ static int __devinit snd_ensoniq_pcm2(struct ensoniq * ensoniq, int device,
|
||||||
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
|
snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
|
||||||
snd_dma_pci_data(ensoniq->pci), 64*1024, 128*1024);
|
snd_dma_pci_data(ensoniq->pci), 64*1024, 128*1024);
|
||||||
|
|
||||||
|
#ifdef CHIP1370
|
||||||
|
err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
|
||||||
|
snd_pcm_std_chmaps, 2, 0, NULL);
|
||||||
|
#else
|
||||||
|
err = snd_pcm_add_chmap_ctls(pcm, SNDRV_PCM_STREAM_PLAYBACK,
|
||||||
|
surround_map, 2, 0, NULL);
|
||||||
|
#endif
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
if (rpcm)
|
if (rpcm)
|
||||||
*rpcm = pcm;
|
*rpcm = pcm;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue