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

[alsa-devel] [patch -next] asihpi: testing the wrong variable
by Dan Carpenter 17 May '10

17 May '10

There is a typo here. We want to test "*dst" not "dst". Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/pci/asihpi/hpifunc.c b/sound/pci/asihpi/hpifunc.c index 254c580..15f0c7e 100644 --- a/sound/pci/asihpi/hpifunc.c +++ b/sound/pci/asihpi/hpifunc.c @@ -3279,7 +3279,7 @@ static u16 hpi_entity_alloc_and_copy(struct hpi_entity *src, buf_size = hpi_entity_size(src); *dst = kmalloc(buf_size, GFP_KERNEL); - if (dst == NULL) + if (*dst == NULL) return HPI_ERROR_MEMORY_ALLOC; memcpy(*dst, src, buf_size); return 0;

2 1

[alsa-devel] [patch -next] sound/es1688: add pedantic range checks
by Dan Carpenter 17 May '10

17 May '10

Smatch complains that if (dev == SNDRV_CARDS) we're one past the end of the array. That's unlikely to happen in real life, I suppose. Also smatch complains about "strcpy(card->shortname, pcm->name);" The "pcm->name" buffer is 80 characters and "card->shortname" is 32 characters. If you follow the call paths it turns out we never actually use more than 16 characters so it's not a problem. But anyway, let's make it easy for people auditing this in the future. Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c index fdcce31..0cde813 100644 --- a/sound/isa/es1688/es1688.c +++ b/sound/isa/es1688/es1688.c @@ -149,10 +149,11 @@ static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n) if (error < 0) return error; - strcpy(card->driver, "ES1688"); - strcpy(card->shortname, pcm->name); - sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i", pcm->name, - chip->port, chip->irq, chip->dma8); + strlcpy(card->driver, "ES1688", sizeof(card->driver)); + strlcpy(card->shortname, pcm->name, sizeof(card->shortname)); + snprintf(card->longname, sizeof(card->longname), + "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port, + chip->irq, chip->dma8); if (fm_port[n] == SNDRV_AUTO_PORT) fm_port[n] = port[n]; /* share the same port */ @@ -271,6 +272,8 @@ static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard, if (enable[dev] && isapnp[dev]) break; } + if (dev == SNDRV_CARDS) + return -ENODEV; error = snd_card_create(index[dev], id[dev], THIS_MODULE, sizeof(struct snd_es1688), &card);

2 1

[alsa-devel] [PATCH 0/4] updates for Intel SandyBridge/CougarPoint HDMI codec V2
by Wu Fengguang 17 May '10

17 May '10

Hi Takashi, The Intel SandyBridge/CougarPoint HDMI codec is very similar to the IbexPeak HDMI codec, except that it exports one more Audio Converter. Now we have 3 Audio Converters, each of them present one HDMI PCM device: (and expect a 4th HDMI PCM device in future) $ aplay -l | grep HDMI card 0: PCH [HDA Intel PCH], device 3: INTEL HDMI 0 [INTEL HDMI 0] card 0: PCH [HDA Intel PCH], device 7: INTEL HDMI 1 [INTEL HDMI 1] card 0: PCH [HDA Intel PCH], device 8: INTEL HDMI 2 [INTEL HDMI 2] So enable devices minors to support more than 8 PCM playback devices. Thanks, Fengguang

2 5

[alsa-devel] [PATCH 1/20] sound/pci/asihpi: Use kzalloc
by Julia Lawall 17 May '10

17 May '10

From: Julia Lawall <julia(a)diku.dk> Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // </smpl> Signed-off-by: Julia Lawall <julia(a)diku.dk> --- sound/pci/asihpi/hpi6000.c | 3 +-- sound/pci/asihpi/hpi6205.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff -u -p a/sound/pci/asihpi/hpi6000.c b/sound/pci/asihpi/hpi6000.c --- a/sound/pci/asihpi/hpi6000.c +++ b/sound/pci/asihpi/hpi6000.c @@ -448,14 +448,13 @@ static void subsys_create_adapter(struct if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_PCI2040) return; - ao.priv = kmalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL); + ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL); if (!ao.priv) { HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n"); phr->error = HPI_ERROR_MEMORY_ALLOC; return; } - memset(ao.priv, 0, sizeof(struct hpi_hw_obj)); /* create the adapter object based on the resource information */ /*? memcpy(&ao.Pci,&phm->u.s.Resource.r.Pci,sizeof(ao.Pci)); */ ao.pci = *phm->u.s.resource.r.pci; diff -u -p a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c --- a/sound/pci/asihpi/hpi6205.c +++ b/sound/pci/asihpi/hpi6205.c @@ -482,13 +482,12 @@ static void subsys_create_adapter(struct if (phm->u.s.resource.r.pci->device_id != HPI_PCI_DEV_ID_DSP6205) return; - ao.priv = kmalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL); + ao.priv = kzalloc(sizeof(struct hpi_hw_obj), GFP_KERNEL); if (!ao.priv) { HPI_DEBUG_LOG(ERROR, "cant get mem for adapter object\n"); phr->error = HPI_ERROR_MEMORY_ALLOC; return; } - memset(ao.priv, 0, sizeof(struct hpi_hw_obj)); ao.pci = *phm->u.s.resource.r.pci; err = create_adapter_obj(&ao, &os_error_code);

2 1

[alsa-devel] [patch 0/6] kirkwood openrd client audio support - v2
by apatard＠mandriva.com 17 May '10

17 May '10

[ added forgotten linux-arm-kernel cc: ] Hi, It's a new try to get merged support for openrd client audio. I've tried to fix all comments, I hope I didn't miss something. In the changes, there's : - s/kirkwood/orion/ - Added a comment about data centered around 0 in the new control entry - fixed quilt diffstat header braindamage - added dapm support to cs42l51 codec - use ASoC register cache support - modified i2s driver to be a platform driver and move resource stuff to the right place Arnaud Patard

3 13

[alsa-devel] snd_pcm_period_elapsed
by Raymond Yau 16 May '10

16 May '10

>>> do snd_pcm_period_elapsed really handle the case when more than one period >>> are elasped ? >>> >>> For au88x0 , each substream have four sets of hardware registers , it seem >>> that the driver can recover lost interrupt with no underrun when using very >>> small period size >>> >>> >>> http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/ch05s07.html#pcm-… <http://www.alsa-project.org/%7Etiwai/writing-an-alsa-driver/ch05s07.html#pc…> >>> >>> On calling snd_pcm_period_elapsed() >>> >>> In both cases, even if more than one period are elapsed, you don't have to >>> call snd_pcm_period_elapsed() many times. Call only once. And the pcm layer >>> will check the current hardware pointer and update to the latest status. >> Yes, the new code handles more alapsed periods, too. The in_interrupt >> check is mainly for situations when period count == 1 and it compares >> expected next hw_ptr for interrupt with hw_ptr computed from the hw_base >> and actual position in the ring buffer. >> Jaroslav The value "delta" returned by vortex_adbdma_bufshift() seem to be the number of sub-buffer(periods) elapsed ( the value can be 0 , 1 , 2 or 3 ) when aplay using very small period_size (e.g. 16 ) , the driver write message in system log when delta > 1 (i.e. more than 1 period have been elapsed ) but the sound is still ok since there are two more periods in the sub-buffer But I cannot see any code in snd_pcm_period_elasped() add two period size to hw_ptr

1 0

[alsa-devel] [PATCH] hdspmixer buffer overflow
by Georg Rudolph 15 May '10

15 May '10

Hello, to fix https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5006 the attached patch for alsa-tools is proposed: Summary: Fix buffer overflow in hdspmixer A one off string buffer overflow fixed by handling it properly with string stream. Signed-off-by: Georg Rudolph <georg.rudolph(a)schwaben.de <mailto:foo@bar.com>> --- alsa-tools-1.0.23/hdspmixer/src/HDSPMixerIOMixer.h 2010-04-16 13:11:09.000000000 +0200 +++ alsa-tools-1.0.23-work/hdspmixer/src/HDSPMixerIOMixer.h 2010-05-12 22:07:49.549949993 +0200 @@ -36,6 +36,7 @@ #include "HDSPMixerStripData.h" #include "HDSPMixerMeter.h" #include "pixmaps.h" +#include <sstream> class HDSPMixerWindow; class HDSPMixerSelector; @@ -52,7 +53,7 @@ private: char **p_iomixer_xpm; int channel_num, relative_num, mixer_type; - char channel_name[6]; + std::stringstream channel_name; void update_child(Fl_Widget &widget); public: HDSPMixerStripData *data[3][3][8]; /* data[card][mode(ss/ds/qs)][preset number] */ --- alsa-tools-1.0.23/hdspmixer/src/HDSPMixerIOMixer.cxx 2010-04-16 13:11:09.000000000 +0200 +++ alsa-tools-1.0.23-work/hdspmixer/src/HDSPMixerIOMixer.cxx 2010-05-12 22:00:26.754950707 +0200 @@ -25,9 +25,9 @@ { mixer_type = type; if (type) { - sprintf(channel_name, "Out %d", ch); + channel_name << "Out " << ch; } else { - sprintf(channel_name, "In %d", ch); + channel_name << "In " << ch; } channel_num = ch; if (channel_num%2) { @@ -73,7 +73,7 @@ draw_background(); fl_color(FL_BLACK); fl_font(FL_HELVETICA, 8); - fl_draw(channel_name, x()+4, y()+225, 27, 9, FL_ALIGN_CENTER); + fl_draw(channel_name.str().c_str(), x()+4, y()+225, 27, 9, FL_ALIGN_CENTER); for (int i=children(); i--;) { Fl_Widget& o = **a++; draw_child(o); Best Regards, Georg Rudolph

2 1

[alsa-devel] HDA Intel - Activating S/PDIF output on an HP laptop (8510W).
by Huw Hawkins 15 May '10

15 May '10

Hi all, I have been quite happily using the intel HDA drivers to get audio on my Compaq 8510W, everything works fine out of the box with the exception of the HDMI output. After some poking around I see that this is because the digital output is disabled by the HP model specific code. Setting the model as "basic" gives me perfect audio on the HDMI output, but jack sensing is completely messed up, the mute button status is inverted and it is not possible to get sound from the internal speakers. Setting the model as "HP" diables the digital audio on the HDMI port. It seems from a google search that there are a few people around with the same issue on HP laptops with HDMI output. I don't really have the time to dig through and understand the spec/code for the driver to try to fix the problem myself. On the other hand I probably could spend an hour or two over the next couple of weeks testing or investigating the hardware if someone else wants to have a go. Any takers? Huw

1 0

[alsa-devel] [patch -next] sound/asihpi: incorrect range check
by Dan Carpenter 14 May '10

14 May '10

The entity_type_to_size[] array has LAST_ENTITY_TYPE (11) number of elements, not LAST_ENTITY_ROLE (17). This only affects the debug output. Signed-off-by: Dan Carpenter <error27(a)gmail.com> diff --git a/sound/pci/asihpi/hpifunc.c b/sound/pci/asihpi/hpifunc.c index 254c580..eda26b3 100644 --- a/sound/pci/asihpi/hpifunc.c +++ b/sound/pci/asihpi/hpifunc.c @@ -3407,7 +3407,7 @@ u16 hpi_entity_alloc_and_pack(const enum e_entity_type type, if (hE) return hE; - HPI_DEBUG_ASSERT(role > entity_role_null && type < LAST_ENTITY_ROLE); + HPI_DEBUG_ASSERT(role > entity_role_null && type < LAST_ENTITY_TYPE); bytes_to_copy = entity_type_to_size[type] * item_count; total_size = hpi_entity_header_size(*entity) + bytes_to_copy;

1 0

[alsa-devel] [PATCH] OMAP: McBSP: Add 32-bit mode support
by Sergey Lapin 14 May '10

14 May '10

This patchs should allow to use 32-bit samples on e.g. TLV320AIC3x codec, or others. Signed-off-by: Sergey Lapin <slapin(a)ossfans.org> --- sound/soc/omap/omap-mcbsp.c | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 8ad9dc9..2dead3f 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -295,8 +295,18 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma; omap_mcbsp_dai_dma_params[id][substream->stream].port_addr = port; omap_mcbsp_dai_dma_params[id][substream->stream].sync_mode = sync_mode; - omap_mcbsp_dai_dma_params[id][substream->stream].data_type = - OMAP_DMA_DATA_TYPE_S16; + switch (params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + omap_mcbsp_dai_dma_params[id][substream->stream].data_type = + OMAP_DMA_DATA_TYPE_S16; + break; + case SNDRV_PCM_FORMAT_S32_LE: + omap_mcbsp_dai_dma_params[id][substream->stream].data_type = + OMAP_DMA_DATA_TYPE_S32; + break; + default: + return -EINVAL; + } snd_soc_dai_set_dma_data(cpu_dai, substream, &omap_mcbsp_dai_dma_params[id][substream->stream]); @@ -330,6 +340,14 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, regs->xcr2 |= XWDLEN2(OMAP_MCBSP_WORD_16); regs->xcr1 |= XWDLEN1(OMAP_MCBSP_WORD_16); break; + case SNDRV_PCM_FORMAT_S32_LE: + /* Set word lengths */ + wlen = 32; + regs->rcr2 |= RWDLEN2(OMAP_MCBSP_WORD_32); + regs->rcr1 |= RWDLEN1(OMAP_MCBSP_WORD_32); + regs->xcr2 |= XWDLEN2(OMAP_MCBSP_WORD_32); + regs->xcr1 |= XWDLEN1(OMAP_MCBSP_WORD_32); + break; default: /* Unsupported PCM format */ return -EINVAL; @@ -623,13 +641,15 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = { .channels_min = 1, \ .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ - .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .capture = { \ .channels_min = 1, \ .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ - .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .ops = &omap_mcbsp_dai_ops, \ .private_data = &mcbsp_data[(link_id)].bus_id, \ -- 1.7.0.4

5 4

[alsa-devel] [RFC][PATCH] fall back to reserved minor numbers
by Wu Fengguang 14 May '10

14 May '10

When the static minor numbers collide because of too many devices, fall back to the reserved minor numbers 2 and 3. This for example will allow Intel HDMI audio driver to create three PCM devices (index 3, 7, 8; the minor number of the last index will otherwise collide with the first record device). The other option is to force enable CONFIG_SND_DYNAMIC_MINORS. Signed-off-by: Wu Fengguang <fengguang.wu(a)intel.com> --- include/sound/minors.h | 4 +++- sound/core/sound.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) --- drm-intel.orig/include/sound/minors.h 2010-05-13 10:06:52.000000000 +0800 +++ drm-intel/include/sound/minors.h 2010-05-13 10:10:06.000000000 +0800 @@ -35,7 +35,9 @@ #define SNDRV_MINOR_TIMER (SNDRV_MINOR_GLOBAL + 1 * 32) #ifndef CONFIG_SND_DYNAMIC_MINORS - /* 2 - 3 (reserved) */ + +#define SNDRV_MINOR_BACKUP1 2 +#define SNDRV_MINOR_BACKUP2 3 #define SNDRV_MINOR_HWDEP 4 /* 4 - 7 */ #define SNDRV_MINOR_RAWMIDI 8 /* 8 - 15 */ #define SNDRV_MINOR_PCM_PLAYBACK 16 /* 16 - 23 */ --- drm-intel.orig/sound/core/sound.c 2010-05-13 10:06:04.000000000 +0800 +++ drm-intel/sound/core/sound.c 2010-05-13 10:11:19.000000000 +0800 @@ -269,8 +269,14 @@ int snd_register_device_for_dev(int type minor = snd_find_free_minor(); #else minor = snd_kernel_minor(type, card, dev); - if (minor >= 0 && snd_minors[minor]) - minor = -EBUSY; + if (minor >= 0) { + if (snd_minors[minor]) + minor = SNDRV_MINOR_BACKUP1; + if (snd_minors[minor]) + minor = SNDRV_MINOR_BACKUP2; + if (snd_minors[minor]) + minor = -EBUSY; + } #endif if (minor < 0) { mutex_unlock(&sound_mutex);

2 3

[alsa-devel] [PATCH 0/5] updates for Intel SandyBridge/CougarPoint HDMI codec
by Wu Fengguang 14 May '10

14 May '10

Hi Takashi, The Intel SandyBridge/CougarPoint HDMI codec is very similar to the IbexPeak HDMI codec, except that it exports one more Audio Converter. Now we have 3 Audio Converters, each of them present one HDMI PCM device: (and expect a 4th HDMI PCM device in future) $ aplay -l | grep HDMI card 0: PCH [HDA Intel PCH], device 3: INTEL HDMI 0 [INTEL HDMI 0] card 0: PCH [HDA Intel PCH], device 7: INTEL HDMI 1 [INTEL HDMI 1] card 0: PCH [HDA Intel PCH], device 8: INTEL HDMI 2 [INTEL HDMI 2] So ALSA has to support more than 8 PCM playback devices now. The first two patches do this dirty work, however I'm not sure if they will introduce some side effects. The last three patches are more straightforward and safe. Thanks, Fengguang

5 19

Re: [alsa-devel] [PATCH v3 0/2] McBSP changes for OMAP4 platform
by Liam Girdwood 14 May '10

14 May '10

On Thu, 2010-05-13 at 09:19 +0100, Mark Brown wrote: > On Wed, May 12, 2010 at 12:18:38PM -0500, Jorge Eduardo Candelaria wrote: > > The following patches enable McBSP driver to be used along with the > > audio driver in SDP4430 and other OMAP4 based boards. > > Both > > Acked-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Tony, do we have you ack/sob to upstream via ASoC ? We do have a lot pending with mcbsp dependencies for ASoC atm and this would simplify upstreaming. Thanks Liam -- Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk

2 1

[alsa-devel] underruns over network
by Preston Kulaga 14 May '10

14 May '10

Hello, I am quite new to ALSA and am having a bit of trouble with underruns. I am working on a voice communication system via udp sockets and am getting underruns on receiving end very sporadically (capture end is fine). Have done a great deal of reading and searching on reasons for this but am not sure what approach is best to limit the underruns. I must not be transferring the data quickly enough over the network before the ring buffer runs out of data, which makes sense, but how would you accommodate for this? I am able to buffer a large amount of network data and then playback successfully, but obviously the delay induced is so significant that it makes real-time communication impossible. If I just recover/prepare the stream after an underrun the audio is horribly distorted. Is there a normal way of dealing with this issue that I am unable to find? I would appreciate any insight, guidance, references for any help you can give me. Thank You.

1 0

[alsa-devel] ALSA and Ubuntu addendum
by Andreas Falkenhahn 13 May '10

13 May '10

Addendum: I forgot one thing that doesn't work on Ubuntu either (but works on openSUSE): PCM streams in signed 8 bit format have terrible sound artefacts on Ubuntu. If I convert them to unsigned 8 bit format, they are played correctly. But in signed format, it sounds totally broken.

1 0

[alsa-devel] ALSA and Ubuntu
by Andreas Falkenhahn 13 May '10

13 May '10

Hi, I just downloaded the latest Ubuntu Live CD (10.04) to try my app on it. It is a plain X11 app using ALSA for sound output. I developed it on openSUSE 11.2 and thought to give it a try on Ubuntu... that was a mistake, because on Ubuntu, there seem to be lots of errors with ALSA. Here are some observations: 1) snd_pcm_status_get_tstamp() always returns 0 for sec/usec. 2) snd_pcm_status_get_state() always returns SND_PCM_STATE_RUNNING, even when the PCM stream has long reached a buffer underrun. 3) snd_pcm_delay()'s return value doesn't fall below ~7000 samples or so. Even when the buffer has underrun, the return value is not 0 but about ~7000 samples. This makes it nearly impossible to detect when I should start writing new samples to the buffer... Could someone enlighten me what's going on there? Is this a known issue with Ubuntu? I'm not using any weird addons or stuff. It's really just the latest Ubuntu live CD. As I said, on openSUSE everything is working just fine. But on Ubuntu, hell is really breaking loose here... Thanks for help, Andreas

1 0

[alsa-devel] [PATCH] OMAP: McBSP: Add 32-bit mode support
by Sergey Lapin 13 May '10

13 May '10

This patchs should allow to use 32-bit samples on e.g. TLV320AIC3x codec, or others. Signed-off-by: Sergey Lapin <slapin(a)ossfans.org> --- sound/soc/omap/omap-mcbsp.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 8ad9dc9..a875d5d 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -295,8 +295,20 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, omap_mcbsp_dai_dma_params[id][substream->stream].dma_req = dma; omap_mcbsp_dai_dma_params[id][substream->stream].port_addr = port; omap_mcbsp_dai_dma_params[id][substream->stream].sync_mode = sync_mode; - omap_mcbsp_dai_dma_params[id][substream->stream].data_type = - OMAP_DMA_DATA_TYPE_S16; + switch(params_format(params)) { + case SNDRV_PCM_FORMAT_S16_LE: + omap_mcbsp_dai_dma_params[id][substream->stream].data_type = + OMAP_DMA_DATA_TYPE_S16; + break; + case SNDRV_PCM_FORMAT_S32_LE: + omap_mcbsp_dai_dma_params[id][substream->stream].data_type = + OMAP_DMA_DATA_TYPE_S32; + break; + default: + omap_mcbsp_dai_dma_params[id][substream->stream].data_type = + OMAP_DMA_DATA_TYPE_S16; + break; + } snd_soc_dai_set_dma_data(cpu_dai, substream, &omap_mcbsp_dai_dma_params[id][substream->stream]); @@ -330,6 +342,14 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, regs->xcr2 |= XWDLEN2(OMAP_MCBSP_WORD_16); regs->xcr1 |= XWDLEN1(OMAP_MCBSP_WORD_16); break; + case SNDRV_PCM_FORMAT_S32_LE: + /* Set word lengths */ + wlen = 32; + regs->rcr2 |= RWDLEN2(OMAP_MCBSP_WORD_32); + regs->rcr1 |= RWDLEN1(OMAP_MCBSP_WORD_32); + regs->xcr2 |= XWDLEN2(OMAP_MCBSP_WORD_32); + regs->xcr1 |= XWDLEN1(OMAP_MCBSP_WORD_32); + break; default: /* Unsupported PCM format */ return -EINVAL; @@ -623,13 +643,15 @@ static struct snd_soc_dai_ops omap_mcbsp_dai_ops = { .channels_min = 1, \ .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ - .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .capture = { \ .channels_min = 1, \ .channels_max = 16, \ .rates = OMAP_MCBSP_RATES, \ - .formats = SNDRV_PCM_FMTBIT_S16_LE, \ + .formats = SNDRV_PCM_FMTBIT_S16_LE | \ + SNDRV_PCM_FMTBIT_S32_LE, \ }, \ .ops = &omap_mcbsp_dai_ops, \ .private_data = &mcbsp_data[(link_id)].bus_id, \ -- 1.7.0.4

2 2

[alsa-devel] broken microphone
by mutenmaster＠tiscali.it 13 May '10

13 May '10

hello everyone, mi microphone is broken. the os version is the latest, but this bug exists from, 2.6.33 or something. i mailed a message describing the bisection i did back then to vger. Here it is again! $ sudo git bisect bad f5271101faf1655d862849f42518c2a88ef394fb is the first bad commit commit f5271101faf1655d862849f42518c2a88ef394fb Author: Lydia Wang <lydiawang(a)viatech.com.cn> Date: Sat Oct 10 19:07: 35 2009 +0800 ALSA HDA VIA: Add VIA_CTL_WIDGET_ANALOG_MUTE control type Enter low power state if AA-Path volume is muted. Signed-off-by: Lydia Wang <lydiawang(a)viatech.com.cn> Signed-off-by: Logan Li <loganli(a)viatech.com.cn> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> :040000 040000 ab1ae14ff67f0b08848faeb3ad68def7f3e727f0 0bfbfde11fe32e87e8edbdb3c4d03c2d30370393 M sound after reverting this, everything works fine. i already posted a message with all of my system info attached, but it got moderated. If you need any info, please ask. bye, vasilis. Risparmia con Tutto Incluso Light: telefono + adsl 8 mega a soli 14,95 € al mese. Gratis la Sim Tiscali Mobile con 25 euro di traffico! L'offerta è valida solo se attivi entro il 13/05/10 http://abbonati.tiscali.it/telefono-adsl/prodotti/tc/tuttoincluso_light/?WT…

1 0

[alsa-devel] HP dv series mute LED problems?
by Kunal Gangakhedkar 13 May '10

13 May '10

Hi Takashi, The commit 26ebe0a28986f4845b2c5bea43ac5cc0b9f27f0a seems to undo the mute LED gpio fixes - at least on my dv6 series laptop. Maybe, we need to come up with a better solution to accommodate the problem reported in this thread: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-May/027352.html I believe, that's the reason for the commit, right? Let me do a bit more digging. Thanks, Kunal

3 8

[alsa-devel] Use of start_frame in usbusx2yaudio.c
by Sarah Sharp 12 May '10

12 May '10

Are there any drivers in the kernel that set urb->start_frame on every URB? Could those drivers handle it if only the first URB they submitted to the host controller was scheduled for that frame ID, and all the rest of the URBs were scheduled ASAP? I see there are three drivers that set start_frame (while not setting URB_ISO_ASAP): - drivers/isdn/hisax/st5481_d.c - drivers/usb/core/devio.c - sound/usb/usx2y/usbusx2yaudio.c I'm not really sure what usbusx2yaudio.c is doing. I think when one URB completes, it sets the next URB's start_frame to the previous URB's start_frame plus the number of URBs (2 by default) times the number of packets (4 by default). Isn't this basically like setting URB_ISO_ASAP? I really can't tell what fall back method is if this submission fails. What is usbusx2yaudio.c attempting to do? I've tried to get an overall picture of what it expects the isochronous scheduling to look like, but I'm finding the driver a bit hard to read. I'm not too worried about the other two drivers. The code in st5481_d.c seems to fall back fine to URB_ISO_ASAP if the submission with the start_frame set failed. devio.c is usbfs, and I can't tell what userspace drivers do. (It could be argued that if they needed such tight control over isoc, they should have written a kernel driver.) Sarah Sharp

3 3

[alsa-devel] ESI Maya44 PCI – mixer code errors
by Alex Chernyshoff 12 May '10

12 May '10

Hello! In the current release of ESI Maya44 PCI ALSA driver (1.0.23) selection of “Mic In” capture source is impossible. “Microphone” check in the “Switches “ mixer tab actually does not select anything – no recording audio at all, and the Phantom power switch does not perform correctly too. Original, Rainer Zimmermann patch (for ALSA 1.0.19) performs well, but can`t be compiled with the current ALSA and kernel26. Sadly... I've look into current, rewritten, code in the file ./alsa-driver-1.0.23/alsa-kernel/pci/ice1712/maya44.c and found some interesting details. Further, I've add some changes, and “Mic In” selection now works, but only partially. (Below) In the original maya44.c file, from Rainer Zimmermann patch, some definitions of I/O flags seems as a simple mask: #define GPIO_PHANTOM_OFF (1<<2) #define GPIO_MIC_RELAY (1<<4) #define GPIO_SPDIF_IN_INV (1<<5) /* CHECK! */ #define GPIO_MUST_BE_0 (1<<7) Current branch of Maya44 code is rewritten, and these definitions look like the indexes #define GPIO_PHANTOM_OFF 2 #define GPIO_MIC_RELAY 4 #define GPIO_SPDIF_IN_INV 5 #define GPIO_MUST_BE_0 7 So, at the row 396 of the current branch - maya44.c changed = maya_set_gpio_bits(chip->ice, GPIO_MIC_RELAY, sel ? GPIO_MIC_RELAY : 0); I change this code to: changed = maya_set_gpio_bits(chip->ice, (1 << GPIO_MIC_RELAY), sel ? (1 << GPIO_MIC_RELAY) : 0); And finally, at the row 348 of the current maya44.c /* known working input slots (0-4) */ #define MAYA_LINE_IN 1 /* in-2 */ #define MAYA_MIC_IN 4 /* in-5 */ but usable channels are 2 and 4 (from datasheet), therefore I change defines to #define MAYA_LINE_IN 1 /* in-2 */ #define MAYA_MIC_IN 3 /* in-4 */ After that, we can get some usability from mixer. Now, the “Microphone” check can select “Mic In”, and real audio path from microphone to ADC works! But only once. After that, in the “Capture” tab of mixer, “Mute” knob visually change state to muted. Some kind of strange cross influence between mixer tabs :-) Pressing to this “Mute” knob switches back “Mic In” capture source to “Line”, and clear Phantom Power check. (Very strange) And finally, if we check “Microphone” again - “Mic In” became selected again, and “Mute” enter in “unpressed” state again too. But microphone capture became again operable. Circle is closed. Excuse me for some kind of messed story and poor English (my native is Russian), but such description of mixer behavior maybe useful for understanding... I can't resolve more mistakes in the code. Perhaps, author can do it more better than me. I have a hardware – ESI Maya44 PCI audio board installed to working and usable Arch Linux i686 system. I'm ready for testing, and glad to do it! Sincerely Alex Chernyshoff

2 1

[alsa-devel] [patch 0/6] kirkwood openrd client audio support
by apatard＠mandriva.com 12 May '10

12 May '10

This patchset aims at adding ASoC support to ARM kirkwood systems and more precisely to openrd client boards. Arnaud Patard

7 22

[alsa-devel] [PATCH] ASoC: TWL4030: Add control for digimic Left Right swap
by Peter Ujfalusi 12 May '10

12 May '10

The codec has support for swapping the left and right channels in the digimic interface. New kcontrol to handle this bit. Signed-off-by: Peter Ujfalusi <peter.ujfalusi(a)nokia.com> --- sound/soc/codecs/twl4030.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index 0fe74d1..6a34f56 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -1102,6 +1102,16 @@ static const struct soc_enum twl4030_vibradir_enum = ARRAY_SIZE(twl4030_vibradir_texts), twl4030_vibradir_texts); +/* Digimic Left and right swapping */ +static const char *twl4030_digimicswap_texts[] = { + "Not swapped", "Swapped", +}; + +static const struct soc_enum twl4030_digimicswap_enum = + SOC_ENUM_SINGLE(TWL4030_REG_MISC_SET_1, 0, + ARRAY_SIZE(twl4030_digimicswap_texts), + twl4030_digimicswap_texts); + static const struct snd_kcontrol_new twl4030_snd_controls[] = { /* Codec operation mode control */ SOC_ENUM_EXT("Codec Operation Mode", twl4030_op_modes_enum, @@ -1178,6 +1188,8 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = { SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum), SOC_ENUM("Vibra H-bridge direction", twl4030_vibradir_enum), + + SOC_ENUM("Digimic LR Swap", twl4030_digimicswap_enum), }; static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { -- 1.7.1

3 2

[alsa-devel] alsa-driver patches
by Eliot Blennerhassett 12 May '10

12 May '10

Hi Takashi, since the acceptance of asihpi driver, and move to alsa-kernel, you created a couple of patch files in alsa-driver/pci/asihpi (that add conditional compilation for older kernels) Can you tell me how these patches are generated and maintained? (I guess this applies to any driver with this kind of patch). I think that this arrangement means that my one upstream file needs to be converted to two files (kernel .c + patch) when I submit updates? thanks -- Eliot Blennerhassett AudioScience Inc.

2 1

[alsa-devel] [PATCH 1/2] ALSA: include/linux/usb/audio.h: add __attribute__((packed))
by Daniel Mack 12 May '10

12 May '10

This was missing on the definition of struct uac_iso_endpoint_descriptor Signed-off-by: Daniel Mack <daniel(a)caiaq.de> Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Clemens Ladisch <clemens(a)ladisch.de> --- include/linux/usb/audio.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h index 57f2055..9fae6bd 100644 --- a/include/linux/usb/audio.h +++ b/include/linux/usb/audio.h @@ -456,7 +456,7 @@ struct uac_iso_endpoint_descriptor { __u8 bmAttributes; __u8 bLockDelayUnits; __le16 wLockDelay; -}; +} __attribute__((packed)); #define UAC_ISO_ENDPOINT_DESC_SIZE 7 #define UAC_EP_CS_ATTR_SAMPLE_RATE 0x01 -- 1.7.1

3 5