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

[alsa-devel] [PATCH] ASoC: Fix binding and probing of auxiliary components
by Sylwester Nawrocki 29 Dec '16

29 Dec '16

Currently binding of auxiliary devices doesn't work as in soc_bind_aux_dev() function a bound component is not being added to any list and in soc_probe_aux_devices() we are trying to walk the component_dev_list list to probe auxiliary components but at that time this list doesn't contain any auxiliary components since they are being added to the card only in soc_probe_component(). This patch adds a list to the card where are stored bound but not probed auxiliary devices, so that all aux devices can be probed. Fixes: 1a653aa44725 "ASoC: core: replace aux_comp_list to component_dev_list" Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- I'm not sure if this is a correct approach, without this patch the amplifier component doesn't get bound to the card on the TM2 board. --- include/sound/soc.h | 3 +++ sound/soc/soc-core.c | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 2b502f6..b86168a 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -813,6 +813,7 @@ struct snd_soc_component { unsigned int suspended:1; /* is in suspend PM state */ struct list_head list; + struct list_head card_aux_list; /* for auxiliary bound components */ struct list_head card_list; struct snd_soc_dai_driver *dai_drv; @@ -1152,6 +1153,7 @@ struct snd_soc_card { */ struct snd_soc_aux_dev *aux_dev; int num_aux_devs; + struct list_head aux_comp_list; const struct snd_kcontrol_new *controls; int num_controls; @@ -1547,6 +1549,7 @@ static inline void snd_soc_initialize_card_lists(struct snd_soc_card *card) INIT_LIST_HEAD(&card->widgets); INIT_LIST_HEAD(&card->paths); INIT_LIST_HEAD(&card->dapm_list); + INIT_LIST_HEAD(&card->aux_comp_list); INIT_LIST_HEAD(&card->component_dev_list); } diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f1901bb..baa1afa 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1748,6 +1748,7 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) component->init = aux_dev->init; component->auxiliary = 1; + list_add(&component->card_aux_list, &card->aux_comp_list); return 0; @@ -1758,16 +1759,14 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num) static int soc_probe_aux_devices(struct snd_soc_card *card) { - struct snd_soc_component *comp; + struct snd_soc_component *comp, *tmp; int order; int ret; for (order = SND_SOC_COMP_ORDER_FIRST; order <= SND_SOC_COMP_ORDER_LAST; order++) { - list_for_each_entry(comp, &card->component_dev_list, card_list) { - if (!comp->auxiliary) - continue; - + list_for_each_entry_safe(comp, tmp, &card->aux_comp_list, + card_aux_list) { if (comp->driver->probe_order == order) { ret = soc_probe_component(card, comp); if (ret < 0) { @@ -1776,6 +1775,7 @@ static int soc_probe_aux_devices(struct snd_soc_card *card) comp->name, ret); return ret; } + list_del(&comp->card_aux_list); } } } -- 1.9.1

1 0

[alsa-devel] Stream format conversion in SoC driver
by Giedrius Trainavičius 28 Dec '16

28 Dec '16

Hi, We are developing a soundcard for Raspberry Pi, you may find the current driver source code here: https://github.com/raspberrypi/linux/blob/rpi-4.4.y/sound/soc/bcm/pisound.c The card natively supports 24 and 32 bit PCM streams at 48kHz, 96kHz and 192kHz, symmetric capture and playback. Is it possible to have ALSA do the necessary format conversions for the PCM streams in natively unsupported formats to the closest natively supported format? What would be required to enable it? Thank you, Giedrius.

2 5

Re: [alsa-devel] [PATCH] ASoC : fsl_ssi : Correct the condition to check AC97 mode
by Andreas Schwab 28 Dec '16

28 Dec '16

On Dez 28 2016, Timur Tabi <timur(a)tabi.org> wrote: > Andreas Schwab wrote: >>> > + return !!(ssi_private->dai_fmt & SND_SOC_DAIFMT_AC97) == >>> > + SND_SOC_DAIFMT_AC97; >> This is never true. > > I think the right parenthesis should be at the end of the expression. That would still test the wrong bitfield. And all that is obsolete anyway since commit 5b64c173cd (of Sep 2015). Andreas. -- Andreas Schwab, schwab(a)linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."

1 0

[alsa-devel] [PATCH] alsactl: Remove standard output definition in systemd unit
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Tue, 8 Jul 2014 07:23:06 +0000 `/lib/systemd/system/alsa-restore.service` specifies `StandardOutput=syslog`. This overrides the `DefaultStandardOutput` setting from `/etc/systemd/system.conf`, which the system administrator can use to specify how output gets logged. In particular, the sysadmin may want output to go to the journal, or to syslog, or nowhere at all [1]. This patch removes the definition entirely, so the units can use the system default. Upstream the patch from the Debian package [2]. [1] https://bugs.debian.org/741123 "systemd services should not use StandardOutput=syslog; should rely on DefaultStandardOutput" [2] https://sources.debian.net/src/alsa-utils/1.1.2-1/debian/patches/systemd_st… Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> CC: Jordi Mallach <jordi(a)debian.org> --- alsactl/alsa-restore.service.in | 1 - 1 file changed, 1 deletion(-) diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index f3cd86b..c092c2f 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -15,4 +15,3 @@ Type=oneshot RemainAfterExit=true ExecStart=-@sbindir@/alsactl restore ExecStop=-@sbindir@/alsactl store -StandardOutput=syslog -- 2.11.0

2 1

[alsa-devel] [PATCH] alsactl: Check for state file existence in systemd unit
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Sat, 19 Oct 2013 10:12:19 +0000 Check for the existence of the state file, by default `/var/lib/alsa/asound.state`, before doing anything in the systemd service unit `alsa-restore.service`. If the state file is not present, `alsactl` will fail with exit code 99. Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> CC: Jordi Mallach <jordi(a)debian.org> --- Please apply with `git am saved-messages.mbox`. alsactl/Makefile.am | 1 + alsactl/alsa-restore.service.in | 1 + 2 files changed, 2 insertions(+) diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index cac8094..b691dfa 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -40,6 +40,7 @@ endif edit = \ $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@mydatadir\@,$(mydatadir),g' \ + -e 's,@asoundstatedir\@,$(ASOUND_STATE_DIR),g' \ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ < $< > $@ || rm $@ diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 2884098..f3cd86b 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -7,6 +7,7 @@ Description=Save/Restore Sound Card State ConditionPathExists=!@daemonswitch@ ConditionPathExistsGlob=/dev/snd/control* +ConditionPathExists=@asoundstatedir@/asound.state After=alsa-state.service [Service] -- 2.11.0

2 1

[alsa-devel] [PATCH] alsactl: Make homedir configurable
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Sat, 19 Oct 2013 10:12:19 +0000 Add new configure switch to set alsactl's homedir. This is used to avoid that a directory `.pulse` is created by the init script, when PulseAudio is installed [1]. [1] https://bugs.debian.org/712980 "alsa-utils startup script creates /.pulse files ("Failed to create secure directory") when pulseaudio is installed" CC: Jordi Mallach <jordi(a)debian.org> Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- Please apply with `git am saved-messages.mbox`. alsactl/90-alsa-restore.rules.in | 4 ++-- alsactl/Makefile.am | 1 + alsactl/alsa-restore.service.in | 4 ++-- alsactl/alsa-state.service.in | 4 ++-- configure.ac | 6 ++++++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/alsactl/90-alsa-restore.rules.in b/alsactl/90-alsa-restore.rules.in index c0c1b23..95b26c4 100644 --- a/alsactl/90-alsa-restore.rules.in +++ b/alsactl/90-alsa-restore.rules.in @@ -2,7 +2,7 @@ ACTION=="add", SUBSYSTEM=="sound", KERNEL=="controlC*", KERNELS!="card*", TEST== GOTO="alsa_restore_end" LABEL="alsa_restore_go" -TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl restore $attr{device/number}" -TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl nrestore $attr{device/number}" +TEST!="@daemonswitch@", RUN+="@sbindir@/alsactl -E HOME=@alsactlhome@ restore $attr{device/number}" +TEST=="@daemonswitch@", RUN+="@sbindir@/alsactl -E HOME=@alsactlhome@ nrestore $attr{device/number}" LABEL="alsa_restore_end" diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am index cac8094..d03137b 100644 --- a/alsactl/Makefile.am +++ b/alsactl/Makefile.am @@ -40,6 +40,7 @@ endif edit = \ $(SED) -r -e 's,@sbindir\@,$(sbindir),g' \ -e 's,@mydatadir\@,$(mydatadir),g' \ + -e 's,@alsactlhome\@,$(ALSACTL_HOME_DIR),g' \ -e 's,@daemonswitch\@,$(ALSACTL_DAEMONSWITCH),g' \ < $< > $@ || rm $@ diff --git a/alsactl/alsa-restore.service.in b/alsactl/alsa-restore.service.in index 2884098..23dece8 100644 --- a/alsactl/alsa-restore.service.in +++ b/alsactl/alsa-restore.service.in @@ -12,6 +12,6 @@ After=alsa-state.service [Service] Type=oneshot RemainAfterExit=true -ExecStart=-@sbindir@/alsactl restore -ExecStop=-@sbindir@/alsactl store +ExecStart=-@sbindir@/alsactl -E HOME=@alsactlhome@ restore +ExecStop=-@sbindir@/alsactl -E HOME=@alsactlhome@ store StandardOutput=syslog diff --git a/alsactl/alsa-state.service.in b/alsactl/alsa-state.service.in index f1321d6..28e3043 100644 --- a/alsactl/alsa-state.service.in +++ b/alsactl/alsa-state.service.in @@ -10,5 +10,5 @@ After=sysinit.target [Service] Type=simple -ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon -ExecStop=-@sbindir@/alsactl -s kill save_and_quit +ExecStart=-@sbindir@/alsactl -E HOME=@alsactlhome@ -s -n 19 -c rdaemon +ExecStop=-@sbindir@/alsactl -E HOME=@alsactlhome@ -s kill save_and_quit diff --git a/configure.ac b/configure.ac index 69ff2ab..8cbf798 100644 --- a/configure.ac +++ b/configure.ac @@ -409,6 +409,12 @@ AC_ARG_WITH([alsactl-pidfile-dir], [ALSACTL_PIDFILE_DIR="/var/run"]) AC_SUBST(ALSACTL_PIDFILE_DIR) +AC_ARG_WITH([alsactl-home-dir], + AS_HELP_STRING([--with-alsactl-home-dir=DIR], [Directory to use as homedir for alsactl]), + [ALSACTL_HOME_DIR="$withval"], + [ALSACTL_HOME_DIR="/var/run/alsa"]) +AC_SUBST(ALSACTL_HOME_DIR) + AC_ARG_WITH([alsactl-daemonswitch], AS_HELP_STRING([--with-alsactl-daemonswitch=FILE], [File to test for the daemon mode]), [ALSACTL_DAEMONSWITCH="$withval"], -- 2.11.0

2 1

[alsa-devel] [PATCH] alsactl: Fix spelling mistakes
by Paul Menzel 28 Dec '16

28 Dec '16

Date: Sun, 8 May 2016 16:50:23 +0000 Upstream the patch from the Debian package [1]. [1] https://sources.debian.net/src/alsa-utils/1.1.2-1/debian/patches/spellfixes… CC: Elimar Riesebieter <riesebie(a)lxtec.de> Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- The renaming from `ressize` to `resize` might not be correct, if it’s the size of the variable *res*. Please tell me, if I should remove that. alsactl/alsactl.c | 2 +- alsactl/init_parse.c | 10 +++++----- alsactl/init_utils_run.c | 14 +++++++------- alsactl/state.c | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c index bcbc187..f0060e9 100644 --- a/alsactl/alsactl.c +++ b/alsactl/alsactl.c @@ -90,7 +90,7 @@ static struct arg args[] = { { FILEARG | 'e', "pid-file", "pathname for the process id (daemon mode)" }, { HEADER, NULL, "Available init options:" }, { ENVARG | 'E', "env", "set environment variable for init phase (NAME=VALUE)" }, -{ FILEARG | 'i', "initfile", "main configuation file for init phase" }, +{ FILEARG | 'i', "initfile", "main configuration file for init phase" }, { 0, NULL, " (default " DATADIR "/init/00main)" }, { 'b', "background", "run daemon in background" }, { 's', "syslog", "use syslog for messages" }, diff --git a/alsactl/init_parse.c b/alsactl/init_parse.c index e81174f..f2a598c 100644 --- a/alsactl/init_parse.c +++ b/alsactl/init_parse.c @@ -939,7 +939,7 @@ static int get_key(char **line, char **key, enum key_op *op, char **value) } /* extract possible KEY{attr} */ -static char *get_key_attribute(struct space *space, char *str, char *res, size_t ressize) +static char *get_key_attribute(struct space *space, char *str, char *res, size_t resize) { char *pos; char *attr; @@ -953,7 +953,7 @@ static char *get_key_attribute(struct space *space, char *str, char *res, size_t return NULL; } pos[0] = '\0'; - strlcpy(res, attr, ressize); + strlcpy(res, attr, resize); pos[0] = '}'; dbg("attribute='%s'", res); return res; @@ -1209,7 +1209,7 @@ found: /* possibly truncate to format-char specified length */ if (len != -1) { head[len] = '\0'; - dbg("truncate to %i chars, subtitution string becomes '%s'", len, head); + dbg("truncate to %i chars, substitution string becomes '%s'", len, head); } strlcat(string, temp, maxsize); } @@ -1242,7 +1242,7 @@ found: static int run_program1(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log) + size_t resize, size_t *reslen, int log) { if (strncmp(command0, "__ctl_search", 12) == 0) { const char *res = elemid_get(space, "do_search"); @@ -1254,7 +1254,7 @@ int run_program1(struct space *space, const char *res = elemid_get(space, "do_count"); if (res == NULL || strcmp(res, "0") == 0) return EXIT_FAILURE; - strlcpy(result, res, ressize); + strlcpy(result, res, resize); return EXIT_SUCCESS; } Perror(space, "unknown buildin command '%s'", command0); diff --git a/alsactl/init_utils_run.c b/alsactl/init_utils_run.c index dde490b..ffa0e23 100644 --- a/alsactl/init_utils_run.c +++ b/alsactl/init_utils_run.c @@ -24,12 +24,12 @@ static int run_program1(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log); + size_t resize, size_t *reslen, int log); static int run_program0(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log) + size_t resize, size_t *reslen, int log) { int retval = 0; int status; @@ -175,11 +175,11 @@ int run_program0(struct space *space, /* store result for rule processing */ if (result) { - if (respos + count < ressize) { + if (respos + count < resize) { memcpy(&result[respos], inbuf, count); respos += count; } else { - Perror(space, "ressize %ld too short", (long)ressize); + Perror(space, "resize %ld too short", (long)resize); retval = -1; } } @@ -239,9 +239,9 @@ int run_program0(struct space *space, static int run_program(struct space *space, const char *command0, char *result, - size_t ressize, size_t *reslen, int log) + size_t resize, size_t *reslen, int log) { if (command0[0] == '_' && command0[1] == '_') - return run_program1(space, command0, result, ressize, reslen, log); - return run_program0(space, command0, result, ressize, reslen, log); + return run_program1(space, command0, result, resize, reslen, log); + return run_program0(space, command0, result, resize, reslen, log); } diff --git a/alsactl/state.c b/alsactl/state.c index 3908ec4..d2d6dac 100644 --- a/alsactl/state.c +++ b/alsactl/state.c @@ -1160,7 +1160,7 @@ static int restore_config_value(snd_ctl_t *handle, snd_ctl_elem_info_t *info, case SND_CTL_ELEM_TYPE_IEC958: break; default: - cerror(doit, "Unknow control type: %d", type); + cerror(doit, "Unknown control type: %d", type); return -EINVAL; } return 0; -- 2.11.0

3 2

[alsa-devel] [PATCH] ucm: parser needs limits.h
by Gustavo Zacarias 28 Dec '16

28 Dec '16

It's using PATH_MAX which is defined there, otherwise the build fails on musl libc. Signed-off-by: Gustavo Zacarias <gustavo(a)zacarias.com.ar> --- src/ucm/parser.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ucm/parser.c b/src/ucm/parser.c index c98373a..f520abc 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -32,6 +32,7 @@ #include "ucm_local.h" #include <dirent.h> +#include <limits.h> /** The name of the environment variable containing the UCM directory */ #define ALSA_CONFIG_UCM_VAR "ALSA_CONFIG_UCM" -- 2.10.2

2 1

[alsa-devel] [PATCH - alsa-lib 1/1] conf/cards: add support for pistachio-card.
by manohar.narkhede＠imgtec.com 28 Dec '16

28 Dec '16

From: Manohar Narkhede <Manohar.Narkhede(a)imgtec.com> Signed-off-by: Manohar Narkhede <Manohar.Narkhede(a)imgtec.com> diff --git a/src/conf/cards/Makefile.am b/src/conf/cards/Makefile.am index 008d399..60b5309 100644 --- a/src/conf/cards/Makefile.am +++ b/src/conf/cards/Makefile.am @@ -39,6 +39,7 @@ cfg_files = aliases.conf \ Maestro3.conf \ NFORCE.conf \ PC-Speaker.conf \ + pistachio-card.conf \ PMac.conf \ PMacToonie.conf \ PS3.conf \ diff --git a/src/conf/cards/aliases.conf b/src/conf/cards/aliases.conf index 4a92fb2..60f9d26 100644 --- a/src/conf/cards/aliases.conf +++ b/src/conf/cards/aliases.conf @@ -55,6 +55,7 @@ AV100 cards.CMI8788 AV200 cards.CMI8788 CMI8786 cards.CMI8788 CMI8787 cards.CMI8788 +pistachio cards.pistachio-card <confdir:pcm/default.conf> <confdir:pcm/dmix.conf> diff --git a/src/conf/cards/pistachio-card.conf b/src/conf/cards/pistachio-card.conf new file mode 100644 index 0000000..9c0318d --- /dev/null +++ b/src/conf/cards/pistachio-card.conf @@ -0,0 +1,34 @@ +# +# Configuration for the pistachio chip +# + +pistachio-card.pcm.default{ + @args [ CARD ] + @args.CARD { + type string + default "pistachio" + } + @args.DEVICE { + type integer + default 2 + } + + type asym + capture.pcm { + type multi + slaves.a.pcm "hw:0,4" + slaves.a.channels 12 + bindings.0.slave a + bindings.0.channel 4 + bindings.1.slave a + bindings.1.channel 5 + } + + playback.pcm { + type hw + card $CARD + device $DEVICE + + } + +} -- 2.1.0

3 3

[alsa-devel] [PATCH 2/2] ucm: Add ATTRIBUTE_UNUSED for unused parameters of execute_component_seq()
by mengdong.lin＠linux.intel.com 28 Dec '16

28 Dec '16

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> To fix the following warnings: main.c: In function ‘execute_component_seq’: main.c:489:24: warning: unused parameter ‘value_list1’ [-Wunused-parameter] struct list_head *value_list1, ^ main.c:490:24: warning: unused parameter ‘value_list2’ [-Wunused-parameter] struct list_head *value_list2, ^ main.c:491:24: warning: unused parameter ‘value_list3’ [-Wunused-parameter] struct list_head *value_list3, ^ Signed-off-by: Mengdong Lin <mengdong.lin(a)linux.intel.com> diff --git a/src/ucm/main.c b/src/ucm/main.c index 750e65d..38a5e81 100644 --- a/src/ucm/main.c +++ b/src/ucm/main.c @@ -486,9 +486,9 @@ static int execute_sequence(snd_use_case_mgr_t *uc_mgr, */ static int execute_component_seq(snd_use_case_mgr_t *uc_mgr, struct component_sequence *cmpt_seq, - struct list_head *value_list1, - struct list_head *value_list2, - struct list_head *value_list3, + struct list_head *value_list1 ATTRIBUTE_UNUSED, + struct list_head *value_list2 ATTRIBUTE_UNUSED, + struct list_head *value_list3 ATTRIBUTE_UNUSED, char *cdev) { struct use_case_device *device = cmpt_seq->device; -- 2.7.4

2 1