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

[alsa-devel] [PATCH] ALSA: sound, core, pcm_lib: fix xrun_log
by Ben Gardiner 19 May '11

19 May '11

The xrun_log function was augmented with the in_interrupt parameter whereas the empty macro definition used when xrun logging is disabled was not. Add a third parameter to the empty macro definition so as to not cause compiler errors when xrun logging (CONFIG_SND_PCM_XRUN_DEBUG) is disabled. Signed-off-by: Ben Gardiner <bengardiner(a)nanometrics.ca> --- This fixes the build error caused by ec08b14483de ("ALSA: sound, core, pcm_lib: xrun_log: log also in_interrupt") -- which was my patch. Sorry for the breakage. --- sound/core/pcm_lib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index c8c8091..abfeff16 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -266,7 +266,7 @@ static void xrun_log_show(struct snd_pcm_substream *substream) #else /* ! CONFIG_SND_PCM_XRUN_DEBUG */ #define hw_ptr_error(substream, fmt, args...) do { } while (0) -#define xrun_log(substream, pos) do { } while (0) +#define xrun_log(substream, pos, in_interrupt) do { } while (0) #define xrun_log_show(substream) do { } while (0) #endif -- 1.7.4.1

2 1

[alsa-devel] Multiple codecs on one card (SOC)
by Caleb Crome 19 May '11

19 May '11

Hi again, I have a multi-codec board up and running, and need a little guidance. I've got 8 I2S codecs connected to a beagleboard. I have the first codec up and running, but I don't know how to add more codecs to the same alsa card. I have it set for multiple DAI links. Is that the correct way to have multiple codecs bound to the same card, and bound to eachother? The struct is below. When I do this, I have the problem, that the codec driver, which registers its mixer controls using macros like SOC_DOUBLE_R_TLV("PCM Playback Volume, LDAC_VOL, RDAC_VOL,...), they fail when the 2nd codec is getting probed. Am I supposed to use multiple snd_soc_dai_link declarations? How do I end up with a single 16-channel sound card built from multiple 2 channel devices? Do I use subdevices? Substreams? multiple dai_links? How do i instantiate them? Any pointers would be greatly appreciated. Thanks, -Caleb static struct snd_soc_dai_link puppy_dai[] = { { .name = "tlv320aic33-se-a", .stream_name = "tlv320aic33-se", .cpu_dai_name = "omap-mcbsp-dai.2", .platform_name = "omap-pcm-audio", .codec_dai_name = "tlv320aic3x-se-hifi", .codec_name = "tlv320aic3x-se-codec.2-0018", .ops = &puppy_ops, .symmetric_rates = 1, // I think this requires send and receive be the same rate. .init = puppy_dai_link_init, }, { .name = "tlv320aic33-se-b", .stream_name = "tlv320aic33-se", .cpu_dai_name = "omap-mcbsp-dai.2", .platform_name = "omap-pcm-audio", .codec_dai_name = "tlv320aic3x-se-hifi", .codec_name = "tlv320aic3x-se-codec.2-0019", .ops = &puppy_ops, .symmetric_rates = 1, // I think this requires send and receive be the same rate. .init = puppy_dai_link_init, }, };

1 0

Re: [alsa-devel] [PATCH] Max98095: Move existing NULL check before pointer dereference.
by Mark Brown 18 May '11

18 May '11

On Tue, May 17, 2011 at 06:03:54PM -0700, Taylor Hutt wrote: > Visual inspection shows that max98095_put_eq_enum() and > max98095_put_bq_enum() each have a possible NULL deref of 'pdata'. > > This change moves the NULL check above the use. Applied, thanks. Please try to keep your subject line consistent with the rest of the subsystem.

1 0

[alsa-devel] hdspm.c - confused about SNDRV_HDSPM_IOCTL_GET_[CONFIG|STATUS]
by Jörn Nettingsmeier 18 May '11

18 May '11

hi *! i'm trying to extend hdspconf to work with the rme hdspm madi card, and got confused over the snd_hdspm_hwdep_ioctl: apparently, the hdspm.c driver differentiates between settable controls (CONFIG) and non-settable status indicators (STATUS), unlike the earlier hdspm.c. however, usage seems a bit inconsistent: struct hdspm_config contains a member madi_sync_check, which is apparently never set. instead, struct hdspm_status card_specific.sync_madi is used, same for tco and sync in. but there is a wordclock_sync_check in struct hdspm_config which is in use. am i guessing right that the latter is somewhat deprecated and that i should be taking all status values from struct hdspm_status instead? thanks, jörn please cc: me, i'm not on alsa.devel. -- Jörn Nettingsmeier Lortzingstr. 11, 45128 Essen, Tel. +49 177 7937487 Meister für Veranstaltungstechnik (Bühne/Studio) Tonmeister (VDT) http://stackingdwarves.net

2 1

[alsa-devel] [PATCH] sound, core, pcm_lib: xrun_log: log also in_interrupt
by Ben Gardiner 18 May '11

18 May '11

When debugging pcm drivers I found the "period" or "hw" prefix printed by either XRUN_DEBUG_PERIODUPDATE or XRUN_DEBUG_PERIODUPDATE events, respectively to be very useful is observing the interplay between interrupt-context updates and syscall-context updates. Similarly, when debugging overruns with XRUN_DEBUG_LOG it is useful to see the context of the last 10 positions. Add an in_interrupt member to hwptr_log_entry which stores the value of the in_interrupt parameter of snd_pcm_update_hw_ptr0 when the log entry is created. Print a "[Q]" prefix when dumping the log entries if in_interrupt was true. Signed-off-by: Ben Gardiner <bengardiner(a)nanometrics.ca> --- sound/core/pcm_lib.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c index 64449cb..c8c8091 100644 --- a/sound/core/pcm_lib.c +++ b/sound/core/pcm_lib.c @@ -189,6 +189,7 @@ static void xrun(struct snd_pcm_substream *substream) #define XRUN_LOG_CNT 10 struct hwptr_log_entry { + unsigned int in_interrupt; unsigned long jiffies; snd_pcm_uframes_t pos; snd_pcm_uframes_t period_size; @@ -204,7 +205,7 @@ struct snd_pcm_hwptr_log { }; static void xrun_log(struct snd_pcm_substream *substream, - snd_pcm_uframes_t pos) + snd_pcm_uframes_t pos, int in_interrupt) { struct snd_pcm_runtime *runtime = substream->runtime; struct snd_pcm_hwptr_log *log = runtime->hwptr_log; @@ -220,6 +221,7 @@ static void xrun_log(struct snd_pcm_substream *substream, return; } entry = &log->entries[log->idx]; + entry->in_interrupt = in_interrupt; entry->jiffies = jiffies; entry->pos = pos; entry->period_size = runtime->period_size; @@ -246,9 +248,11 @@ static void xrun_log_show(struct snd_pcm_substream *substream) entry = &log->entries[idx]; if (entry->period_size == 0) break; - snd_printd("hwptr log: %s: j=%lu, pos=%ld/%ld/%ld, " + snd_printd("hwptr log: %s: %sj=%lu, pos=%ld/%ld/%ld, " "hwptr=%ld/%ld\n", - name, entry->jiffies, (unsigned long)entry->pos, + name, entry->in_interrupt ? "[Q] " : "", + entry->jiffies, + (unsigned long)entry->pos, (unsigned long)entry->period_size, (unsigned long)entry->buffer_size, (unsigned long)entry->old_hw_ptr, @@ -326,7 +330,7 @@ static int snd_pcm_update_hw_ptr0(struct snd_pcm_substream *substream, } pos -= pos % runtime->min_align; if (xrun_debug(substream, XRUN_DEBUG_LOG)) - xrun_log(substream, pos); + xrun_log(substream, pos, in_interrupt); hw_base = runtime->hw_ptr_base; new_hw_ptr = hw_base + pos; if (in_interrupt) { -- 1.7.4.1

2 1

Re: [alsa-devel] [PATCH] Max98095: Move existing NULL check before pointer dereference.
by Peter Hsiang 18 May '11

18 May '11

On Tue, May 17, 2011, Taylor Hutt wrote: > Visual inspection shows that max98095_put_eq_enum() and > max98095_put_bq_enum() each have a possible NULL deref of 'pdata'. > > This change moves the NULL check above the use. > > BUG=none > TEST=Visual inspection Mark, this patch looks good. Thank you Taylor.

3 3

[alsa-devel] Reported latency > buffersize and sometimes <0
by Werner Van Belle 18 May '11

18 May '11

Hello, I recently started to check whether the new alsa drivers still work with BpmDj (http://bpmdj.yellowcouch.org/). Thereby I encountered the problem that the reported latency might be larger than the buffersize itself. I guess this has to do with the asynchronity between asking the question and retrieving the answer (e.g: a thread switch might come in between and the actual latency is in that case bumped beyond the buffersize.. or so .. Does this reasoning make sense ? Can I assume that such weird values are indeed correct ? Another problem I sometimes encounter is that the returned latency is -1; a very annoying number since the stream was truly honoustly playing, so how can the latency be so low then ? With kind regards, Werner,- -- http://werner.yellowcouch.org/

1 0

[alsa-devel] Assorted usb-audio patches
by Daniel Mack 18 May '11

18 May '11

Hi, here are some patches I collected for the usb-audio driver. Most of them have been discussed on this list already, and all are rather small and shouldn't cause any problems. FWIW, they can also be pulled from git://github.com/zonque/linux-2.6.git usb-audio Daniel Daniel Mack (8): MAINTAINERS: Add entry for Native Instruments sound driver ALSA: usb-audio: make hwc_debug a noop in case HW_CONST_DEBUG is not set ALSA: usb-audio: include format.h in format.c ALSA: usb-audio: remove invalid extra mixers for Komplete Audio 6 ALSA: usb-audio: Add quirk for KORG PANDORA PX5D MIDI interface ALSA: usb-audio: add quirks for Roland GR-55 ALSA: usb-audio: assume valid clock ALSA: usb-audio: handle "Fast Track Ultra" with USB_DEVICE_VENDOR_SPEC() MAINTAINERS | 7 +++++++ sound/usb/clock.c | 11 ++++++++++- sound/usb/debug.h | 2 +- sound/usb/format.c | 1 + sound/usb/mixer_quirks.c | 17 ----------------- sound/usb/quirks-table.h | 43 ++++++++++++++++++++++++++++++++++++++++--- sound/usb/quirks.c | 2 +- 7 files changed, 60 insertions(+), 23 deletions(-)

2 9

[PATCH - Basic mixer support for Fast Track Ultra 5/6]Try to create a mixer for quirked devices, too
by Felix Homann 18 May '11

18 May '11

Signed-off-by: Felix Homann <linuxaudio(a)showlabor.de> diff --git a/sound/usb/card.c b/sound/usb/card.c index 40722f8..52ad7b0 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -493,6 +493,11 @@ static void *snd_usb_audio_probe(struct usb_device *dev, */ if (!chip->ctrl_intf) chip->ctrl_intf = alts; + + /* try to create a mixer for quirked devices, too */ + if (snd_usb_create_mixer(chip, ifnum, ignore_ctl_error) < 0) { + goto __error; + } if (err > 0) { /* create normal USB audio interfaces */ -- 1.7.4.1 --------------000101040900080309070209--

1 0

[PATCH - Basic mixer support for Fast Track Ultra 3/6]Add mixer quirk for Fast Track Ultra devices
by Felix Homann 18 May '11

18 May '11

Signed-off-by: Felix Homann <linuxaudio(a)showlabor.de> diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index ea95ce2..1c37792 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -542,6 +542,31 @@ static int add_control_to_empty(struct mixer_build *state, struct snd_kcontrol * return 0; } +/* + * This is almost the same as 'add_control_to_empty' but using a mixer instead of a mixer_build + * it simplifies building a mixer for devices without proper descriptors, + * e.g. the Fast Track Ultra devices + */ +int add_unique_control_to_empty_mixer(struct usb_mixer_interface *mixer, struct snd_kcontrol *kctl) +{ + struct usb_mixer_elem_info *cval = kctl->private_data; + int err; + + /* No duplicates! */ + if (snd_ctl_find_id(mixer->chip->card, &kctl->id)) + return 0; + + if ((err = snd_ctl_add(mixer->chip->card, kctl)) < 0) { + snd_printd(KERN_ERR "cannot add control (err = %d)\n", err); + return err; + } + + cval->elem_id = &kctl->id; + cval->next_id_elem = mixer->id_elems[cval->id]; + mixer->id_elems[cval->id] = cval; + + return 0; +} /* * get a terminal name string @@ -1331,6 +1356,57 @@ static void build_mixer_unit_ctl(struct mixer_build *state, add_control_to_empty(state, kctl); } +/* + * build a mixer unit control and give it a name + * + * this is essentially identical to build_mixer_unit_ctl but doesn't + * rely on proper descriptors to get a name for a control. + * At least, useful for Fast Track Ultra devices. + */ + +int build_named_mixer_unit_ctl(struct usb_mixer_interface *mixer, + int in_pin, int in_ch, int unitid, int val_type, unsigned int cmask, char* ctrl_name, int channels) +{ + struct usb_mixer_elem_info *cval; + struct snd_kcontrol *kctl; + int err; + + cval = kzalloc(sizeof(*cval), GFP_KERNEL); + if (! cval) + return -1; + + cval->mixer = mixer; + cval->id = unitid; + cval->control = in_ch + 1; /* based on 1 */ + cval->val_type = val_type; /* like USB_MIXER_S16 etc. */ + if (!((0 < channels) && (channels <= MAX_CHANNELS))) + return -1; + cval->channels = 1; + cval->cmask = cmask; + /* get min/max values */ + get_min_max(cval, 0); + + kctl = snd_ctl_new1(&usb_feature_unit_ctl, cval); + if (! kctl) { + snd_printk(KERN_ERR "cannot malloc kcontrol\n"); + kfree(cval); + return -1; + } + + kctl->tlv.c = mixer_vol_tlv; + kctl->vd[0].access |= + SNDRV_CTL_ELEM_ACCESS_TLV_READ | + SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK; + kctl->private_free = usb_mixer_elem_free; + + sprintf(kctl->id.name, ctrl_name); + + if (err = add_unique_control_to_empty_mixer(mixer, kctl)) + return err; + + return 0; +} + /* * parse a mixer unit diff --git a/sound/usb/mixer.h b/sound/usb/mixer.h index 86af922..6fe7bea 100644 --- a/sound/usb/mixer.h +++ b/sound/usb/mixer.h @@ -61,6 +61,9 @@ void snd_usb_mixer_notify_id(struct usb_mixer_interface *mixer, int unitid); int snd_usb_mixer_set_ctl_value(struct usb_mixer_elem_info *cval, int request, int validx, int value_set); +int build_named_mixer_unit_ctl(struct usb_mixer_interface *mixer, + int in_pin, int in_ch, int unitid, int val_type, + unsigned int cmask, char* ctrl_name, int channels); void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer); int snd_usb_mixer_activate(struct usb_mixer_interface *mixer); diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index 73dcc82..e87f359 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -500,6 +500,36 @@ void snd_emuusb_set_samplerate(struct snd_usb_audio *chip, } } +/* + * Create mixer controls for Fast Track Ultra (8R) + */ +int snd_ftu_controls_create(struct usb_mixer_interface *mixer) +{ + char name[44]; + int out, in_ch, unitid, err; + unsigned int cmask; + int val_type = USB_MIXER_S16; + int channels = 1; /* mono channels */ + + unitid = 5; // FTU's unit id + for (out = 0; out < 8; ++out) { + for (in_ch = 0; in_ch < 16; ++in_ch) { + cmask = (1 << in_ch); + if (in_ch < 8) + sprintf(name, "AIn%d - Out%d Capture Volume", in_ch + 1, out + 1); + else if (in_ch >= 8) + sprintf(name, "DIn%d - Out%d Playback Volume", in_ch - 7, out + 1); + if ((err = build_named_mixer_unit_ctl(mixer, in_ch, out, unitid, + val_type, cmask, name, channels))) { + return err; + } + } + } + + return 0; +} + + int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) { int err = 0; @@ -537,6 +567,10 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) snd_nativeinstruments_ta10_mixers, ARRAY_SIZE(snd_nativeinstruments_ta10_mixers)); break; + case USB_ID(0x0763, 0x2080):/* M-Audio Fast Track Ultra */ + case USB_ID(0x0763, 0x2081): /* M-Audio Fast Track Ultra 8R */ + err = snd_ftu_controls_create(mixer); + break; } return err; -- 1.7.4.1 --------------000101040900080309070209 Content-Type: text/x-patch; name="0004-Try-to-create-a-mixer-for-quirked-devices-too.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0004-Try-to-create-a-mixer-for-quirked-devices-too.patch"

1 0