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

[alsa-devel] Question on usbaudio.c: snd_usb_find_csint_desc
by LCID Fire 26 Jan '09

26 Jan '09

I was looking at 'snd_usb_find_csint_desc' and I really wonder why there is a while loop since it seems to me that the variables don't really change. Am I missing something?

2 1

[alsa-devel] Enumerating PCM devices
by Bankim Bhavsar 25 Jan '09

25 Jan '09

Hi Alsa developers/users, I'm using snd_device_name_hint("pcm"..) and then snd_device_name_get_hint(.."NAME") to get the NAME parameter of pcm devices.

1 0

Re: [alsa-devel] [PATCH] Turtle Beach Multisound Classic/Pinnacle driver (4th rev)
by Krzysztof Helt 24 Jan '09

24 Jan '09

On Sat, 24 Jan 2009 13:35:28 +0100 Krzysztof Helt <krzysztof.h1(a)poczta.fm> wrote: > From: Krzysztof Helt <krzysztof.h1(a)wp.pl> > > + .buffer_bytes_max = 0x3000, > + .period_bytes_min = 0x40, > + .period_bytes_max = 0x1800, > + .periods_min = 2, > + .periods_max = 3, I have investigated the max_periods number and at least some code called from the interrupt assumes no more then 3 periods in the buffer. I do not understand the code enough to change this. Regards, Krzysztof ---------------------------------------------------------------------- Zobacz gry internetowe dla dzieci! sprawdz >>>http://link.interia.pl/f202c

1 0

[PATCH] Add device and control number so it's apparent for which control this error is showing up.
by Andreas Bergmeier 24 Jan '09

24 Jan '09

Signed-off-by: Andreas Bergmeier <lcid-fire(a)gmx.net> --- sound/usb/usbaudio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 037435d..e578a5c 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2867,12 +2867,12 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) /* find audiocontrol interface */ host_iface = &usb_ifnum_to_if(dev, ctrlif)->altsetting[0]; if (!(p1 = snd_usb_find_csint_desc(host_iface->extra, host_iface->extralen, NULL, HEADER))) { - snd_printk(KERN_ERR "cannot find HEADER\n"); + snd_printk(KERN_ERR "%d:%u: cannot find HEADER\n", dev->devnum, ctrlif); return -EINVAL; } if (! p1[7] || p1[0] < 8 + p1[7]) { - snd_printk(KERN_ERR "invalid HEADER\n"); + snd_printk(KERN_ERR "%d:%u: invalid HEADER\n", dev->devnum, ctrlif); return -EINVAL; } -- 1.5.6.3 --------------050806070602090407040706 Content-Type: text/x-patch; name="0001-Print-device-number-which-did-not-support-low-speed.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-Print-device-number-which-did-not-support-low-speed.pat"; filename*1="ch"

1 0

[PATCH] Print device number which did not support low speed audio streaming
by Andreas Bergmeier 24 Jan '09

24 Jan '09

Signed-off-by: Andreas Bergmeier <lcid-fire(a)gmx.net> --- sound/usb/usbaudio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index 8b8eb9e..2cfb8a3 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2929,7 +2929,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) continue; } if (snd_usb_get_speed(dev) == USB_SPEED_LOW) { - snd_printk(KERN_ERR "low speed audio streaming not supported\n"); + snd_printk(KERN_ERR "%d: low speed audio streaming not supported\n", dev->devnum); continue; } if (! parse_audio_endpoints(chip, j)) { -- 1.5.6.3 --------------050806070602090407040706 Content-Type: text/x-patch; name="0001-Replaced-return-NULL-lines-by-break-in-snd_usb_fin.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-Replaced-return-NULL-lines-by-break-in-snd_usb_fin.patc"; filename*1="h"

1 0

[PATCH] Replaced 'return NULL' lines by break in snd_usb_find_desc so there is only one default error.
by Andreas Bergmeier 24 Jan '09

24 Jan '09

Signed-off-by: Andreas Bergmeier <lcid-fire(a)gmx.net> --- sound/usb/usbaudio.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c index d35b51c..8b8eb9e 100644 --- a/sound/usb/usbaudio.c +++ b/sound/usb/usbaudio.c @@ -2054,10 +2054,10 @@ void *snd_usb_find_desc(void *descstart, int desclen, void *after, u8 dtype) end = p + desclen; for (; p < end;) { if (p[0] < 2) - return NULL; + break; next = p + p[0]; if (next > end) - return NULL; + break; if (p[1] == dtype && (!after || (void *)p > after)) { return p; } -- 1.5.6.3 --------------050806070602090407040706--

1 0

[alsa-devel] snd_pcm_avail_update() needed before snd_pcm_delay() with hda-intel
by Christian Morales Vega 24 Jan '09

24 Jan '09

snd_pcm_avail_update() documentation says: "Using of this function is useless for the standard read/write operations. Use it only for mmap access. See to snd_pcm_delay." snd_pcm_delay() documentation says: "Note this function does not update the actual r/w pointer for applications. The function snd_pcm_avail_update() have to be called before any begin+commit operation." My english is far from perfect, and so the problem can be that I missunderstood the docs but: 1- "Using of this function"? Should not be "Use of this function"? 2- Is snd_pcm_avail_update() really useless when not using mmap? I have a SB Live! where snd_pcm_delay() always returns the correct value, without any need for snd_pcm_avail_update(). But the same code in the same machine with an hda-intel AD1988 needs a call to snd_pcm_avail_update() before snd_pcm_delay() to give the correct result. Without it snd_pcm_delay() always returns the value that *was* correct in the last snd_pcm_writei() call. So should the "application frame position" be always updated, or only in read/write operations? In the first case AD1988 fails, in the second case perhaps SB Live! is making too mucho work ;-)

4 9

[alsa-devel] [PATCH v2 2.6.30] ASoC: improve I2C initialization code in CS4270 driver
by Timur Tabi 23 Jan '09

23 Jan '09

Further improvements in the I2C initialization sequence of the CS4270 driver. All ASoC initialization is now done in the I2C probe function. Signed-off-by: Timur Tabi <timur(a)freescale.com> --- sound/soc/codecs/cs4270.c | 252 ++++++++++++++++++++------------------------- 1 files changed, 113 insertions(+), 139 deletions(-) diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 2e4ce04..71986e1 100644 --- a/sound/soc/codecs/cs4270.c +++ b/sound/soc/codecs/cs4270.c @@ -29,12 +29,6 @@ #include <sound/initval.h> #include <linux/i2c.h> -/* Private data for the CS4270 */ -struct cs4270_private { - unsigned int mclk; /* Input frequency of the MCLK pin */ - unsigned int mode; /* The mode (I2S or left-justified) */ -}; - /* * The codec isn't really big-endian or little-endian, since the I2S * interface requires data to be sent serially with the MSbit first. @@ -107,6 +101,14 @@ struct cs4270_private { #define CS4270_MUTE_DAC_A 0x01 #define CS4270_MUTE_DAC_B 0x02 +/* Private data for the CS4270 */ +struct cs4270_private { + struct snd_soc_codec codec; + u8 reg_cache[CS4270_NUMREGS]; + unsigned int mclk; /* Input frequency of the MCLK pin */ + unsigned int mode; /* The mode (I2S or left-justified) */ +}; + /* * Clock Ratio Selection for Master Mode with I2C enabled * @@ -502,6 +504,31 @@ static const struct snd_kcontrol_new cs4270_snd_controls[] = { */ static struct snd_soc_device *cs4270_socdev; +struct snd_soc_dai cs4270_dai = { + .name = "cs4270", + .playback = { + .stream_name = "Playback", + .channels_min = 1, + .channels_max = 2, + .rates = 0, + .formats = CS4270_FORMATS, + }, + .capture = { + .stream_name = "Capture", + .channels_min = 1, + .channels_max = 2, + .rates = 0, + .formats = CS4270_FORMATS, + }, + .ops = { + .hw_params = cs4270_hw_params, + .set_sysclk = cs4270_set_dai_sysclk, + .set_fmt = cs4270_set_dai_fmt, + .digital_mute = cs4270_mute, + }, +}; +EXPORT_SYMBOL_GPL(cs4270_dai); + /* * Initialize the I2C interface of the CS4270 * @@ -515,47 +542,52 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, const struct i2c_device_id *id) { struct snd_soc_device *socdev = cs4270_socdev; - struct snd_soc_codec *codec = socdev->codec; + struct snd_soc_codec *codec; + struct cs4270_private *cs4270; int i; int ret = 0; - /* Probing all possible addresses has one drawback: if there are - multiple CS4270s on the bus, then you cannot specify which - socdev is matched with which CS4270. For now, we just reject - this I2C device if the socdev already has one attached. */ - if (codec->control_data) - return -ENODEV; - - /* Note: codec_dai->codec is NULL here */ - - codec->reg_cache = kzalloc(CS4270_NUMREGS, GFP_KERNEL); - if (!codec->reg_cache) { - printk(KERN_ERR "cs4270: could not allocate register cache\n"); - ret = -ENOMEM; - goto error; - } - /* Verify that we have a CS4270 */ ret = i2c_smbus_read_byte_data(i2c_client, CS4270_CHIPID); if (ret < 0) { printk(KERN_ERR "cs4270: failed to read I2C\n"); - goto error; + return ret; } /* The top four bits of the chip ID should be 1100. */ if ((ret & 0xF0) != 0xC0) { - /* The device at this address is not a CS4270 codec */ - ret = -ENODEV; - goto error; + printk(KERN_ERR "cs4270: 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", i2c_client->addr); printk(KERN_INFO "cs4270: 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"); + return -ENOMEM; + } + codec = &cs4270->codec; + socdev->codec = codec; + + mutex_init(&codec->mutex); + INIT_LIST_HEAD(&codec->dapm_widgets); + INIT_LIST_HEAD(&codec->dapm_paths); + + codec->name = "CS4270"; + codec->owner = THIS_MODULE; + codec->dai = &cs4270_dai; + codec->num_dai = 1; + codec->private_data = cs4270; codec->control_data = i2c_client; codec->read = cs4270_read_reg_cache; codec->write = cs4270_i2c_write; + codec->reg_cache = cs4270->reg_cache; codec->reg_cache_size = CS4270_NUMREGS; /* The I2C interface is set up, so pre-fill our register cache */ @@ -563,35 +595,72 @@ 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"); - goto error; + goto error_free_codec; + } + + /* 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"); + goto error_free_codec; } /* Add the non-DAPM controls */ for (i = 0; i < ARRAY_SIZE(cs4270_snd_controls); i++) { - struct snd_kcontrol *kctrl = - snd_soc_cnew(&cs4270_snd_controls[i], codec, NULL); + struct snd_kcontrol *kctrl; + + kctrl = snd_soc_cnew(&cs4270_snd_controls[i], codec, NULL); + if (!kctrl) { + printk(KERN_ERR "cs4270: error creating control '%s'\n", + cs4270_snd_controls[i].name); + ret = -ENOMEM; + goto error_free_pcms; + } ret = snd_ctl_add(codec->card, kctrl); - if (ret < 0) - goto error; + if (ret < 0) { + printk(KERN_ERR "cs4270: error adding control '%s'\n", + cs4270_snd_controls[i].name); + goto error_free_pcms; + } } - i2c_set_clientdata(i2c_client, codec); + /* Initialize the SOC device */ + + ret = snd_soc_init_card(socdev); + if (ret < 0) { + printk(KERN_ERR "cs4270: failed to register card\n"); + goto error_free_pcms;; + } + + i2c_set_clientdata(i2c_client, socdev); return 0; -error: - codec->control_data = NULL; +error_free_pcms: + snd_soc_free_pcms(socdev); - kfree(codec->reg_cache); - codec->reg_cache = NULL; - codec->reg_cache_size = 0; +error_free_codec: + kfree(cs4270); return ret; } -static const struct i2c_device_id cs4270_id[] = { +static int cs4270_i2c_remove(struct i2c_client *i2c_client) +{ + struct snd_soc_device *socdev = i2c_get_clientdata(i2c_client); + struct snd_soc_codec *codec = socdev->codec; + struct cs4270_private *cs4270 = codec->private_data; + + snd_soc_free_pcms(socdev); + kfree(cs4270); + + return 0; +} + +static struct i2c_device_id cs4270_id[] = { {"cs4270", 0}, {} }; @@ -604,27 +673,9 @@ static struct i2c_driver cs4270_i2c_driver = { }, .id_table = cs4270_id, .probe = cs4270_i2c_probe, + .remove = cs4270_i2c_remove, }; -struct snd_soc_dai cs4270_dai = { - .name = "CS4270", - .playback = { - .stream_name = "Playback", - .channels_min = 1, - .channels_max = 2, - .rates = 0, - .formats = CS4270_FORMATS, - }, - .capture = { - .stream_name = "Capture", - .channels_min = 1, - .channels_max = 2, - .rates = 0, - .formats = CS4270_FORMATS, - }, -}; -EXPORT_SYMBOL_GPL(cs4270_dai); - /* * ASoC probe function * @@ -633,94 +684,15 @@ EXPORT_SYMBOL_GPL(cs4270_dai); */ static int cs4270_probe(struct platform_device *pdev) { - struct snd_soc_device *socdev = platform_get_drvdata(pdev); - struct snd_soc_codec *codec; - int ret = 0; - - printk(KERN_INFO "CS4270 ALSA SoC Codec\n"); - - /* Allocate enough space for the snd_soc_codec structure - and our private data together. */ - codec = kzalloc(ALIGN(sizeof(struct snd_soc_codec), 4) + - sizeof(struct cs4270_private), GFP_KERNEL); - if (!codec) { - printk(KERN_ERR "cs4270: Could not allocate codec structure\n"); - return -ENOMEM; - } - - mutex_init(&codec->mutex); - INIT_LIST_HEAD(&codec->dapm_widgets); - INIT_LIST_HEAD(&codec->dapm_paths); - - codec->name = "CS4270"; - codec->owner = THIS_MODULE; - codec->dai = &cs4270_dai; - codec->num_dai = 1; - codec->private_data = (void *) codec + - ALIGN(sizeof(struct snd_soc_codec), 4); - - socdev->codec = codec; - - /* 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"); - goto error_free_codec; - } - - cs4270_socdev = socdev; - - ret = i2c_add_driver(&cs4270_i2c_driver); - if (ret) { - printk(KERN_ERR "cs4270: failed to attach driver"); - goto error_free_pcms; - } - - /* Did we find a CS4270 on the I2C bus? */ - if (!codec->control_data) { - printk(KERN_ERR "cs4270: failed to attach driver"); - goto error_del_driver; - } + cs4270_socdev = platform_get_drvdata(pdev);; - /* Initialize codec ops */ - cs4270_dai.ops.hw_params = cs4270_hw_params; - cs4270_dai.ops.set_sysclk = cs4270_set_dai_sysclk; - cs4270_dai.ops.set_fmt = cs4270_set_dai_fmt; - cs4270_dai.ops.digital_mute = cs4270_mute; - - ret = snd_soc_init_card(socdev); - if (ret < 0) { - printk(KERN_ERR "cs4270: failed to register card\n"); - goto error_del_driver; - } - - return 0; - -error_del_driver: - i2c_del_driver(&cs4270_i2c_driver); - -error_free_pcms: - snd_soc_free_pcms(socdev); - -error_free_codec: - kfree(socdev->codec); - socdev->codec = NULL; - - return ret; + return i2c_add_driver(&cs4270_i2c_driver); } static int cs4270_remove(struct platform_device *pdev) { - struct snd_soc_device *socdev = platform_get_drvdata(pdev); - - snd_soc_free_pcms(socdev); - i2c_del_driver(&cs4270_i2c_driver); - kfree(socdev->codec); - socdev->codec = NULL; - return 0; } @@ -738,6 +710,8 @@ EXPORT_SYMBOL_GPL(soc_codec_device_cs4270); static int __init cs4270_init(void) { + printk(KERN_INFO "Cirrus Logic CS4270 ALSA SoC Codec Driver\n"); + return snd_soc_register_dai(&cs4270_dai); } module_init(cs4270_init); -- 1.5.5

2 1

[alsa-devel] ASoC updats for 2.6.30
by Mark Brown 23 Jan '09

23 Jan '09

The following changes since commit 56692396447ca3fee061c26f22590a1046fd2d6b: Mark Brown (1): Merge branch 'for-2.6.29' into for-2.6.30 are available in the git repository at: ssh://master.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.30 (the usual git URI should work eventually as well but the mirroring appears to be stuck right now and it's past 5pm on a Friday.) Mark Brown (7): ASoC: Fix merge with PXA tree ASoC: Remove unneeded e7x0 inclusion of pxa-regs.h and hardware.h ASoC: Configure SSP port PLL for Zylonite ASoC: Fix spurious codec driver dependencies Merge branch 'for-2.6.29' into for-2.6.30 ASoC: Include header file in cs4270 and wm9705 ASoC: Fix L3 bus handling in Kconfig Peter Ujfalusi (1): ASoC: Add missing comma to SND_SOC_DAPM_SWITCH_E in soc-dapm.h Steve Sakoman (1): ASoC: Complete Beagleboard support Timur Tabi (1): ASoC: remove stand-alone mode support from CS4270 codec driver include/sound/soc-dapm.h | 2 +- sound/soc/codecs/Kconfig | 5 +-- sound/soc/codecs/cs4270.c | 90 +++++++++++++------------------------------ sound/soc/codecs/wm9705.c | 2 + sound/soc/fsl/Kconfig | 3 +- sound/soc/omap/Kconfig | 14 ++++++- sound/soc/omap/Makefile | 2 + sound/soc/pxa/e740_wm9705.c | 2 - sound/soc/pxa/e750_wm9705.c | 2 - sound/soc/pxa/e800_wm9712.c | 5 +-- sound/soc/pxa/zylonite.c | 8 ++++ sound/soc/s3c24xx/Kconfig | 1 + 12 files changed, 57 insertions(+), 79 deletions(-)

2 10

[alsa-devel] ASoC update for 2.6.29
by Mark Brown 23 Jan '09

23 Jan '09

The following changes since commit 8a9dee59a345f96757dd45699de1c4182d8bf9a9: Timur Tabi (1): ASoC: fix registration of the SoC card in the Freescale MPC8610 drivers are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.29 Peter Ujfalusi (1): ASoC: Add missing comma to SND_SOC_DAPM_SWITCH_E in soc-dapm.h include/sound/soc-dapm.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

2 1