redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ALSA: dice: get the number of MBLA data channel at opening PCM substream 

This commit is a preparation to remove members related to channel cache
for the number of channels for multi bit linear audio data and MIDI
ports. This commit changes the way to get the number of multi bit linear
audio data channel. It's directly retrieved by asynchronous transactions
to some registers.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
hifive-unleashed-5.1
Takashi Sakamoto 2016-02-08 22:54:18 +09:00 committed by Takashi Iwai
parent b9022f4d2c
commit c30076568d
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sound/firewire/dice/dice-pcm.c
View File

@ -294,17 +294,30 @@ int snd_dice_create_pcm(struct snd_dice *dice)
.page = snd_pcm_lib_get_vmalloc_page,
.mmap = snd_pcm_lib_mmap_vmalloc,
};
__be32 reg;
struct snd_pcm *pcm;
unsigned int i, capture, playback;
unsigned int capture, playback;
int err;
capture = playback = 0;
for (i = 0; i < 3; i++) {
if (dice->tx_channels[i] > 0)
capture = 1;
if (dice->rx_channels[i] > 0)
playback = 1;
}
/*
* Check whether PCM substreams are required.
*
* TODO: in the case that any PCM substreams are not avail at a certain
* sampling transfer frequency?
*/
err = snd_dice_transaction_read_tx(dice, TX_NUMBER_AUDIO,
&reg, sizeof(reg));
if (err < 0)
return err;
if (be32_to_cpu(reg) > 0)
capture = 1;
err = snd_dice_transaction_read_rx(dice, RX_NUMBER_AUDIO,
&reg, sizeof(reg));
if (err < 0)
return err;
if (be32_to_cpu(reg) > 0)
playback = 1;
err = snd_pcm_new(dice->card, "DICE", 0, playback, capture, &pcm);
if (err < 0)