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

[PATCH 1/2] ALSA: HDA: Fix spelling (change VOSTO to VOSTRO)
by David Henningsson 17 Sep '10

17 Sep '10

It was just a boring day. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 7e22ed1..a12a9f6 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3075,7 +3075,7 @@ enum { CXT5066_LAPTOP, /* Laptops w/ EAPD support */ CXT5066_DELL_LAPTOP, /* Dell Laptop */ CXT5066_OLPC_XO_1_5, /* OLPC XO 1.5 */ - CXT5066_DELL_VOSTO, /* Dell Vostro 1015i */ + CXT5066_DELL_VOSTRO, /* Dell Vostro 1015i */ CXT5066_IDEAPAD, /* Lenovo IdeaPad U150 */ CXT5066_THINKPAD, /* Lenovo ThinkPad T410s, others? */ CXT5066_HP_LAPTOP, /* HP Laptop */ @@ -3086,7 +3086,7 @@ static const char *cxt5066_models[CXT5066_MODELS] = { [CXT5066_LAPTOP] = "laptop", [CXT5066_DELL_LAPTOP] = "dell-laptop", [CXT5066_OLPC_XO_1_5] = "olpc-xo-1_5", - [CXT5066_DELL_VOSTO] = "dell-vostro", + [CXT5066_DELL_VOSTRO] = "dell-vostro", [CXT5066_IDEAPAD] = "ideapad", [CXT5066_THINKPAD] = "thinkpad", [CXT5066_HP_LAPTOP] = "hp-laptop", @@ -3099,8 +3099,8 @@ static struct snd_pci_quirk cxt5066_cfg_tbl[] = { CXT5066_DELL_LAPTOP), SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT5066_OLPC_XO_1_5), SND_PCI_QUIRK(0x1025, 0x040a, "Acer", CXT5066_IDEAPAD), - SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTO), - SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTO), + SND_PCI_QUIRK(0x1028, 0x02d8, "Dell Vostro", CXT5066_DELL_VOSTRO), + SND_PCI_QUIRK(0x1028, 0x0402, "Dell Vostro", CXT5066_DELL_VOSTRO), SND_PCI_QUIRK(0x1028, 0x0408, "Dell Inspiron One 19T", CXT5066_IDEAPAD), SND_PCI_QUIRK(0x103c, 0x360b, "HP G60", CXT5066_HP_LAPTOP), SND_PCI_QUIRK(0x1179, 0xff1e, "Toshiba Satellite C650D", CXT5066_IDEAPAD), @@ -3207,7 +3207,7 @@ static int patch_cxt5066(struct hda_codec *codec) spec->capture_prepare = cxt5066_olpc_capture_prepare; spec->capture_cleanup = cxt5066_olpc_capture_cleanup; break; - case CXT5066_DELL_VOSTO: + case CXT5066_DELL_VOSTRO: codec->patch_ops.init = cxt5066_init; codec->patch_ops.unsol_event = cxt5066_vostro_event; spec->init_verbs[0] = cxt5066_init_verbs_vostro; -- 1.7.1 --------------080203050801010400030502 Content-Type: text/x-patch; name="0002-ALSA-HDA-Sort-CXT5066-quirk-table.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0002-ALSA-HDA-Sort-CXT5066-quirk-table.patch"

1 0

[alsa-devel] Programming ALSA sound device.
by Bankim Bhavsar 17 Sep '10

17 Sep '10

Producer thread writes sound bytes worth 10 ms every 10 ms to a ring buffer. Consumer thread is responsible for writing sound bytes to ALSA sound device in a strictly non-blocking fashion. Consumer thread checks snd_pcm_avail/snd_pcm_avail_update, fetches minimum of sound bytes available in ring buffer and availFrames(returned by snd_pcm_avail_update) and writes to sound device using snd_pcm_writei(). Consumer thread polls every 20 ms. However on consumer thread snd_pcm_avail/snd_pcm_avail_update() returns 0 at least 3-4 times consecutively (total 60-80 ms) and on every 5th-6th poll snd_pcm_avail/snd_pcm_avail_update returns full buffer size occasionally reporting an under-run. On an average, under-run is reported at least 10-15 times a minute which is not desirable. Following are the hardware and software parameter settings. hardware params: 16-bit 44100 stereo buffer time 200 ms period time 25 ms software params: start_threshold: full buffer size no setting for avail_min Alternatively I've tried using wait_for_poll() technique as mentioned in the example. http://www.alsa-project.org/alsa-doc/alsa-lib/_2test_2pcm_8c-example.html However poll() unblocks very rapidly and producer ring buffer doesn't have enough bytes. What's the best technique for PCM playback for such use cases? Is it okay to skip calling snd_pcm_avail/snd_pcm_avail_update and directly attempt writing to ALSA sound device instead? Let me know if more information is required. Thanks, Bankim.

2 1

Re: [alsa-devel] [patch] ALSA: usb/mixer: remove bogus cast
by Takashi Iwai 16 Sep '10

16 Sep '10

At Thu, 16 Sep 2010 20:13:47 +0200, Dan Carpenter wrote: > > "uinfo->value.enumerated.item" is an unsigned int. If it's negative > when we do the comparison: > if ((int)uinfo->value.enumerated.item >= cval->max) > then we would read past the end of the array on the next line. This cast was for the old crappy gcc who spews bogus warnings when compared with signed and unsigned ints. The kernel sets a compile flag for avoiding this since long time ago, so we can get rid of such cast gracefully now, indeed. > I also changed the strcpy() to strlcpy() out of paranoia. > > Signed-off-by: Dan Carpenter <error27(a)gmail.com> Applied now. Thanks. Takashi > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index 3ed3901..93c95c5 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -1642,9 +1642,10 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol, struct snd_ctl > uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED; > uinfo->count = 1; > uinfo->value.enumerated.items = cval->max; > - if ((int)uinfo->value.enumerated.item >= cval->max) > + if (uinfo->value.enumerated.item >= cval->max) > uinfo->value.enumerated.item = cval->max - 1; > - strcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item]); > + strlcpy(uinfo->value.enumerated.name, itemlist[uinfo->value.enumerated.item], > + sizeof(uinfo->value.enumerated.name)); > return 0; > } > >

1 0

[alsa-devel] [PATCH 0/4] ASoC: fsi: DMA support 1st step
by Kuninori Morimoto 16 Sep '10

16 Sep '10

Dear Mark, Liam These patches are 1st step for DMA support of FSI driver Kuninori Morimoto (4): ASoC: fsi: Add fsi_dma_get_area ASoC: fsi: Add fsi_dma_soft_push/pop function ASoC: fsi: modify variable name to easy to understand ASoC: fsi: merge fsi_data_push/pop to fsi_fifo_data_ctrl These patches didn't add new feature. FSI driver is still using PIO. And above patches indicate it as "soft dma". I will add DMAEngine support for FSI in future Best regards -- Kuninori Morimoto

2 6

[alsa-devel] [PATCH] ASoC: ak4642: code clean up
by Kuninori Morimoto 16 Sep '10

16 Sep '10

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/ak4642.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index c84cc9c..a95ff4f 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -422,7 +422,7 @@ static int ak4642_probe(struct snd_soc_codec *codec) dev_info(codec->dev, "AK4642 Audio Codec %s", AK4642_VERSION); codec->hw_write = (hw_write_t)i2c_master_send; - codec->control_data = ak4642->control_data; + codec->control_data = ak4642->control_data; snd_soc_add_controls(codec, ak4642_snd_controls, ARRAY_SIZE(ak4642_snd_controls)); @@ -431,12 +431,12 @@ static int ak4642_probe(struct snd_soc_codec *codec) } static struct snd_soc_codec_driver soc_codec_dev_ak4642 = { - .probe = ak4642_probe, - .resume = ak4642_resume, - .read = ak4642_read_reg_cache, - .write = ak4642_write, - .reg_cache_size = ARRAY_SIZE(ak4642_reg), - .reg_word_size = sizeof(u8), + .probe = ak4642_probe, + .resume = ak4642_resume, + .read = ak4642_read_reg_cache, + .write = ak4642_write, + .reg_cache_size = ARRAY_SIZE(ak4642_reg), + .reg_word_size = sizeof(u8), .reg_cache_default = ak4642_reg, }; @@ -448,7 +448,7 @@ static __devinit int ak4642_i2c_probe(struct i2c_client *i2c, int ret; ak4642 = kzalloc(sizeof(struct ak4642_priv), GFP_KERNEL); - if (ak4642 == NULL) + if (!ak4642) return -ENOMEM; i2c_set_clientdata(i2c, ak4642); @@ -481,9 +481,9 @@ static struct i2c_driver ak4642_i2c_driver = { .name = "ak4642-codec", .owner = THIS_MODULE, }, - .probe = ak4642_i2c_probe, - .remove = __devexit_p(ak4642_i2c_remove), - .id_table = ak4642_i2c_id, + .probe = ak4642_i2c_probe, + .remove = __devexit_p(ak4642_i2c_remove), + .id_table = ak4642_i2c_id, }; #endif -- 1.7.0.4

3 2

[alsa-devel] [PATCH 1/3] ASoC: Add debugfs listing of registered CODECs
by Mark Brown 16 Sep '10

16 Sep '10

Help with diagnostics for machine driver setup by listing all the registered CODECs in debugfs. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 59b99fb..5e4a1f4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -271,6 +271,33 @@ static void soc_cleanup_codec_debugfs(struct snd_soc_codec *codec) debugfs_remove_recursive(codec->debugfs_codec_root); } +static ssize_t codec_list_read_file(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + char *buf = kmalloc(PAGE_SIZE, GFP_KERNEL); + ssize_t ret = 0; + struct snd_soc_codec *codec; + + if (!buf) + return -ENOMEM; + + list_for_each_entry(codec, &codec_list, list) + ret += snprintf(buf + ret, PAGE_SIZE - ret, "%s\n", + codec->name); + + if (ret >= 0) + ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret); + + kfree(buf); + + return ret; +} + +static const struct file_operations codec_list_fops = { + .read = codec_list_read_file, + .llseek = default_llseek,/* read accesses f_pos */ +}; + #else static inline void soc_init_codec_debugfs(struct snd_soc_codec *codec) @@ -3192,6 +3219,11 @@ static int __init snd_soc_init(void) "ASoC: Failed to create debugfs directory\n"); debugfs_root = NULL; } + + if (!debugfs_create_file("codecs", 0444, debugfs_root, NULL, + &codec_list_fops)) + pr_warn("ASoC: Failed to create CODEC list debugfs file\n"); + #endif return platform_driver_register(&soc_driver); -- 1.7.1

2 3

Re: [alsa-devel] cmipci surround sound front-left plays on lfe
by Clemens Ladisch 16 Sep '10

16 Sep '10

Tom Corner wrote: > On 09/10/10 09:10, Clemens Ladisch wrote: >> Tom Corner wrote: >>> The surround sound 5.1 is playing fine except channel 0 (front-left) >>> is playing on the woofer. >> >> And the software's front left channel is also playing on the front left >> speaker? And the subwoofer channel isn't playing on any speaker? > > No the subwoofer is playing correctly. The front-left is playing *only* > on the subwoofer. There is no sound at all coming out of the front-left > speaker. In other words, what happens is this? speaker output ---------------------- front L silence front R front R center center bass mix of front L + bass surround L surround L surround R surround R What happens when you run speaker-test with 4 and 2 channels? Regards, Clemens

4 4

[alsa-devel] [PATCH] ALSA: HDA: Enable internal speaker on Dell M101z
by David Henningsson 16 Sep '10

16 Sep '10

BugLink: http://launchpad.net/bugs/640254 In some cases a magic processing coefficient is needed to enable the internal speaker on Dell M101z. According to Realtek, this processing coefficient is only present on ALC269vb. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 1

[alsa-devel] [PATCH] ALSA: core: Allow card id change to the same string
by Peter Ujfalusi 16 Sep '10

16 Sep '10

When user want to change the card id to the same string on the card via /sys/class/sound/cardX/id, do not report error. Instead return with success without doing anything. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- sound/core/init.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sound/core/init.c b/sound/core/init.c index ec4a50c..2de45fb 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -607,11 +607,16 @@ card_id_store_attr(struct device *dev, struct device_attribute *attr, return -EEXIST; } for (idx = 0; idx < snd_ecards_limit; idx++) { - if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1)) - goto __exist; + if (snd_cards[idx] && !strcmp(snd_cards[idx]->id, buf1)) { + if (card == snd_cards[idx]) + goto __ok; + else + goto __exist; + } } strcpy(card->id, buf1); snd_info_card_id_change(card); +__ok: mutex_unlock(&snd_card_mutex); return count; -- 1.7.2.2

2 1

[alsa-devel] [PATCH] configure.in: Create missing include/pcmcia
by Ozan Çağlayan 16 Sep '10

16 Sep '10

With kernels >= 2.6.36, the include/pcmcia/cs_types.h file can not be created because of the missing parent directory. Signed-off-by: Ozan Çağlayan <ozan(a)pardus.org.tr> --- configure.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.in b/configure.in index c8fefef..82ef3c0 100644 --- a/configure.in +++ b/configure.in @@ -461,7 +461,7 @@ AC_DEFUN([CHECK_KERNEL_HEADER], [ AC_MSG_RESULT(no) if test ! -f include/$1; then mkdir -p include/linux include/asm include/media - mkdir -p include/linux/regulator include/linux/usb + mkdir -p include/linux/regulator include/linux/usb include/pcmcia if test -z "$2" ; then echo "Creating a dummy <$1>..." touch include/$1 -- 1.7.2.1

2 1