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

[alsa-devel] [PATCH] sound, core, pcm_lib: remember to always call va_end() on stuff that we va_start()
by Jesper Juhl 21 Dec '10

21 Dec '10

Hi, The Coverity checker spotted that we do not always remember to call va_end() on 'args' in failure paths in snd_pcm_hw_rule_add(). Here's a patch to fix that up (compile tested only) - it also removes some annoying trailing whitespace that caught my eye while I was in the area.. Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> --- pcm_lib.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index b75db8e..11446a1 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -1070,8 +1070,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond, struct snd_pcm_hw_rule *new; unsigned int new_rules = constrs->rules_all + 16; new = kcalloc(new_rules, sizeof(*c), GFP_KERNEL); - if (!new) + if (!new) { + va_end(args); return -ENOMEM; + } if (constrs->rules) { memcpy(new, constrs->rules, constrs->rules_num * sizeof(*c)); @@ -1087,8 +1089,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond, c->private = private; k = 0; while (1) { - if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps))) + if (snd_BUG_ON(k >= ARRAY_SIZE(c->deps))) { + va_end(args); return -EINVAL; + } c->deps[k++] = dep; if (dep < 0) break; @@ -1097,7 +1101,7 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond, constrs->rules_num++; va_end(args); return 0; -} +} EXPORT_SYMBOL(snd_pcm_hw_rule_add); -- Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ Don't top-post http://www.catb.org/~esr/jargon/html/T/top-post.html Plain text mails only, please.

2 1

[alsa-devel] [PATCHes 00/10] ASoC: Samsung: Enable latest SoCs
by Jassi＠alsa-project.org 21 Dec '10

21 Dec '10

From: Jassi Brar <jassi.brar(a)samsung.com> Hi, Next coming are patches that enable I2S and AC97 support on Samsung's latest SoC based SMDKs. The platform side support has been submitted to the LAML. Thanks, Jassi

4 15

[alsa-devel] ASoC cache code (looking toward 2.6.38 merge window)
by Takashi Iwai 20 Dec '10

20 Dec '10

Hi, while I took a lazy glance over ASoC code now (well in a sort of escapism mode), I found again soc-cache.c has many redundant codes. It's pretty easy to do some cleanups. After 5 minutes rewrite, over 300 LOC reduced. But I remember you wanted to work on it for portability, e.g. endianness. The same problem seems still remaining, for example, snd_socc_16_16_read_i2c() has cpu_to_be16() while no others have such. Any progress on this? Or should I post you patchesf first? Also, for now, the new nice cache compression support is always built-in although the additional code size isn't so negligible and its user is just only one. Wouldn't it be better to give new Kconfig for them? I'm also no big fan for small Kconfigs, but in this case, I see no better resolution. Since 2.6.38 merge window gets closer, we need to decide it quickly. thanks, Takashi

3 23

[alsa-devel] Channel configuration
by Irfan Shaikh 20 Dec '10

20 Dec '10

Not able to configure my playback device to MONO . But my playback device supports MONO. What is wrong in the below configuration Error : Channels not available for PLAYBACK device retVal = snd_pcm_hw_params_set_channels( pcm, hwparams, 1); if (retVal < 0){ printf("Channels not available : %s\n", name); return retVal; } PLEASE Let me know what mistake am i doing. SASKEN BUSINESS DISCLAIMER: This message may contain confidential, proprietary or legally privileged information. In case you are not the original intended Recipient of the message, you must not, directly or indirectly, use, disclose, distribute, print, or copy any part of this message and you are requested to delete it and inform the sender. Any views expressed in this message are those of the individual sender unless otherwise stated. Nothing contained in this message shall be construed as an offer or acceptance of any offer by Sasken Communication Technologies Limited ("Sasken") unless sent with that express intent and with due authority of Sasken. Sasken has taken enough precautions to prevent the spread of viruses. However the company accepts no liability for any damage caused by any virus transmitted by this email. Read Disclaimer at http://www.sasken.com/extras/mail_disclaimer.html

1 0

[alsa-devel] Internal Mic vs Int Mic
by David Henningsson 20 Dec '10

20 Dec '10

To try to clean up a little in the Volume Control namespace, it seems "Int Mic" and "Internal Mic" both mean the same thing. "Internal Mic" seems to be the winning one as it is used in hda_codec.c:hda_get_input_pin_label. So, would a patch that changes every "Int Mic" to "Internal Mic" be appreciated and merged? -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

2 3

[alsa-devel] Not able to set my playback device to mono
by Irfan Shaikh 20 Dec '10

20 Dec '10

Not able to configure my playback device to MONO . But my playback device supports MONO. What is wrong in the below configuration Error : Channels not available for PLAYBACK device retVal = snd_pcm_hw_params_set_channels( pcm, hwparams, 1); if (retVal < 0){ printf("Channels not available : %s\n", name); return retVal; } /*************************************************************/ int initializeDevice(snd_pcm_t* pcm,snd_pcm_hw_params_t *hwparams, int deviceType) { const char* name = snd_pcm_stream_name( snd_pcm_stream(pcm)); snd_pcm_uframes_t framecount; int retVal = 0; retVal = snd_pcm_hw_params_any(pcm, hwparams); if (retVal < 0){ printf( "Configuration FAILED for %s\n", name); return retVal; } retVal = snd_pcm_hw_params_set_format( pcm, hwparams, SND_PCM_FORMAT_S16_LE); if (retVal < 0){ printf( "Sample format not available for %s\n", name); return retVal; } retVal = snd_pcm_hw_params_set_access( pcm, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED); if (retVal < 0){ printf( "Access not available for %s\n", name); return retVal; } /*Set Sampling Frequency*/ int rate; rate= ALSA_SAMPLERATE; retVal = snd_pcm_hw_params_set_rate_near( pcm, hwparams, (unsigned int*)&rate, 0); if (retVal < 0){ printf( "Rate %iHz not available for playback\n", rate); return retVal; } if ((unsigned)rate != ALSA_SAMPLERATE){ printf( "Could not configure requested sampling rate\n"); return -1; } retVal = snd_pcm_hw_params_set_period_size(pcm, hwparams, 512, 0); if (retVal < 0){ printf( "Could not configure requested period size : %s", name); return retVal; } /*Get period size and check whether period size requested is configured*/ retVal = snd_pcm_hw_params_set_periods( pcm, hwparams,4, 0); if (retVal < 0){ printf( "Error : Configuring period count\n"); return retVal; } #if 1 int dir; unsigned int val; snd_pcm_uframes_t frames; snd_pcm_hw_params_get_period_size(hwparams, &frames, &dir); printf("period size = %d frames\n", (int)frames); snd_pcm_hw_params_get_periods(hwparams, &val, &dir); printf("periods per alsa buffer = %d frames\n", val); snd_pcm_hw_params_get_buffer_size(hwparams, (snd_pcm_uframes_t *) &val); printf("buffer size = %d frames\n", val); #endif retVal = snd_pcm_hw_params_set_channels( pcm, hwparams, 1); if (retVal < 0){ printf("Channels not available : %s\n", name); return retVal; } retVal = snd_pcm_hw_params( pcm, hwparams); if (retVal < 0){ printf( "Error in configuring hw params : %s\n", name); return retVal; } snd_pcm_hw_params_current( pcm, hwparams); /*Get ALSA Buffer size and check whether alsa buffer size requested is configured*/ return 0; } /*************************************************************/ SASKEN BUSINESS DISCLAIMER: This message may contain confidential, proprietary or legally privileged information. In case you are not the original intended Recipient of the message, you must not, directly or indirectly, use, disclose, distribute, print, or copy any part of this message and you are requested to delete it and inform the sender. Any views expressed in this message are those of the individual sender unless otherwise stated. Nothing contained in this message shall be construed as an offer or acceptance of any offer by Sasken Communication Technologies Limited ("Sasken") unless sent with that express intent and with due authority of Sasken. Sasken has taken enough precautions to prevent the spread of viruses. However the company accepts no liability for any damage caused by any virus transmitted by this email. Read Disclaimer at http://www.sasken.com/extras/mail_disclaimer.html

1 0

[alsa-devel] [PATCH 3/3] ALSA: HDA: Rename "e-Mic" and "i-Mic" to "Mic" and "Internal Mic"
by David Henningsson 20 Dec '10

20 Dec '10

-- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

1 0

[alsa-devel] [PATCH 2/3] ALSA: HDA: Rename "Ext Mic" and "External Mic" to "Mic"
by David Henningsson 20 Dec '10

20 Dec '10

-- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

1 0

[alsa-devel] [PATCH 1/3] ALSA: HDA: Rename "Int Mic" to "Internal Mic"
by David Henningsson 20 Dec '10

20 Dec '10

-- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

1 0

[PATCH 3/3] ALSA: HDA: Rename "e-Mic" and "i-Mic" to "Mic" and "Internal Mic"
by David Henningsson 20 Dec '10

20 Dec '10

Change non-standard mic control names to standard control names to clean up the namespace. Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 08c3d95..91fc2a4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -17533,13 +17533,13 @@ static struct snd_kcontrol_new alc662_eeepc_p701_mixer[] = { HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT), ALC262_HIPPO_MASTER_SWITCH, - HDA_CODEC_VOLUME("e-Mic Boost", 0x18, 0, HDA_INPUT), - HDA_CODEC_VOLUME("e-Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), - HDA_CODEC_MUTE("e-Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), - HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT), - HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), - HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), + HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), { } /* end */ }; @@ -17683,8 +17683,8 @@ static struct snd_kcontrol_new alc663_g71v_mixer[] = { HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), - HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), - HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), { } /* end */ }; @@ -17695,8 +17695,8 @@ static struct snd_kcontrol_new alc663_g50v_mixer[] = { HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), - HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), - HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), { } /* end */ @@ -18529,13 +18529,13 @@ static struct snd_kcontrol_new alc662_ecs_mixer[] = { HDA_CODEC_VOLUME("Master Playback Volume", 0x02, 0x0, HDA_OUTPUT), ALC262_HIPPO_MASTER_SWITCH, - HDA_CODEC_VOLUME("e-Mic/LineIn Boost", 0x18, 0, HDA_INPUT), - HDA_CODEC_VOLUME("e-Mic/LineIn Playback Volume", 0x0b, 0x0, HDA_INPUT), - HDA_CODEC_MUTE("e-Mic/LineIn Playback Switch", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Mic/LineIn Boost", 0x18, 0, HDA_INPUT), + HDA_CODEC_VOLUME("Mic/LineIn Playback Volume", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_MUTE("Mic/LineIn Playback Switch", 0x0b, 0x0, HDA_INPUT), - HDA_CODEC_VOLUME("i-Mic Boost", 0x19, 0, HDA_INPUT), - HDA_CODEC_VOLUME("i-Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), - HDA_CODEC_MUTE("i-Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Internal Mic Boost", 0x19, 0, HDA_INPUT), + HDA_CODEC_VOLUME("Internal Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_MUTE("Internal Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), { } /* end */ }; -- 1.7.1 --------------010506000707060102030300--

1 0