- Alsa-devel - mailman.alsa-project.org

[alsa-devel] ASoC updates for 2.6.30
by Mark Brown 03 Feb '09

03 Feb '09

The following changes since commit e50a7ea0eba4f336b78b737e5ce48fba691c4919: Mark Brown (1): Merge branch 'for-2.6.29' into for-2.6.30 are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30 Timur Tabi (2): ASoC: fix build break in CS4270 codec driver ASoC: fix message display in CS4270 codec driver sound/soc/codecs/cs4270.c | 68 ++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 28 deletions(-)

2 1

[alsa-devel] Creative X-Fi USB 5.1 Driver
by Mandar Joshi 03 Feb '09

03 Feb '09

Hello, I used SniffUSB to capture the packets sent to the usb X-fi. I've uploaded it here http://mndar.phpnet.us/usbxfi/ I'm not very sure how to interpret the log. By looking at the log, can we tell if it conforms to the USB Audio spec? Regards Mandar Joshi ________________________________ Have you been here yet ? http://mndar.phpnet.us

1 0

[alsa-devel] [PATCH 2.6.30] ASoC: fix build break in CS4270 codec driver
by Timur Tabi 02 Feb '09

02 Feb '09

Fix a oversight in the CS4270 codec driver that caused a build break. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/codecs/cs4270.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index e5f5afd..7962874 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -149,7 +149,7 @@ struct cs4270_mode_ratios { u8 mclk; }; -static struct cs4270_mode_ratios[] = { +static struct cs4270_mode_ratios cs4270_mode_ratios[] = { {64, CS4270_MODE_4X, CS4270_MODE_DIV1}, #ifndef CONFIG_SND_SOC_CS4270_VD33_ERRATA {96, CS4270_MODE_4X, CS4270_MODE_DIV15}, -- 1.5.5

2 1

[alsa-devel] [2.6.29-rc3][PATCH] OMAP: ASoC: Fix spinlock misuse in omap-pcm.c
by Jarkko Nikula 02 Feb '09

02 Feb '09

From: Eero Nurkkala <ext-eero.nurkkala(a)nokia.com> omap_pcm_trigger is called also in interrupt context so CPU flags must be restored when returning. Signed-off-by: Eero Nurkkala <ext-eero.nurkkala(a)nokia.com> Acked-by: Jarkko Nikula <jarkko.nikula(a)nokia.com> --- sound/soc/omap/omap-pcm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index b0362df..dd3bb29 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -175,9 +175,10 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { struct snd_pcm_runtime *runtime = substream->runtime; struct omap_runtime_data *prtd = runtime->private_data; + unsigned long flags; int ret = 0; - spin_lock_irq(&prtd->lock); + spin_lock_irqsave(&prtd->lock, flags); switch (cmd) { case SNDRV_PCM_TRIGGER_START: case SNDRV_PCM_TRIGGER_RESUME: @@ -195,7 +196,7 @@ static int omap_pcm_trigger(struct snd_pcm_substream *substream, int cmd) default: ret = -EINVAL; } - spin_unlock_irq(&prtd->lock); + spin_unlock_irqrestore(&prtd->lock, flags); return ret; } -- 1.5.6.5

2 1

[alsa-devel] [PATCH 2.6.30] ASoC: fix message display in CS4270 codec driver
by Timur Tabi 02 Feb '09

02 Feb '09

Replace printk calls with dev_xxx calls. Set the 'dev' field of the codec and codec_dai structures so that these calls work. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/codecs/cs4270.c | 66 ++++++++++++++++++++++++++------------------ 1 files changed, 39 insertions(+), 27 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 7962874..2c79a24 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -212,7 +212,7 @@ static int cs4270_set_dai_sysclk(struct snd_soc_dai *codec_dai, rates &= ~SNDRV_PCM_RATE_KNOT; if (!rates) { - printk(KERN_ERR "cs4270: could not find a valid sample rate\n"); + dev_err(codec->dev, "could not find a valid sample rate\n"); return -EINVAL; } @@ -253,7 +253,7 @@ static int cs4270_set_dai_fmt(struct snd_soc_dai *codec_dai, cs4270->mode = format & SND_SOC_DAIFMT_FORMAT_MASK; break; default: - printk(KERN_ERR "cs4270: invalid DAI format\n"); + dev_err(codec->dev, "invalid dai format\n"); ret = -EINVAL; } @@ -284,7 +284,7 @@ static int cs4270_fill_cache(struct snd_soc_codec *codec) CS4270_FIRSTREG | 0x80, CS4270_NUMREGS, cache); if (length != CS4270_NUMREGS) { - printk(KERN_ERR "cs4270: I2C read failure, addr=0x%x\n", + dev_err(codec->dev, "i2c read failure, addr=0x%x\n", i2c_client->addr); return -EIO; } @@ -340,7 +340,7 @@ static int cs4270_i2c_write(struct snd_soc_codec *codec, unsigned int reg, if (cache[reg - CS4270_FIRSTREG] != value) { struct i2c_client *client = codec->control_data; if (i2c_smbus_write_byte_data(client, reg, value)) { - printk(KERN_ERR "cs4270: I2C write failed\n"); + dev_err(codec->dev, "i2c write failed\n"); return -EIO; } @@ -391,7 +391,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, if (i == NUM_MCLK_RATIOS) { /* We did not find a matching ratio */ - printk(KERN_ERR "cs4270: could not find matching ratio\n"); + dev_err(codec->dev, "could not find matching ratio\n"); return -EINVAL; } @@ -401,7 +401,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, CS4270_PWRCTL_PDN_ADC | CS4270_PWRCTL_PDN_DAC | CS4270_PWRCTL_PDN); if (ret < 0) { - printk(KERN_ERR "cs4270: I2C write failed\n"); + dev_err(codec->dev, "i2c write failed\n"); return ret; } @@ -413,7 +413,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, ret = snd_soc_write(codec, CS4270_MODE, reg); if (ret < 0) { - printk(KERN_ERR "cs4270: I2C write failed\n"); + dev_err(codec->dev, "i2c write failed\n"); return ret; } @@ -430,13 +430,13 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, reg |= CS4270_FORMAT_DAC_LJ | CS4270_FORMAT_ADC_LJ; break; default: - printk(KERN_ERR "cs4270: unknown format\n"); + dev_err(codec->dev, "unknown dai format\n"); return -EINVAL; } ret = snd_soc_write(codec, CS4270_FORMAT, reg); if (ret < 0) { - printk(KERN_ERR "cs4270: I2C write failed\n"); + dev_err(codec->dev, "i2c write failed\n"); return ret; } @@ -447,7 +447,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, reg &= ~CS4270_MUTE_AUTO; ret = snd_soc_write(codec, CS4270_MUTE, reg); if (ret < 0) { - printk(KERN_ERR "cs4270: I2C write failed\n"); + dev_err(codec->dev, "i2c write failed\n"); return ret; } @@ -460,7 +460,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, reg &= ~(CS4270_TRANS_SOFT | CS4270_TRANS_ZERO); ret = cs4270_i2c_write(codec, CS4270_TRANS, reg); if (ret < 0) { - printk(KERN_ERR "I2C write failed\n"); + dev_err(codec->dev, "i2c write failed\n"); return ret; } @@ -468,7 +468,7 @@ static int cs4270_hw_params(struct snd_pcm_substream *substream, ret = snd_soc_write(codec, CS4270_PWRCTL, 0); if (ret < 0) { - printk(KERN_ERR "cs4270: I2C write failed\n"); + dev_err(codec->dev, "i2c write failed\n"); return ret; } @@ -570,7 +570,7 @@ static int cs4270_probe(struct platform_device *pdev) /* Register PCMs */ ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1); if (ret < 0) { - printk(KERN_ERR "cs4270: failed to create PCMs\n"); + dev_err(codec->dev, "failed to create pcms\n"); return ret; } @@ -580,7 +580,7 @@ static int cs4270_probe(struct platform_device *pdev) kctrl = snd_soc_cnew(&cs4270_snd_controls[i], codec, NULL); if (!kctrl) { - printk(KERN_ERR "cs4270: error creating control '%s'\n", + dev_err(codec->dev, "error creating control '%s'\n", cs4270_snd_controls[i].name); ret = -ENOMEM; goto error_free_pcms; @@ -588,7 +588,7 @@ static int cs4270_probe(struct platform_device *pdev) ret = snd_ctl_add(codec->card, kctrl); if (ret < 0) { - printk(KERN_ERR "cs4270: error adding control '%s'\n", + dev_err(codec->dev, "error adding control '%s'\n", cs4270_snd_controls[i].name); goto error_free_pcms; } @@ -597,7 +597,7 @@ static int cs4270_probe(struct platform_device *pdev) /* And finally, register the socdev */ ret = snd_soc_init_card(socdev); if (ret < 0) { - printk(KERN_ERR "cs4270: failed to register card\n"); + dev_err(codec->dev, "failed to register card\n"); goto error_free_pcms; } @@ -643,9 +643,9 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, * comment for cs4270_codec. */ if (cs4270_codec) { - printk(KERN_ERR "cs4270: ignoring CS4270 at addr %X\n", + dev_err(&i2c_client->dev, "ignoring CS4270 at addr %X\n", i2c_client->addr); - printk(KERN_ERR "cs4270: only one CS4270 per board allowed\n"); + dev_err(&i2c_client->dev, "only one per board allowed\n"); /* Should we return something other than ENODEV here? */ return -ENODEV; } @@ -654,35 +654,35 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, ret = i2c_smbus_read_byte_data(i2c_client, CS4270_CHIPID); if (ret < 0) { - printk(KERN_ERR "cs4270: failed to read I2C at addr %X\n", + dev_err(&i2c_client->dev, "failed to read i2c at addr %X\n", i2c_client->addr); return ret; } /* The top four bits of the chip ID should be 1100. */ if ((ret & 0xF0) != 0xC0) { - printk(KERN_ERR "cs4270: device at addr %X is not a CS4270\n", + dev_err(&i2c_client->dev, "device at addr %X is not a CS4270\n", i2c_client->addr); return -ENODEV; } - printk(KERN_INFO "cs4270: found device at I2C address %X\n", + dev_info(&i2c_client->dev, "found device at i2c address %X\n", i2c_client->addr); - printk(KERN_INFO "cs4270: hardware revision %X\n", ret & 0xF); + dev_info(&i2c_client->dev, "hardware revision %X\n", ret & 0xF); /* Allocate enough space for the snd_soc_codec structure and our private data together. */ cs4270 = kzalloc(sizeof(struct cs4270_private), GFP_KERNEL); if (!cs4270) { - printk(KERN_ERR "cs4270: Could not allocate codec structure\n"); + dev_err(&i2c_client->dev, "could not allocate codec\n"); return -ENOMEM; } codec = &cs4270->codec; - cs4270_codec = codec; mutex_init(&codec->mutex); INIT_LIST_HEAD(&codec->dapm_widgets); INIT_LIST_HEAD(&codec->dapm_paths); + codec->dev = &i2c_client->dev; codec->name = "CS4270"; codec->owner = THIS_MODULE; codec->dai = &cs4270_dai; @@ -698,17 +698,25 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, ret = cs4270_fill_cache(codec); if (ret < 0) { - printk(KERN_ERR "cs4270: failed to fill register cache\n"); + dev_err(&i2c_client->dev, "failed to fill register cache\n"); goto error_free_codec; } + /* Initialize the DAI. Normally, we'd prefer to have a kmalloc'd DAI + * structure for each CS4270 device, but the machine driver needs to + * have a pointer to the DAI structure, so for now it must be a global + * variable. + */ + cs4270_dai.dev = &i2c_client->dev; + /* Register the DAI. If all the other ASoC driver have already * registered, then this will call our probe function, so * cs4270_codec needs to be ready. */ + cs4270_codec = codec; ret = snd_soc_register_dai(&cs4270_dai); if (ret < 0) { - printk(KERN_ERR "cs4270: failed to register DAIe\n"); + dev_err(&i2c_client->dev, "failed to register DAIe\n"); goto error_free_codec; } @@ -718,6 +726,8 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, error_free_codec: kfree(cs4270); + cs4270_codec = NULL; + cs4270_dai.dev = NULL; return ret; } @@ -733,6 +743,8 @@ static int cs4270_i2c_remove(struct i2c_client *i2c_client) struct cs4270_private *cs4270 = i2c_get_clientdata(i2c_client); kfree(cs4270); + cs4270_codec = NULL; + cs4270_dai.dev = NULL; return 0; } @@ -776,7 +788,7 @@ EXPORT_SYMBOL_GPL(soc_codec_device_cs4270); static int __init cs4270_init(void) { - printk(KERN_INFO "Cirrus Logic CS4270 ALSA SoC Codec Driver\n"); + pr_info("Cirrus Logic CS4270 ALSA SoC Codec Driver\n"); return i2c_add_driver(&cs4270_i2c_driver); } -- 1.5.5

1 0

Re: [alsa-devel] [PATCH] sscape: drop redundant fields from soundscape struct
by krzysztof.h1＠poczta.fm 02 Feb '09

02 Feb '09

Takashi Iwai napisał(a): > At Sun, 1 Feb 2009 21:12:31 +0100, > Krzysztof Helt wrote: > > > > The midi_vol is set only to 0 so it does not work > > as detection of change in midi volume. It is removed. > > It's used to cache the value. You should better to keep it, but fix > sscape_midi_put() function to remember the last > uctl->value.integer.value[0] value in this field. I know that it was supposed to cache the volume value, but is it really needed? It is not something time critical and the less code the better. > (And also better to change sscape_midi_get() to return midi_vol > value.) > Ok. Regards, Krzysztof ---------------------------------------------------------------------- Doladuj telefon! Sprawdz >> http://link.interia.pl/f2047

3 3

Re: [alsa-devel] Bug in sound-unstable-2.6 ice1724
by Vedran Miletić 02 Feb '09

02 Feb '09

On Thu, Jan 1, 2009 at 10:27 AM, Takashi Iwai <tiwai(a)suse.de> wrote: > At Fri, 26 Dec 2008 21:34:47 +0100, > =?UTF-8?Q?Vedran_Mileti=C4=87?= wrote: >> >> On Wed, Nov 26, 2008 at 4:51 PM, Takashi Iwai <tiwai(a)suse.de> wrote: >> > Doh, I forgot to attach the patch. The below is the one. >> > >> > Please, if anyone can test it, let me know whether it works. >> > This would be nice to have in the next kernel. >> > >> > >> > thanks, >> > >> > Takashi >> > >> >> Do you still need this to be tested? I can do it. > > Yes, please. > > > Takashi > [vedran@phenomche ~]$ aplaymidi -l Port Client name Port name 14:0 Midi Through Midi Through Port-0 16:0 SB Live! 5.1 Dell OEM [SB0228] EMU10K1 MPU-401 (UART) 17:0 Emu10k1 WaveTable Emu10k1 Port 0 17:1 Emu10k1 WaveTable Emu10k1 Port 1 17:2 Emu10k1 WaveTable Emu10k1 Port 2 17:3 Emu10k1 WaveTable Emu10k1 Port 3 20:0 Terratec PHASE 22 ICE1724 MIDI [vedran@phenomche ~]$ aplaymidi -p 20:0 blah.mid [vedran@phenomche ~]$ cat /proc/asound/card1/midi0 ICE1724 MIDI Output 0 Tx bytes : 4379 Mode : native Buffer size : 4096 Avail : 4096 Input 0 Rx bytes : Works without problems. I'm using yestarday's sound-unstable git snapshot. -- Vedran Miletić

2 1

[alsa-devel] Confusion about whether snd_pcm_poll_descriptors_revents()'s revents field is a single integer or an array
by Lennart Poettering 02 Feb '09

02 Feb '09

Heya! If we look into the pcm example how snd_pcm_poll_descriptors_revents() is used then we can see that the revents parameter apparently is supposed to be a single integer. (which makes a lot of sense to me) http://www.alsa-project.org/alsa-doc/alsa-lib/_2test_2pcm_8c-example.html#a… However, snd_pcm_wait_nocheck() calls the same function and assumes it is a complete array! http://git.alsa-project.org/?p=alsa-lib.git;a=blob;f=src/pcm/pcm.c;h=74d1d1… So what's it now? It makes more sense to me if it would be a single fd. The problem becomnes visible if someone writes a plugin that wants wakeups from more than one fd because either snd_pcm_wait() using applications start to act weirdly because the revents are not fully initialized or snd_pcm_poll_descriptors_revents() using applications get invalid memory accesses. This has become visible in the Bluetooth plugin. I guess nobody has written a plugin that has more than one fd to sleep on yet, right? Lennart -- Lennart Poettering Red Hat, Inc. lennart [at] poettering [dot] net ICQ# 11060553 http://0pointer.net/lennart/ GnuPG 0x1A015CC4

3 10

[alsa-devel] Dell Latitude D830 internal speaker volume degraded on 2.6.29-rc*
by Ben Gamari 02 Feb '09

02 Feb '09

Hey all, For quite a while now, the internal speaker volume on my Dell Latitude D830 has been very soft. While usually the case can be made to resonate with all mixers at 100%, recently I have noticed a substantial decrease in output. Figuring this must be caused by a codec mis-configuration, I booted into a working kernel 2.6.27.9-134.fc10.x86_64 and collected a dump from /proc/asound/card0/codec#0. After booting back into my own vanilla kernel from master, I collected another trace. When I was looking through the diff -u of the two dumps, one particular difference seemed notable, Node 0x11 [Audio Output] wcaps 0xd0c05: Stereo Amp-Out R/L Amp-Out caps: N/A - Amp-Out vals: [0x7f 0x7f] - Converter: stream=5, channel=0 + Amp-Out vals: [0xff 0xff] + Converter: stream=0, channel=0 Power: setting=D0, actual=D0 Delay: 13 samples Perhaps this is significant? Regardless, I have attached both of the original dumps. Let me know if anything else is needed. Thanks, - Ben

2 3

[alsa-devel] Enumerating PCM devices
by Bankim Bhavsar 02 Feb '09

02 Feb '09

Hi Alsa developers/users, For some reason my message got truncated earlier. So here I go again. I'm using snd_device_name_hint("pcm"..) and then snd_device_name_get_hint(.."NAME") to get the NAME parameter of pcm devices. Is it true that all sound cards that support Alsa will *always* have "default" pcm device? I'm more inclined towards using "default:CARD=<vendor>" as the parameter to snd_pcm_open(). This way if the program configures hardware params for any number of channels then the appropriate PCM device will be selected on the sound card, correct? Thanks, Bankim.

2 1