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

[alsa-devel] [RFC] [PATCH v2] ASoC: CX20442: push down machine independent line discipline bits
by Janusz Krzysztofik 29 Jul '09

29 Jul '09

This corrected patch adds machine independent line discipline code, prevoiusly exsiting inside my Amstrad Delta ASoC machine dirver, to the Conexant CX20442 codec driver. The code can be used as a standalone line discipline, or as a set of codec specific functions called from machine's line discipline callbacks. Anyway, the line discipline itself must be registered by a machine driver. Applies on top of the followup to my initial driver version: http://mailman.alsa-project.org/pipermail/alsa-devel/2009-July/019757.html Suggested by ASoC manintainer Mark Brown <broonie(a)opensource.wolfsonmicro.com> Signed-off-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> --- Corrections: sound/soc/codecs/cx20442.c line 300: -static struct tty_ldisc_ops v253_ops = { +struct tty_ldisc_ops v253_ops = { line 420: - dev_err(&codec->dev, "Failed to register codec: %d\n", ret); + dev_err(codec->dev, "Failed to register codec: %d\n", ret); line 425: - dev_err(&codec->dev, "Failed to register DAI: %d\n", ret); + dev_err(codec->dev, "Failed to register DAI: %d\n", ret); Corrected patch: --- linux-2.6.31-rc3/sound/soc/codecs/cx20442.h.orig 2009-07-22 04:56:45.000000000 +0200 +++ linux-2.6.31-rc3/sound/soc/codecs/cx20442.h 2009-07-28 21:23:17.000000000 +0200 @@ -15,5 +15,6 @@ extern struct snd_soc_dai cx20442_dai; extern struct snd_soc_codec_device cx20442_codec_dev; +extern struct tty_ldisc_ops v253_ops; #endif --- linux-2.6.31-rc3/sound/soc/codecs/cx20442.c.orig 2009-07-28 20:26:18.000000000 +0200 +++ linux-2.6.31-rc3/sound/soc/codecs/cx20442.c 2009-07-29 02:16:05.000000000 +0200 @@ -13,6 +13,8 @@ * option) any later version. */ +#include <linux/tty.h> + #include <sound/core.h> #include <sound/initval.h> #include <sound/soc-dapm.h> @@ -172,8 +174,7 @@ static int cx20442_write(struct snd_soc_ return -EINVAL; /* hw_write and control_data pointers required for talking to the modem - * are expected to be set by the machine driver's line discipline - * initialization code */ + * are expected to be set by the line discipline initialization code */ if (!codec->hw_write || !codec->control_data) return -EIO; @@ -208,6 +209,111 @@ static int cx20442_write(struct snd_soc_ return 0; } + +/* Moved up here as line discipline referres it during initialization */ +static struct snd_soc_codec *cx20442_codec; + + +/* + * Line discpline related code + * + * Any of the callback functions below can be used in two ways: + * 1) registerd by a machine driver as one of line discipline operations, + * 2) called from a machine's provided line discipline callback function + * in case when extra machine specific code must be run as well. + */ + +/* Modem init: echo off, digital speaker off, quiet off, voice mode */ +static const char *v253_init = "ate0m0q0+fclass=8\r"; + +/* Line discipline .open() */ +static int v253_open(struct tty_struct *tty) +{ + struct snd_soc_codec *codec = cx20442_codec; + int ret, len = strlen(v253_init); + + /* Doesn't make sense without write callback */ + if (!tty->ops->write) + return -EINVAL; + + /* Pass the codec structure address for use by other ldisc callbacks */ + tty->disc_data = codec; + + if (tty->ops->write(tty, v253_init, len) != len) { + ret = -EIO; + goto err; + } + /* Actual setup will be performed after the modem responds. */ + return 0; +err: + tty->disc_data = NULL; + return ret; +} + +/* Line discipline .close() */ +static void v253_close(struct tty_struct *tty) +{ + struct snd_soc_codec *codec = tty->disc_data; + + tty->disc_data = NULL; + + if (!codec) + return; + + /* Prevent the codec driver from further accessing the modem */ + codec->hw_write = NULL; + codec->control_data = NULL; + codec->pop_time = 0; +} + +/* Line discipline .hangup() */ +static int v253_hangup(struct tty_struct *tty) +{ + v253_close(tty); + return 0; +} + +/* Line discipline .receive_buf() */ +static void v253_receive(struct tty_struct *tty, + const unsigned char *cp, char *fp, int count) +{ + struct snd_soc_codec *codec = tty->disc_data; + + if (!codec) + return; + + if (!codec->control_data) { + /* First modem response, complete setup procedure */ + + /* Set up codec driver access to modem controls */ + codec->control_data = tty; + codec->hw_write = (hw_write_t)tty->ops->write; + codec->pop_time = 1; + } +} + +/* Line discipline .write_wakeup() */ +static void v253_wakeup(struct tty_struct *tty) +{ +} + +struct tty_ldisc_ops v253_ops = { + .magic = TTY_LDISC_MAGIC, + .name = "cx20442", + .owner = THIS_MODULE, + .open = v253_open, + .close = v253_close, + .hangup = v253_hangup, + .receive_buf = v253_receive, + .write_wakeup = v253_wakeup, +}; +EXPORT_SYMBOL_GPL(v253_ops); + + +/* + * Codec DAI + */ + struct snd_soc_dai cx20442_dai = { .name = "CX20442", .playback = { @@ -227,8 +333,6 @@ struct snd_soc_dai cx20442_dai = { }; EXPORT_SYMBOL_GPL(cx20442_dai); -static struct snd_soc_codec *cx20442_codec; - static int cx20442_codec_probe(struct platform_device *pdev) { struct snd_soc_device *socdev = platform_get_drvdata(pdev); @@ -313,13 +417,13 @@ static int cx20442_register(struct cx204 ret = snd_soc_register_codec(codec); if (ret != 0) { - dev_err(&codec->dev, "Failed to register codec: %d\n", ret); + dev_err(codec->dev, "Failed to register codec: %d\n", ret); goto err; } ret = snd_soc_register_dai(&cx20442_dai); if (ret != 0) { - dev_err(&codec->dev, "Failed to register DAI: %d\n", ret); + dev_err(codec->dev, "Failed to register DAI: %d\n", ret); goto err_codec; }

1 0

[alsa-devel] Strange behaviour with varying frame sizes on read
by Metathronius Galabant 29 Jul '09

29 Jul '09

Hi all, please consider the following: Period size is 80 frames, buffer size is 320 frames. For all 3 tests I have 240 frames ready to read. snd_pcm_avail_update() confirms this. Outcome of my tests: 1) I want to read 80 frames, and get 80 frames. - OK, this is really basic. 2) I want to read 81 frames, and get 80 frames. - FAIL. 3) I want to read 80 frames, and get 80 frames. Then I read 1 frame, and get 1 frame. - HUH? I've both tested snd_pcm_readi() and snd_pcm_mmap_readi() - both have the same semantic. Is there any explanation for this kind of illogical behaviour (I have version 1.0.14, which might be a bit old, but still)? I should be able to read rather arbitrary amounts from a software buffer, don't I? Cheers, M.

1 0

[alsa-devel] Using Alsa for AD1981b on 9263
by Shilpa Kedar Walvekar 29 Jul '09

29 Jul '09

Hi, Addition to my earlier post: We are using AT91SAM9263 evaluation kit with on-board AD1981b codec. We are using Linux kernel version 2.6.27 with patches available on http://linux4sam.com. We found from the forum that we need to use ALSA for playing and recording audio using this codec. So we downloaded Alsa-lib-1.0.20 Alsa-oss-1.0.20 Alsa-utils-1.0.20 We installed above using: ./configure && make && make install We then downloaded alsa-driver-1.0.20 and installed it using below: ./configure --with-cards=atmel-ac97c --with-kernel=../../linux-2.6.27 --with-build=../../linux-2.6.27 && make ARCH=arm && make install-modules Driver was compiled and installed successfully. We found following: # cat /proc/asound/cards 0 [AC97 ]: ac97c - Atmel AC97 Atmel AC97 Controller at 0xfffa0000, irq 18 # lsmod Module Size Used by Not tainted snd_at91_ac97 8420 0 snd_ac97_codec 99904 1 snd_at91_ac97 snd_soc_atmel_pcm 4484 0 snd_soc_core 30852 1 snd_soc_atmel_pcm snd_pcm 60772 4 snd_at91_ac97,snd_ac97_codec,snd_soc_atmel_pcm,s nd_soc_core snd_page_alloc 6056 1 snd_pcm snd_timer 19588 1 snd_pcm snd 47700 5 snd_at91_ac97,snd_ac97_codec,snd_soc_core,snd_pc m,snd_timer soundcore 6052 1 snd ac97_bus 1568 1 snd_ac97_codec # cat /home/.asoundrc pcm.!default { type hw card 0 } ctl.!default { type hw card 0 } We have following devices in /dev/snd # cat /dev/snd/ /dev/snd/controlC0 /dev/snd/controlC3 /dev/snd/hwC0D2 /dev/snd/timer /dev/snd/controlC1 /dev/snd/hwC0D0 /dev/snd/hwC0D3 /dev/snd/controlC2 /dev/snd/hwC0D1 /dev/snd/seq # aplay -l **** List of PLAYBACK Hardware Devices **** ALSA lib conf.c:2700:(snd_config_hooks_call) Cannot open shared library (null) ALSA lib conf.c:3079:(snd_config_update_r) hooks failed, removing configuration aplay: device_list:232: control open (0): No such file or directory We are not able to get if module is getting loaded, then why aplay doesn't list the device? Please help us to get the audio codec working. Regards, --Shilpa.

3 3

[alsa-devel] ASoC updates for 2.6.32
by Mark Brown 29 Jul '09

29 Jul '09

The following changes since commit 4ce2f2fe61002ab35c9333d52c95b5ff9e949f50: Marek Vasut (1): ASoC: Switch palm27x-asoc to jack detection api are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32 Barry Song (2): ASoC: blackfin I2S(TDM mode) CPU DAI driver ASoC: board driver to connect bf5xx with ad1938 Janusz Krzysztofik (1): ASoC: CX20442: fix issues pointed out by subsystem maintainer sound/soc/blackfin/Kconfig | 23 +++- sound/soc/blackfin/Makefile | 6 + sound/soc/blackfin/bf5xx-ad1938.c | 142 +++++++++++++++ sound/soc/blackfin/bf5xx-tdm-pcm.c | 330 ++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-tdm-pcm.h | 21 +++ sound/soc/blackfin/bf5xx-tdm.c | 343 ++++++++++++++++++++++++++++++++++++ sound/soc/blackfin/bf5xx-tdm.h | 14 ++ sound/soc/codecs/cx20442.c | 17 +- 8 files changed, 888 insertions(+), 8 deletions(-) create mode 100644 sound/soc/blackfin/bf5xx-ad1938.c create mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.c create mode 100644 sound/soc/blackfin/bf5xx-tdm-pcm.h create mode 100644 sound/soc/blackfin/bf5xx-tdm.c create mode 100644 sound/soc/blackfin/bf5xx-tdm.h

2 1

Re: [alsa-devel] Testers wanted: New SB X-Fi driver
by Takashi Iwai 29 Jul '09

29 Jul '09

[Please don't do top-posting] At Tue, 28 Jul 2009 14:50:10 -0500, Ted T. Logan wrote: > > Just got the latest as of today, > > click > click > click > click > click > > :( > mplayer yesterday.mp3 For testing this kind of problem, use aplay and try different --period-size and --buffer-size options. mplayer isn't suitable for primary testing. If the click period doesn't change regardless of the period size option value, it implies that the noise doesn't come from the buffer set up but rather from other routes. If the noise period changes with different period size options, the click noise is a buffer setup issue. In addition, it'd be better to use aplay with -Dplughw to avoid the automatic routing to PA. Also, your description was unclear. It it only click without other tone, or repeated sound, or the click noise appear on the normal playback, or what? The repeated sound bug with emu20k2 (it didn't appear with emu20k1) was fixed as I mentioned. But, if it's click noise on the normal playback, then I don't know. Better to ask Creative guys... thanks, Takashi

1 0

[alsa-devel] Assert when attempting to use pulseaudio git master with the a52 plugin.
by Luke Yelavich 29 Jul '09

29 Jul '09

Hi all I would like to bring to your attention a bug in the a52 plugin when working with pulseaudio. The full details are found in the ALSA bug tracker: https://bugtrack.alsa-project.org/alsa-bug/bug_view_advanced_page.php?bug_i… I am happy for follow ups to be in the bug or on this list. Thanks Luke

1 0

[PATCH] ASoC: MPC5200: Support for buffer wrap around
by John Bonesio 29 Jul '09

29 Jul '09

The code in psc_dma_bcom_enqueue_tx() didn't account for the fact that s->runtime->control->appl_ptr can wrap around to the beginning of the buffer. This change fixes this problem. Signed-off-by: John Bonesio <bones(a)secretlab.ca> --- sound/soc/fsl/mpc5200_dma.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c index cfe0ea4..2551c58 100644 --- a/sound/soc/fsl/mpc5200_dma.c +++ b/sound/soc/fsl/mpc5200_dma.c @@ -70,6 +70,23 @@ static void psc_dma_bcom_enqueue_next_buffer(struct psc_dma_stream *s) static void psc_dma_bcom_enqueue_tx(struct psc_dma_stream *s) { + if (s->appl_ptr > s->runtime->control->appl_ptr) { + /* + * In this case s->runtime->control->appl_ptr has wrapped around. + * Play the data to the end of the boundary, then wrap our own + * appl_ptr back around. + */ + while (s->appl_ptr < s->runtime->boundary) { + if (bcom_queue_full(s->bcom_task)) + return; + + s->appl_ptr += s->period_size; + + psc_dma_bcom_enqueue_next_buffer(s); + } + s->appl_ptr -= s->runtime->boundary; + } + while (s->appl_ptr < s->runtime->control->appl_ptr) { if (bcom_queue_full(s->bcom_task)) -- 1.6.0.4 --=-D7TcNx246dz2g/fqLr/C--

1 0

[alsa-devel] [PATCH] ASoC: CX20442: fix issues pointed out by subsystem maintainer
by Janusz Krzysztofik 29 Jul '09

29 Jul '09

The patch fixes some checkpatch identified issues and adds a comment about line discipline interaction to my driver code, as requested by Mark on my inital submission (thank you Mark for applying my imperfect patch anyway). It also fixes MODULE_ALIAS mismatch as used in my machine driver. Signed-off-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> --- In my next attempt, I'll try to satisfy Mark's request for pushing down the line discipline code, now existing in my machine driver, to the codec driver. --- linux-2.6.31-rc3/sound/soc/codecs/cx20442.c.orig 2009-07-22 04:56:45.000000000 +0200 +++ linux-2.6.31-rc3/sound/soc/codecs/cx20442.c 2009-07-22 21:46:41.000000000 +0200 @@ -132,7 +132,7 @@ enum v253_vls { static int cx20442_pm_to_v253_vls(u8 value) { - switch(value & ~(1 << CX20442_AGC)) { + switch (value & ~(1 << CX20442_AGC)) { case 0: return V253_VLS_T; case (1 << CX20442_SPKOUT): @@ -152,7 +152,7 @@ static int cx20442_pm_to_v253_vls(u8 val } static int cx20442_pm_to_v253_vsp(u8 value) { - switch(value & ~(1 << CX20442_AGC)) { + switch (value & ~(1 << CX20442_AGC)) { case (1 << CX20442_SPKOUT): case (1 << CX20442_MIC): case (1 << CX20442_SPKOUT) | (1 << CX20442_MIC): @@ -171,6 +171,9 @@ static int cx20442_write(struct snd_soc_ if (reg >= codec->reg_cache_size) return -EINVAL; + /* hw_write and control_data pointers required for talking to the modem + * are expected to be set by the machine driver's line discipline + * initialization code */ if (!codec->hw_write || !codec->control_data) return -EIO; @@ -182,7 +185,7 @@ static int cx20442_write(struct snd_soc_ return vls; vsp = cx20442_pm_to_v253_vsp(value); - if (vsp < 0 ) + if (vsp < 0) return vsp; if ((vls == V253_VLS_T) || @@ -232,7 +235,7 @@ static int cx20442_codec_probe(struct pl struct snd_soc_codec *codec; int ret; - if(!cx20442_codec) { + if (!cx20442_codec) { dev_err(&pdev->dev, "cx20442 not yet discovered\n"); return -ENODEV; } @@ -310,13 +313,13 @@ static int cx20442_register(struct cx204 ret = snd_soc_register_codec(codec); if (ret != 0) { - //dev_err(&dev->dev, "Failed to register codec: %d\n", ret); + dev_err(&codec->dev, "Failed to register codec: %d\n", ret); goto err; } ret = snd_soc_register_dai(&cx20442_dai); if (ret != 0) { - //dev_err(&dev->dev, "Failed to register DAI: %d\n", ret); + dev_err(&codec->dev, "Failed to register DAI: %d\n", ret); goto err_codec; } @@ -392,4 +395,4 @@ module_exit(cx20442_exit); MODULE_DESCRIPTION("ASoC CX20442-11 voice modem codec driver"); MODULE_AUTHOR("Janusz Krzysztofik"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:cx20442-codec"); +MODULE_ALIAS("platform:cx20442");

2 1

[alsa-devel] [RFC] [PATCH] ASoC: CX20442: push down machine independent line discipline bits
by Janusz Krzysztofik 29 Jul '09

29 Jul '09

This patch adds machine independent line discipline code, prevoiusly exsiting inside my Amstrad Delta ASoC machine dirver, to the Conexant CX20442 codec driver. The code can be used as a standalone line discipline, or as a set of codec specific functions called from machine's line discipline callbacks. Anyway, the line discipline itself must be registered by a machine driver. Suggested by ASoC manintainer Mark Brown <broonie(a)opensource.wolfsonmicro.com> (Hardly understood, imperfectly implemented and) Signed-off-by: Janusz Krzysztofik <jkrzyszt(a)tis.icnet.pl> --- Mark, does it follow your idea closely enough? --- linux-2.6.31-rc3/sound/soc/codecs/cx20442.h.orig 2009-07-22 04:56:45.000000000 +0200 +++ linux-2.6.31-rc3/sound/soc/codecs/cx20442.h 2009-07-28 21:23:17.000000000 +0200 @@ -15,5 +15,6 @@ extern struct snd_soc_dai cx20442_dai; extern struct snd_soc_codec_device cx20442_codec_dev; +extern struct tty_ldisc_ops v253_ops; #endif --- linux-2.6.31-rc3/sound/soc/codecs/cx20442.c.orig 2009-07-28 20:26:18.000000000 +0200 +++ linux-2.6.31-rc3/sound/soc/codecs/cx20442.c 2009-07-28 21:19:43.000000000 +0200 @@ -13,6 +13,8 @@ * option) any later version. */ +#include <linux/tty.h> + #include <sound/core.h> #include <sound/initval.h> #include <sound/soc-dapm.h> @@ -172,8 +174,7 @@ static int cx20442_write(struct snd_soc_ return -EINVAL; /* hw_write and control_data pointers required for talking to the modem - * are expected to be set by the machine driver's line discipline - * initialization code */ + * are expected to be set by a line discipline initialization code */ if (!codec->hw_write || !codec->control_data) return -EIO; @@ -208,6 +209,111 @@ static int cx20442_write(struct snd_soc_ return 0; } + +/* Moved up here as line discipline referres it during initialization */ +static struct snd_soc_codec *cx20442_codec; + + +/* + * Line discpline related code + * + * Any of the callback functions below can be used in two ways: + * 1) registerd by a machine driver as one of line discipline operations, + * 2) called from inside a machine specific line discipline callback function + * in case when extra machine specific code must be run as well. + */ + +/* Modem init: echo off, digital speaker off, quiet off, voice mode */ +static const char *v253_init = "ate0m0q0+fclass=8\r"; + +/* Line discipline .open() */ +static int v253_open(struct tty_struct *tty) +{ + struct snd_soc_codec *codec = cx20442_codec; + int ret, len = strlen(v253_init); + + /* Doesn't make sense without write callback */ + if (!tty->ops->write) + return -EINVAL; + + /* Pass the codec structure address for use by other ldisc callbacks */ + tty->disc_data = codec; + + if (tty->ops->write(tty, v253_init, len) != len) { + ret = -EIO; + goto err; + } + /* Actual setup will be performed after the modem responds. */ + return 0; +err: + tty->disc_data = NULL; + return ret; +} + +/* Line discipline .close() */ +static void v253_close(struct tty_struct *tty) +{ + struct snd_soc_codec *codec = tty->disc_data; + + tty->disc_data = NULL; + + if (!codec) + return; + + /* Prevent the codec driver from further accessing the modem */ + codec->hw_write = NULL; + codec->control_data = NULL; + codec->pop_time = 0; +} + +/* Line discipline .hangup() */ +static int v253_hangup(struct tty_struct *tty) +{ + v253_close(tty); + return 0; +} + +/* Line discipline .receive_buf() */ +static void v253_receive(struct tty_struct *tty, + const unsigned char *cp, char *fp, int count) +{ + struct snd_soc_codec *codec = tty->disc_data; + + if (!codec) + return; + + if (!codec->control_data) { + /* First modem response, complete setup procedure */ + + /* Set up codec driver access to modem controls */ + codec->control_data = tty; + codec->hw_write = (hw_write_t)tty->ops->write; + codec->pop_time = 1; + } +} + +/* Line discipline .write_wakeup() */ +static void v253_wakeup(struct tty_struct *tty) +{ +} + +static struct tty_ldisc_ops v253_ops = { + .magic = TTY_LDISC_MAGIC, + .name = "cx20442", + .owner = THIS_MODULE, + .open = v253_open, + .close = v253_close, + .hangup = v253_hangup, + .receive_buf = v253_receive, + .write_wakeup = v253_wakeup, +}; +EXPORT_SYMBOL_GPL(v253_ops); + + +/* + * Codec DAI + */ + struct snd_soc_dai cx20442_dai = { .name = "CX20442", .playback = { @@ -227,8 +333,6 @@ struct snd_soc_dai cx20442_dai = { }; EXPORT_SYMBOL_GPL(cx20442_dai); -static struct snd_soc_codec *cx20442_codec; - static int cx20442_codec_probe(struct platform_device *pdev) { struct snd_soc_device *socdev = platform_get_drvdata(pdev);

2 1

[alsa-devel] [PATCH 0/2]blackfin TDM dai and blackfin-ad1938 machine driver
by Barry Song 29 Jul '09

29 Jul '09

Hi Mark, The following two patches are the 2nd version for the "new support for ad1938 codec" patch sequence. Since you have applied the codec driver patch([PATCH 1/3] new ad1938 codec driver based on asoc), here I only send the DAI and Board driver patches again according to your feedback. Patch 1: blackfin I2S(TDM mode) CPU DAI driver Patch 2: board driver to connect bf5xx with ad1938 Detailed description about every patch and changes is included in the corresponding patch. Thanks Barry

2 9