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

[alsa-devel] (no subject)
by E.Richiardone 30 Jun '15

30 Jun '15

Hi all, I am building a solution on a Debian platform that should playback an audio recorded in G711 ulaw format. I am using Alsa to interfacing with the audio device, it's a snd_cs5535audio. Below there is a fragment of the code I am using. I don't have any problems accessing the device using the "plughw:0,0" device, where I can correctly set directly the ulaw 8000Hz format. Now I was needing an multiband equalizer, and found that Alsa supports some ladspa plugins, I choosed mbeq. But if I use a device name different from "plughw:0,0", as for example the "default" device or "plug", the final function snd_pcm_hw_params() returns an error: "cannot set hw params (Invalid argument)" I was thinking that maybe my problem is that only the "plughw" device accept directly the G711 ulaw format. Anyone can confirm my thought? There is a way to access a device directly in G711 ulaw format that can be equalized with a plugin? My initialisation source code: ----------8<---------- // #define AUDIODEV "plughw:0,0" #define AUDIODEV "default" [...] pcm_name = strdup(AUDIODEV); if((err = snd_pcm_open(&playback_handle, pcm_name, stream, 0)) < 0){ printf(" E> cannot open audio device %s (%s)\n", pcm_name, snd_strerror(err)); closeall(1); } if((err = snd_pcm_hw_params_any(playback_handle, hw_params)) < 0){ printf(" E> cannot initialize hardware parameter structure (%s)\n", snd_strerror(err)); closeall(1); } if((err = snd_pcm_hw_params_set_access(playback_handle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) < 0){ printf(" E> cannot set access type (%s)\n", snd_strerror(err)); closeall(1); } err = snd_pcm_hw_params_set_format(playback_handle, hw_params, SND_PCM_FORMAT_MU_LAW); if(err < 0){ printf(" E> cannot set ulaw format (%s)\n", snd_strerror(err)); closeall(1); } val = 8000; if((err = snd_pcm_hw_params_set_rate_near(playback_handle, hw_params, &val, 0)) < 0){ printf(" E> cannot set rate (%s)\n", snd_strerror(err)); closeall(1); } [...] if((err = snd_pcm_hw_params(playback_handle, hw_params)) < 0){ printf(" E> cannot set hw params (%s)\n", snd_strerror(err)); closeall(1); } ---------->8---------- My /etc/asound.conf : ----------8<---------- defaults.ctl.card 0 defaults.ctl.device 0 defaults.pcm.card 0 defaults.pcm.device 0 ctl.equal { type equal; library "/usr/lib/ladspa/mbeq_1197.so"; module "mbeq"; controls "/usr/local/webif/.alsaequal.bin"; } pcm.plugequal { type equal; slave.pcm "plughw:0,0"; library "/usr/lib/ladspa/mbeq_1197.so"; module "mbeq"; controls "/usr/local/webif/.alsaequal.bin"; } pcm.!default { type plug; slave.pcm plugequal; hint { show on description "Default equalized" } } pcm.dsp0 { type plug slave.pcm plugequal; } ---------->8---------- Many thanks Best Regards -- E.Richiardone

1 0

[alsa-devel] [PATCH 0/5] Add configuration options for tlv320aic32x4
by Kimmo Saarela 30 Jun '15

30 Jun '15

* Patch 1: Make tlv320aic32x4 module selectable on it's own on config system * Make codec visible in config tool, instead of magic selection via certain board option * Patch 2: Don't stop driver initialization if mlck is not defined * Only warn if mclk isn't in dtb file, such cases exist when other end of I2S bus provides the clock for the system and coded is not in control * Patch 3: Fix bus signal polarity configuration * Fix driver to use correct format polarity bits in config word, instead of magically setting polarity in format configuration * Patch 4: Add more devicetree options to driver * Add input-use and cmode array options to configure codec input pins properly. Current driver lets unused input pins to float. * Add swapdacs option, works similarly to old platform data option. When enabled, swaps output channels * Add powercfg config mask to pass codec power options, like: micbias off, configurable ldoin voltage, disable weak pull between AVDD and DVDD, configurable LDO voltages * Patch 5: Update codec documentation to meet changes above Kimmo Saarela (5): sound/soc/codecs: Make tlv320aic32x4 codec selectable on it's own ASoC: tlv320aic32x4: Make mclk optional ASoC: tlv320aic32x4: Move bit polarity config to specific switch statement ASoC: tlv320aic32x4: Change codec input config options ASoC: tlv320aic32x4: Update devicetree documentation .../devicetree/bindings/sound/tlv320aic32x4.txt | 27 ++- include/sound/tlv320aic32x4.h | 8 + sound/soc/codecs/Kconfig | 3 +- sound/soc/codecs/tlv320aic32x4.c | 244 ++++++++++++++++++--- sound/soc/codecs/tlv320aic32x4.h | 10 + 5 files changed, 258 insertions(+), 34 deletions(-) -- 1.9.1

1 5

[alsa-devel] [PATCH] ALSA: Fix uninintialized error return
by Colin King 30 Jun '15

30 Jun '15

From: Colin Ian King <colin.king(a)canonical.com> Static analysis with cppcheck found the following error: [sound/core/init.c:118]: (error) Uninitialized variable: err ..this was introduced by commit 2471b6c80a70e80de69f5ff4c37187c3912e5874 ("ALSA: info: Register proc entries recursively, too") where the call to snd_info_card_register was removed and no longer setting the error return in err. When snd_info_create_card_entry fails to allocate a an entry, the error path exits with garbage in err. Fix is to return -ENOMEM if entry fails to be allocated. Author: Takashi Iwai <tiwai(a)suse.de> Date: Mon May 18 09:20:24 2015 +0200 Fixes: 2471b6c80a ("ALSA: info: Register proc entries recursively, too") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/core/init.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/core/init.c b/sound/core/init.c index 3e0ceba..20f37fb 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -109,13 +109,12 @@ static void snd_card_id_read(struct snd_info_entry *entry, static int init_info_for_card(struct snd_card *card) { - int err; struct snd_info_entry *entry; entry = snd_info_create_card_entry(card, "id", card->proc_root); if (!entry) { dev_dbg(card->dev, "unable to create card entry\n"); - return err; + return -ENOMEM; } entry->c.text.read = snd_card_id_read; card->proc_id = entry; -- 2.1.4

3 2

[alsa-devel] [PATCH lib v2] Replace unsafe characters with _ in card name
by Alexander E. Patrakov 29 Jun '15

29 Jun '15

Otherwise, they get misinterpreted as argument separators in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries from working. While at it, add my Logitec C910 webcam to the SPDIF blacklist. Signed-off-by: Alexander E. Patrakov <patrakov(a)gmail.com> --- v2: Fixed misplaced NULL check for tmp->u.string include/conf.h | 1 + src/conf.c | 32 ++++++++++++++++++++++++++++++++ src/conf/cards/USB-Audio.conf | 3 ++- src/confmisc.c | 2 +- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/include/conf.h b/include/conf.h index ff270f6..087c05d 100644 --- a/include/conf.h +++ b/include/conf.h @@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const long int snd_config_imake_integer64(snd_config_t **config, const char *key, const long long value); int snd_config_imake_real(snd_config_t **config, const char *key, const double value); int snd_config_imake_string(snd_config_t **config, const char *key, const char *ascii); +int snd_config_imake_safe_string(snd_config_t **config, const char *key, const char *ascii); int snd_config_imake_pointer(snd_config_t **config, const char *key, const void *ptr); snd_config_type_t snd_config_get_type(const snd_config_t *config); diff --git a/src/conf.c b/src/conf.c index bb256e7..c6a83ee 100644 --- a/src/conf.c +++ b/src/conf.c @@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *v return 0; } +int snd_config_imake_safe_string(snd_config_t **config, const char *id, const char *value) +{ + int err; + snd_config_t *tmp; + char *c; + + err = snd_config_make(&tmp, id, SND_CONFIG_TYPE_STRING); + if (err < 0) + return err; + if (value) { + tmp->u.string = strdup(value); + if (!tmp->u.string) { + snd_config_delete(tmp); + return -ENOMEM; + } + + for (c = tmp->u.string; *c; c++) { + if (*c == ' ' || *c == '-' || *c == '_' || + (*c >= '0' && *c <= '9') || + (*c >= 'a' && *c <= 'z') || + (*c >= 'A' && *c <= 'Z')) + continue; + *c = '_'; + } + } else { + tmp->u.string = NULL; + } + *config = tmp; + return 0; +} + + /** * \brief Creates a pointer configuration node with the given initial value. * \param[out] config The function puts the handle to the new node at diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 031bee0..e365f29 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -57,7 +57,8 @@ USB-Audio.pcm.iec958_device { "Scarlett 2i4 USB" 999 "Sennheiser USB headset" 999 "SWTOR Gaming Headset by Razer" 999 - "USB Device 0x46d:0x992" 999 + "USB Device 0x46d_0x821" 999 + "USB Device 0x46d_0x992" 999 } # Second iec958 device number, if any. diff --git a/src/confmisc.c b/src/confmisc.c index 1fb4f28..ae0275f 100644 --- a/src/confmisc.c +++ b/src/confmisc.c @@ -935,7 +935,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root, } err = snd_config_get_id(src, &id); if (err >= 0) - err = snd_config_imake_string(dst, id, + err = snd_config_imake_safe_string(dst, id, snd_ctl_card_info_get_name(info)); __error: if (ctl) -- 2.4.4

2 1

[alsa-devel] [PATCH 01/13] topology: uapi: Add UAPI headers for topology ABI
by Liam Girdwood 29 Jun '15

29 Jun '15

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- include/sound/asoc.h | 387 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/sound/tlv.h | 23 +++ 2 files changed, 410 insertions(+) create mode 100644 include/sound/asoc.h create mode 100644 include/sound/tlv.h diff --git a/include/sound/asoc.h b/include/sound/asoc.h new file mode 100644 index 0000000..498cd0c --- /dev/null +++ b/include/sound/asoc.h @@ -0,0 +1,387 @@ +/* + * uapi/sound/asoc.h -- ALSA SoC Firmware Controls and DAPM + * + * Copyright (C) 2012 Texas Instruments Inc. + * Copyright (C) 2015 Intel Corporation. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * Simple file API to load FW that includes mixers, coefficients, DAPM graphs, + * algorithms, equalisers, DAIs, widgets etc. +*/ + +#ifndef __LINUX_UAPI_SND_ASOC_H +#define __LINUX_UAPI_SND_ASOC_H + +/* + * Maximum number of channels topology kcontrol can represent. + */ +#define SND_SOC_TPLG_MAX_CHAN 8 + +/* + * Maximum number of PCM formats capability + */ +#define SND_SOC_TPLG_MAX_FORMATS 16 + +/* + * Maximum number of PCM stream configs + */ +#define SND_SOC_TPLG_STREAM_CONFIG_MAX 8 + +/* individual kcontrol info types - can be mixed with other types */ +#define SND_SOC_TPLG_CTL_VOLSW 1 +#define SND_SOC_TPLG_CTL_VOLSW_SX 2 +#define SND_SOC_TPLG_CTL_VOLSW_XR_SX 3 +#define SND_SOC_TPLG_CTL_ENUM 4 +#define SND_SOC_TPLG_CTL_BYTES 5 +#define SND_SOC_TPLG_CTL_ENUM_VALUE 6 +#define SND_SOC_TPLG_CTL_RANGE 7 +#define SND_SOC_TPLG_CTL_STROBE 8 + + +/* individual widget kcontrol info types - can be mixed with other types */ +#define SND_SOC_TPLG_DAPM_CTL_VOLSW 64 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE 65 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT 66 +#define SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE 67 +#define SND_SOC_TPLG_DAPM_CTL_PIN 68 + +/* DAPM widget types - add new items to the end */ +#define SND_SOC_TPLG_DAPM_INPUT 0 +#define SND_SOC_TPLG_DAPM_OUTPUT 1 +#define SND_SOC_TPLG_DAPM_MUX 2 +#define SND_SOC_TPLG_DAPM_MIXER 3 +#define SND_SOC_TPLG_DAPM_PGA 4 +#define SND_SOC_TPLG_DAPM_OUT_DRV 5 +#define SND_SOC_TPLG_DAPM_ADC 6 +#define SND_SOC_TPLG_DAPM_DAC 7 +#define SND_SOC_TPLG_DAPM_SWITCH 8 +#define SND_SOC_TPLG_DAPM_PRE 9 +#define SND_SOC_TPLG_DAPM_POST 10 +#define SND_SOC_TPLG_DAPM_AIF_IN 11 +#define SND_SOC_TPLG_DAPM_AIF_OUT 12 +#define SND_SOC_TPLG_DAPM_DAI_IN 13 +#define SND_SOC_TPLG_DAPM_DAI_OUT 14 +#define SND_SOC_TPLG_DAPM_DAI_LINK 15 +#define SND_SOC_TPLG_DAPM_LAST SND_SOC_TPLG_DAPM_DAI_LINK + +/* Header magic number and string sizes */ +#define SND_SOC_TPLG_MAGIC 0x41536F43 /* ASoC */ + +/* string sizes */ +#define SND_SOC_TPLG_NUM_TEXTS 16 + +/* ABI version */ +#define SND_SOC_TPLG_ABI_VERSION 0x2 + +/* Max size of TLV data */ +#define SND_SOC_TPLG_TLV_SIZE 32 + +/* + * File and Block header data types. + * Add new generic and vendor types to end of list. + * Generic types are handled by the core whilst vendors types are passed + * to the component drivers for handling. + */ +#define SND_SOC_TPLG_TYPE_MIXER 1 +#define SND_SOC_TPLG_TYPE_BYTES 2 +#define SND_SOC_TPLG_TYPE_ENUM 3 +#define SND_SOC_TPLG_TYPE_DAPM_GRAPH 4 +#define SND_SOC_TPLG_TYPE_DAPM_WIDGET 5 +#define SND_SOC_TPLG_TYPE_DAI_LINK 6 +#define SND_SOC_TPLG_TYPE_PCM 7 +#define SND_SOC_TPLG_TYPE_MANIFEST 8 +#define SND_SOC_TPLG_TYPE_CODEC_LINK 9 +#define SND_SOC_TPLG_TYPE_MAX SND_SOC_TPLG_TYPE_CODEC_LINK + +/* vendor block IDs - please add new vendor types to end */ +#define SND_SOC_TPLG_TYPE_VENDOR_FW 1000 +#define SND_SOC_TPLG_TYPE_VENDOR_CONFIG 1001 +#define SND_SOC_TPLG_TYPE_VENDOR_COEFF 1002 +#define SND_SOC_TPLG_TYPEVENDOR_CODEC 1003 + +#define SND_SOC_TPLG_STREAM_PLAYBACK 0 +#define SND_SOC_TPLG_STREAM_CAPTURE 1 + +/* + * Block Header. + * This header precedes all object and object arrays below. + */ +struct snd_soc_tplg_hdr { + __le32 magic; /* magic number */ + __le32 abi; /* ABI version */ + __le32 version; /* optional vendor specific version details */ + __le32 type; /* SND_SOC_TPLG_TYPE_ */ + __le32 size; /* size of this structure */ + __le32 vendor_type; /* optional vendor specific type info */ + __le32 payload_size; /* data bytes, excluding this header */ + __le32 index; /* identifier for block */ + __le32 count; /* number of elements in block */ +} __attribute__((packed)); + +/* + * Private data. + * All topology objects may have private data that can be used by the driver or + * firmware. Core will ignore this data. + */ +struct snd_soc_tplg_private { + __le32 size; /* in bytes of private data */ + char data[0]; +} __attribute__((packed)); + +/* + * Kcontrol TLV data. + */ +struct snd_soc_tplg_ctl_tlv { + __le32 size; /* in bytes aligned to 4 */ + __le32 numid; /* control element numeric identification */ + __le32 count; /* number of elem in data array */ + __le32 data[SND_SOC_TPLG_TLV_SIZE]; +} __attribute__((packed)); + +/* + * Kcontrol channel data + */ +struct snd_soc_tplg_channel { + __le32 size; /* in bytes of this structure */ + __le32 reg; + __le32 shift; + __le32 id; /* ID maps to Left, Right, LFE etc */ +} __attribute__((packed)); + +/* + * Kcontrol Operations IDs + */ +struct snd_soc_tplg_kcontrol_ops_id { + __le32 get; + __le32 put; + __le32 info; +} __attribute__((packed)); + +/* + * kcontrol header + */ +struct snd_soc_tplg_ctl_hdr { + __le32 size; /* in bytes of this structure */ + __le32 type; + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 access; + struct snd_soc_tplg_kcontrol_ops_id ops; + __le32 tlv_size; /* non zero means control has TLV data */ +} __attribute__((packed)); + +/* + * Stream Capabilities + */ +struct snd_soc_tplg_stream_caps { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le64 formats[SND_SOC_TPLG_MAX_FORMATS]; /* supported formats SNDRV_PCM_FMTBIT_* */ + __le32 rates; /* supported rates SNDRV_PCM_RATE_* */ + __le32 rate_min; /* min rate */ + __le32 rate_max; /* max rate */ + __le32 channels_min; /* min channels */ + __le32 channels_max; /* max channels */ + __le32 periods_min; /* min number of periods */ + __le32 periods_max; /* max number of periods */ + __le32 period_size_min; /* min period size bytes */ + __le32 period_size_max; /* max period size bytes */ + __le32 buffer_size_min; /* min buffer size bytes */ + __le32 buffer_size_max; /* max buffer size bytes */ +} __attribute__((packed)); + +/* + * FE or BE Stream configuration supported by SW/FW + */ +struct snd_soc_tplg_stream { + __le32 size; /* in bytes of this structure */ + __le64 format; /* SNDRV_PCM_FMTBIT_* */ + __le32 rate; /* SNDRV_PCM_RATE_* */ + __le32 period_bytes; /* size of period in bytes */ + __le32 buffer_bytes; /* size of buffer in bytes */ + __le32 channels; /* channels */ + __le32 tdm_slot; /* optional BE bitmask of supported TDM slots */ + __le32 dai_fmt; /* SND_SOC_DAIFMT_ */ +} __attribute__((packed)); + +/* + * Duplex stream configuration supported by SW/FW. + */ +struct snd_soc_tplg_stream_config { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + struct snd_soc_tplg_stream playback; + struct snd_soc_tplg_stream capture; +} __attribute__((packed)); + +/* + * Manifest. List totals for each payload type. Not used in parsing, but will + * be passed to the component driver before any other objects in order for any + * global component resource allocations. + * + * File block representation for manifest :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_manifest | 1 | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_manifest { + __le32 size; /* in bytes of this structure */ + __le32 control_elems; /* number of control elements */ + __le32 widget_elems; /* number of widget elements */ + __le32 graph_elems; /* number of graph elements */ + __le32 dai_elems; /* number of DAI elements */ + __le32 dai_link_elems; /* number of DAI link elements */ + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Mixer kcontrol. + * + * File block representation for mixer kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_mixer_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_mixer_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 min; + __le32 max; + __le32 platform_max; + __le32 invert; + __le32 num_channels; + struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN]; + struct snd_soc_tplg_ctl_tlv tlv; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Enumerated kcontrol + * + * File block representation for enum kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_enum_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_enum_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 num_channels; + struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN]; + __le32 items; + __le32 mask; + __le32 count; + char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 values[SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN / 4]; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * Bytes kcontrol + * + * File block representation for bytes kcontrol :- + * +-----------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+----+ + * | struct snd_soc_tplg_bytes_control | N | + * +-----------------------------------+----+ + */ +struct snd_soc_tplg_bytes_control { + struct snd_soc_tplg_ctl_hdr hdr; + __le32 size; /* in bytes of this structure */ + __le32 max; + __le32 mask; + __le32 base; + __le32 num_regs; + struct snd_soc_tplg_private priv; +} __attribute__((packed)); + +/* + * DAPM Graph Element + * + * File block representation for DAPM graph elements :- + * +-------------------------------------+----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-------------------------------------+----+ + * | struct snd_soc_tplg_dapm_graph_elem | N | + * +-------------------------------------+----+ + */ +struct snd_soc_tplg_dapm_graph_elem { + char sink[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char control[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char source[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; +} __attribute__((packed)); + +/* + * DAPM Widget. + * + * File block representation for DAPM widget :- + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_dapm_widget | N | + * +-------------------------------------+-----+ + * | struct snd_soc_tplg_enum_control | 0|1 | + * | struct snd_soc_tplg_mixer_control | 0|N | + * +-------------------------------------+-----+ + * + * Optional enum or mixer control can be appended to the end of each widget + * in the block. + */ +struct snd_soc_tplg_dapm_widget { + __le32 size; /* in bytes of this structure */ + __le32 id; /* SND_SOC_DAPM_CTL */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + char sname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + + __le32 reg; /* negative reg = no direct dapm */ + __le32 shift; /* bits to shift */ + __le32 mask; /* non-shifted mask */ + __le32 subseq; /* sort within widget type */ + __u32 invert; /* invert the power bit */ + __u32 ignore_suspend; /* kept enabled over suspend */ + __u16 event_flags; + __u16 event_type; + __u16 num_kcontrols; + struct snd_soc_tplg_private priv; + /* + * kcontrols that relate to this widget + * follow here after widget private data + */ +} __attribute__((packed)); + +struct snd_soc_tplg_pcm_cfg_caps { + struct snd_soc_tplg_stream_caps caps; + struct snd_soc_tplg_stream_config configs[SND_SOC_TPLG_STREAM_CONFIG_MAX]; + __le32 num_configs; /* number of configs */ +} __attribute__((packed)); + +/* + * Describes SW/FW specific features of PCM or DAI link. + * + * File block representation for PCM/DAI-Link :- + * +-----------------------------------+-----+ + * | struct snd_soc_tplg_hdr | 1 | + * +-----------------------------------+-----+ + * | struct snd_soc_tplg_dapm_pcm_dai | N | + * +-----------------------------------+-----+ + */ +struct snd_soc_tplg_pcm_dai { + __le32 size; /* in bytes of this structure */ + char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; + __le32 id; /* unique ID - used to match */ + __le32 playback; /* supports playback mode */ + __le32 capture; /* supports capture mode */ + __le32 compress; /* 1 = compressed; 0 = PCM */ + struct snd_soc_tplg_pcm_cfg_caps capconf[2]; /* capabilities and configs */ +} __attribute__((packed)); + +#endif diff --git a/include/sound/tlv.h b/include/sound/tlv.h new file mode 100644 index 0000000..33d747d --- /dev/null +++ b/include/sound/tlv.h @@ -0,0 +1,23 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef __UAPI_SOUND_TLV_H +#define __UAPI_SOUND_TLV_H + +#define SNDRV_CTL_TLVT_CONTAINER 0 /* one level down - group of TLVs */ +#define SNDRV_CTL_TLVT_DB_SCALE 1 /* dB scale */ +#define SNDRV_CTL_TLVT_DB_LINEAR 2 /* linear volume */ +#define SNDRV_CTL_TLVT_DB_RANGE 3 /* dB range container */ +#define SNDRV_CTL_TLVT_DB_MINMAX 4 /* dB scale with min/max */ +#define SNDRV_CTL_TLVT_DB_MINMAX_MUTE 5 /* dB scale with min/max with mute */ + +#endif -- 2.1.4

2 15

[alsa-devel] [PATCH lib] Replace unsafe characters with _ in card name
by Alexander E. Patrakov 29 Jun '15

29 Jun '15

Otherwise, they get misinterpreted as argument separators in USB-Audio PCM definitions, and thus prevent SPDIF blacklist entries from working. While at it, add my Logitec C910 webcam to the SPDIF blacklist. Signed-off-by: Alexander E. Patrakov <patrakov(a)gmail.com> --- I did not send this patch earlier because of hesitation whether to send it as it is or to implement proper escaping, and then forgot about it. include/conf.h | 1 + src/conf.c | 32 ++++++++++++++++++++++++++++++++ src/conf/cards/USB-Audio.conf | 3 ++- src/confmisc.c | 2 +- 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/include/conf.h b/include/conf.h index ff270f6..087c05d 100644 --- a/include/conf.h +++ b/include/conf.h @@ -126,6 +126,7 @@ int snd_config_imake_integer(snd_config_t **config, const char *key, const long int snd_config_imake_integer64(snd_config_t **config, const char *key, const long long value); int snd_config_imake_real(snd_config_t **config, const char *key, const double value); int snd_config_imake_string(snd_config_t **config, const char *key, const char *ascii); +int snd_config_imake_safe_string(snd_config_t **config, const char *key, const char *ascii); int snd_config_imake_pointer(snd_config_t **config, const char *key, const void *ptr); snd_config_type_t snd_config_get_type(const snd_config_t *config); diff --git a/src/conf.c b/src/conf.c index bb256e7..e72a58a 100644 --- a/src/conf.c +++ b/src/conf.c @@ -2228,6 +2228,38 @@ int snd_config_imake_string(snd_config_t **config, const char *id, const char *v return 0; } +int snd_config_imake_safe_string(snd_config_t **config, const char *id, const char *value) +{ + int err; + snd_config_t *tmp; + char *c; + + err = snd_config_make(&tmp, id, SND_CONFIG_TYPE_STRING); + if (err < 0) + return err; + if (value) { + tmp->u.string = strdup(value); + for (c = tmp->u.string; *c; c++) { + if (*c == ' ' || *c == '-' || *c == '_' || + (*c >= '0' && *c <= '9') || + (*c >= 'a' && *c <= 'z') || + (*c >= 'A' && *c <= 'Z')) + continue; + *c = '_'; + } + + if (!tmp->u.string) { + snd_config_delete(tmp); + return -ENOMEM; + } + } else { + tmp->u.string = NULL; + } + *config = tmp; + return 0; +} + + /** * \brief Creates a pointer configuration node with the given initial value. * \param[out] config The function puts the handle to the new node at diff --git a/src/conf/cards/USB-Audio.conf b/src/conf/cards/USB-Audio.conf index 031bee0..e365f29 100644 --- a/src/conf/cards/USB-Audio.conf +++ b/src/conf/cards/USB-Audio.conf @@ -57,7 +57,8 @@ USB-Audio.pcm.iec958_device { "Scarlett 2i4 USB" 999 "Sennheiser USB headset" 999 "SWTOR Gaming Headset by Razer" 999 - "USB Device 0x46d:0x992" 999 + "USB Device 0x46d_0x821" 999 + "USB Device 0x46d_0x992" 999 } # Second iec958 device number, if any. diff --git a/src/confmisc.c b/src/confmisc.c index 1fb4f28..ae0275f 100644 --- a/src/confmisc.c +++ b/src/confmisc.c @@ -935,7 +935,7 @@ int snd_func_card_name(snd_config_t **dst, snd_config_t *root, } err = snd_config_get_id(src, &id); if (err >= 0) - err = snd_config_imake_string(dst, id, + err = snd_config_imake_safe_string(dst, id, snd_ctl_card_info_get_name(info)); __error: if (ctl) -- 2.4.4

2 3

[alsa-devel] [PATCH 1/3] ucm: docs: fix doxygen exclude patch for UCM local header
by Liam Girdwood 29 Jun '15

29 Jun '15

Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- doc/doxygen.cfg.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg.in index f4499d6..043e75b 100644 --- a/doc/doxygen.cfg.in +++ b/doc/doxygen.cfg.in @@ -94,7 +94,7 @@ EXCLUDE = @top_srcdir@/src/control/control_local.h \ @top_srcdir@/src/mixer/mixer_local.h \ @top_srcdir@/src/rawmidi/rawmidi_local.h \ @top_srcdir@/src/seq/seq_local.h \ - @top_srcdir@/src/seq/ucm_local.h + @top_srcdir@/src/ucm/ucm_local.h RECURSIVE = YES FILE_PATTERNS = *.c *.h EXAMPLE_PATH = @top_srcdir@/test -- 2.1.4

2 4

[alsa-devel] [PATCH] ALSA: hda - Fix the dock headphone output on Fujitsu Lifebook E780
by Takashi Iwai 29 Jun '15

29 Jun '15

Fujitsu Lifebook E780 sets the sequence number 0x0f to only only of the two headphones, thus the driver tries to assign another as the line-out, and this results in the inconsistent mapping between the created jack ctl and the actual I/O. Due to this, PulseAudio doesn't handle it properly and gets the silent output. The fix is to ignore the non-HP sequencer checks. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=99681 Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index cab09c42598b..dfa3852a3476 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -4464,6 +4464,7 @@ enum { ALC269_FIXUP_LIFEBOOK, ALC269_FIXUP_LIFEBOOK_EXTMIC, ALC269_FIXUP_LIFEBOOK_HP_PIN, + ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT, ALC269_FIXUP_AMIC, ALC269_FIXUP_DMIC, ALC269VB_FIXUP_AMIC, @@ -4634,6 +4635,10 @@ static const struct hda_fixup alc269_fixups[] = { { } }, }, + [ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT] = { + .type = HDA_FIXUP_FUNC, + .v.func = alc269_fixup_pincfg_no_hp_to_lineout, + }, [ALC269_FIXUP_AMIC] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { @@ -5208,6 +5213,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x104d, 0x9084, "Sony VAIO", ALC275_FIXUP_SONY_HWEQ), SND_PCI_QUIRK(0x104d, 0x9099, "Sony VAIO S13", ALC275_FIXUP_SONY_DISABLE_AAMIX), SND_PCI_QUIRK(0x10cf, 0x1475, "Lifebook", ALC269_FIXUP_LIFEBOOK), + SND_PCI_QUIRK(0x10cf, 0x159f, "Lifebook E780", ALC269_FIXUP_LIFEBOOK_NO_HP_TO_LINEOUT), SND_PCI_QUIRK(0x10cf, 0x15dc, "Lifebook T731", ALC269_FIXUP_LIFEBOOK_HP_PIN), SND_PCI_QUIRK(0x10cf, 0x1757, "Lifebook E752", ALC269_FIXUP_LIFEBOOK_HP_PIN), SND_PCI_QUIRK(0x10cf, 0x1845, "Lifebook U904", ALC269_FIXUP_LIFEBOOK_EXTMIC), -- 2.4.4

2 1

[alsa-devel] [PATCH] ALSA: hda: Delete an unnecessary check before the function call "snd_info_free_entry"
by SF Markus Elfring 29 Jun '15

29 Jun '15

From: Markus Elfring <elfring(a)users.sourceforge.net> Date: Sun, 28 Jun 2015 11:15:28 +0200 The snd_info_free_entry() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> --- sound/pci/hda/patch_hdmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index f852734..2f24338 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -591,7 +591,7 @@ static int eld_proc_new(struct hdmi_spec_per_pin *per_pin, int index) static void eld_proc_free(struct hdmi_spec_per_pin *per_pin) { - if (!per_pin->codec->bus->shutdown && per_pin->proc_entry) { + if (!per_pin->codec->bus->shutdown) { snd_info_free_entry(per_pin->proc_entry); per_pin->proc_entry = NULL; } -- 2.4.4

2 1

[alsa-devel] [PATCH] ALSA: hda - Add a fixup for Dell E7450
by Takashi Iwai 29 Jun '15

29 Jun '15

Dell E7450 [0128:062e] needs the same quirk as other E7xx models. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=100571 Cc: <stable(a)vger.kernel.org> # v4.1 Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index dfa3852a3476..b3b44681d3cf 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -5126,6 +5126,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x05f6, "Dell", ALC269_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x0615, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK), SND_PCI_QUIRK(0x1028, 0x0616, "Dell Vostro 5470", ALC290_FIXUP_SUBWOOFER_HSJACK), + SND_PCI_QUIRK(0x1028, 0x062e, "Dell Latitude E7450", ALC292_FIXUP_DELL_E7X), SND_PCI_QUIRK(0x1028, 0x0638, "Dell Inspiron 5439", ALC290_FIXUP_MONO_SPEAKERS_HSJACK), SND_PCI_QUIRK(0x1028, 0x064a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x064b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE), -- 2.4.4

1 0