June 2019 - Patch - mailman.alsa-project.org

[PATCH - use build platform compiler while cross compilation 1/1] use build compilers in cross compilation setup
by Ding Xiang Fei 29 Jun '19

29 Jun '19

This patch is to make the build script always use the build platform compilers, especially during the cross compilation process, since the Makefile will pick up the cross compilers instead of the compilers on the build machine. Signed-off-by: Ding Xiang Fei <dingxiangfei2009(a)gmail.com> diff --git a/compile b/compile new file mode 120000 index 0000000..349ac66 --- /dev/null +++ b/compile @@ -0,0 +1 @@ +/nix/store/hwcmvzv53jzws5vnaga16l5dmqvslwkz-automake-1.16.1/share/automake-1.16/compile \ No newline at end of file diff --git a/configure.ac b/configure.ac index 368854e..ee0e242 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ AC_PREREQ(2.59) AC_INIT(alsa-firmware, 1.0.29) +AC_CONFIG_MACRO_DIR([m4]) AC_PROG_CC +AC_PROG_CC_FOR_BUILD AC_PROG_INSTALL AC_PROG_LN_S AC_HEADER_STDC diff --git a/echoaudio/Makefile.am b/echoaudio/Makefile.am index 815742f..5ef6086 100644 --- a/echoaudio/Makefile.am +++ b/echoaudio/Makefile.am @@ -74,33 +74,42 @@ hotplugfwdir = hotplugfw_DATA = endif -$(firmware_files): fw_writer - ./fw_writer DSP/LoaderDSP.c loader_dsp.fw - ./fw_writer DSP/Darla20DSP.c darla20_dsp.fw - ./fw_writer DSP/Gina20DSP.c gina20_dsp.fw - ./fw_writer DSP/Layla20DSP.c layla20_dsp.fw - ./fw_writer ASIC/LaylaASIC.c layla20_asic.fw - ./fw_writer DSP/Darla24DSP.c darla24_dsp.fw - ./fw_writer DSP/Gina24DSP.c gina24_301_dsp.fw - ./fw_writer ASIC/Gina24ASIC.c gina24_301_asic.fw - ./fw_writer DSP/Gina24_361DSP.c gina24_361_dsp.fw - ./fw_writer ASIC/Gina24ASIC_361.c gina24_361_asic.fw - ./fw_writer DSP/Layla24DSP.c layla24_dsp.fw - ./fw_writer ASIC/Layla24_1ASIC.c layla24_1_asic.fw - ./fw_writer ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw - ./fw_writer ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw - ./fw_writer DSP/MonaDSP.c mona_301_dsp.fw - ./fw_writer ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw - ./fw_writer ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw - ./fw_writer DSP/Mona361DSP.c mona_361_dsp.fw - ./fw_writer ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw - ./fw_writer ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw - ./fw_writer ASIC/Mona2ASIC.c mona_2_asic.fw - ./fw_writer DSP/MiaDSP.c mia_dsp.fw - ./fw_writer DSP/Echo3gDSP.c echo3g_dsp.fw - ./fw_writer ASIC/3G_ASIC.c 3g_asic.fw - ./fw_writer DSP/IndigoDSP.c indigo_dsp.fw - ./fw_writer DSP/IndigoIODSP.c indigo_io_dsp.fw - ./fw_writer DSP/IndigoIOxDSP.c indigo_iox_dsp.fw - ./fw_writer DSP/IndigoDJDSP.c indigo_dj_dsp.fw - ./fw_writer DSP/IndigoDJxDSP.c indigo_djx_dsp.fw +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) +$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +$(firmware_files): fw_writer$(BUILD_EXEEXT) + ./fw_writer$(BUILD_EXEEXT) DSP/LoaderDSP.c loader_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Darla20DSP.c darla20_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Gina20DSP.c gina20_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Layla20DSP.c layla20_dsp.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/LaylaASIC.c layla20_asic.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Darla24DSP.c darla24_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Gina24DSP.c gina24_301_dsp.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC.c gina24_301_asic.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Gina24_361DSP.c gina24_361_dsp.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Gina24ASIC_361.c gina24_361_asic.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Layla24DSP.c layla24_dsp.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_1ASIC.c layla24_1_asic.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2A_ASIC.c layla24_2A_asic.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Layla24_2S_ASIC.c layla24_2S_asic.fw + ./fw_writer$(BUILD_EXEEXT) DSP/MonaDSP.c mona_301_dsp.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48.c mona_301_1_asic_48.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96.c mona_301_1_asic_96.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Mona361DSP.c mona_361_dsp.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC48_361.c mona_361_1_asic_48.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Mona1ASIC96_361.c mona_361_1_asic_96.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/Mona2ASIC.c mona_2_asic.fw + ./fw_writer$(BUILD_EXEEXT) DSP/MiaDSP.c mia_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/Echo3gDSP.c echo3g_dsp.fw + ./fw_writer$(BUILD_EXEEXT) ASIC/3G_ASIC.c 3g_asic.fw + ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDSP.c indigo_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIODSP.c indigo_io_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/IndigoIOxDSP.c indigo_iox_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJDSP.c indigo_dj_dsp.fw + ./fw_writer$(BUILD_EXEEXT) DSP/IndigoDJxDSP.c indigo_djx_dsp.fw diff --git a/emu/Makefile.am b/emu/Makefile.am index 3a633c0..e5a3017 100644 --- a/emu/Makefile.am +++ b/emu/Makefile.am @@ -22,5 +22,14 @@ hotplugfwdir = hotplugfw_DATA = endif -$(firmware_files): fw_writer - ./fw_writer +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) +$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +$(firmware_files): fw_writer$(BUILD_EXEEXT) + ./fw_writer$(BUILD_EXEEXT) diff --git a/hdsploader/Makefile.am b/hdsploader/Makefile.am index 48802a6..b13245b 100644 --- a/hdsploader/Makefile.am +++ b/hdsploader/Makefile.am @@ -32,5 +32,14 @@ EXTRA_DIST = $(dsp_hex_files:%.bin=%.dat) \ tobin.c CLEANFILES = $(dsp_hex_files) -$(dsp_hex_files): tobin - ./tobin +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(tobin_OBJECTS) : CC=$(CC_FOR_BUILD) +$(tobin_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(tobin_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +tobin$(BUILD_EXEEXT): $(tobin_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +$(dsp_hex_files): tobin$(BUILD_EXEEXT) + ./$< diff --git a/m4/ax_prog_cc_for_build.m4 b/m4/ax_prog_cc_for_build.m4 new file mode 100644 index 0000000..12cb005 --- /dev/null +++ b/m4/ax_prog_cc_for_build.m4 @@ -0,0 +1,125 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PROG_CC_FOR_BUILD +# +# DESCRIPTION +# +# This macro searches for a C compiler that generates native executables, +# that is a C compiler that surely is not a cross-compiler. This can be +# useful if you have to generate source code at compile-time like for +# example GCC does. +# +# The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything +# needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD). +# The value of these variables can be overridden by the user by specifying +# a compiler with an environment variable (like you do for standard CC). +# +# It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object +# file extensions for the build platform, and GCC_FOR_BUILD to `yes' if +# the compiler we found is GCC. All these variables but GCC_FOR_BUILD are +# substituted in the Makefile. +# +# LICENSE +# +# Copyright (c) 2008 Paolo Bonzini <bonzini(a)gnu.org> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 9 + +AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD]) +AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_PROG_CPP])dnl +AC_REQUIRE([AC_EXEEXT])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl + +dnl Use the standard macros, but make them use other variable names +dnl +pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl +pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl +pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl +pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl +pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl +pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl +pushdef([ac_cv_objext], ac_cv_build_objext)dnl +pushdef([ac_exeext], ac_build_exeext)dnl +pushdef([ac_objext], ac_build_objext)dnl +pushdef([CC], CC_FOR_BUILD)dnl +pushdef([CPP], CPP_FOR_BUILD)dnl +pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl +pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl +pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl +pushdef([host], build)dnl +pushdef([host_alias], build_alias)dnl +pushdef([host_cpu], build_cpu)dnl +pushdef([host_vendor], build_vendor)dnl +pushdef([host_os], build_os)dnl +pushdef([ac_cv_host], ac_cv_build)dnl +pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl +pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl +pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl +pushdef([ac_cv_host_os], ac_cv_build_os)dnl +pushdef([ac_cpp], ac_build_cpp)dnl +pushdef([ac_compile], ac_build_compile)dnl +pushdef([ac_link], ac_build_link)dnl + +save_cross_compiling=$cross_compiling +save_ac_tool_prefix=$ac_tool_prefix +cross_compiling=no +ac_tool_prefix= + +AC_PROG_CC +AC_PROG_CPP +AC_EXEEXT + +ac_tool_prefix=$save_ac_tool_prefix +cross_compiling=$save_cross_compiling + +dnl Restore the old definitions +dnl +popdef([ac_link])dnl +popdef([ac_compile])dnl +popdef([ac_cpp])dnl +popdef([ac_cv_host_os])dnl +popdef([ac_cv_host_vendor])dnl +popdef([ac_cv_host_cpu])dnl +popdef([ac_cv_host_alias])dnl +popdef([ac_cv_host])dnl +popdef([host_os])dnl +popdef([host_vendor])dnl +popdef([host_cpu])dnl +popdef([host_alias])dnl +popdef([host])dnl +popdef([LDFLAGS])dnl +popdef([CPPFLAGS])dnl +popdef([CFLAGS])dnl +popdef([CPP])dnl +popdef([CC])dnl +popdef([ac_objext])dnl +popdef([ac_exeext])dnl +popdef([ac_cv_objext])dnl +popdef([ac_cv_exeext])dnl +popdef([ac_cv_prog_cc_g])dnl +popdef([ac_cv_prog_cc_cross])dnl +popdef([ac_cv_prog_cc_works])dnl +popdef([ac_cv_prog_gcc])dnl +popdef([ac_cv_prog_CPP])dnl + +dnl Finally, set Makefile variables +dnl +BUILD_EXEEXT=$ac_build_exeext +BUILD_OBJEXT=$ac_build_objext +AC_SUBST(BUILD_EXEEXT)dnl +AC_SUBST(BUILD_OBJEXT)dnl +AC_SUBST([CFLAGS_FOR_BUILD])dnl +AC_SUBST([CPPFLAGS_FOR_BUILD])dnl +AC_SUBST([LDFLAGS_FOR_BUILD])dnl +]) diff --git a/maestro3/Makefile.am b/maestro3/Makefile.am index 7544f12..0826570 100644 --- a/maestro3/Makefile.am +++ b/maestro3/Makefile.am @@ -17,5 +17,14 @@ hotplugfwdir = hotplugfw_DATA = endif -$(firmware_files): fw_writer - ./fw_writer +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) +$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +$(firmware_files): fw_writer$(BUILD_EXEEXT) + ./fw_writer$(BUILD_EXEEXT) diff --git a/sb16/Makefile.am b/sb16/Makefile.am index 17eead9..58d0032 100644 --- a/sb16/Makefile.am +++ b/sb16/Makefile.am @@ -18,5 +18,14 @@ hotplugfwdir = hotplugfw_DATA = endif -$(firmware_files): fw_writer - ./fw_writer +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) +$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +$(firmware_files): fw_writer$(BUILD_EXEEXT) + ./fw_writer$(BUILD_EXEEXT) diff --git a/vxloader/Makefile.am b/vxloader/Makefile.am index ca21494..adcc204 100644 --- a/vxloader/Makefile.am +++ b/vxloader/Makefile.am @@ -43,5 +43,14 @@ hotplugfwdir = hotplugfw_DATA = endif -%.xlx: %.rbt toxlx - ./toxlx < $< > $@ +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(toxlx_OBJECTS) : CC=$(CC_FOR_BUILD) +$(toxlx_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(toxlx_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +toxlx$(BUILD_EXEEXT): $(toxlx_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +%.xlx: %.rbt toxlx$(BUILD_EXEEXT) + ./toxlx$(BUILD_EXEEXT) < $< > $@ diff --git a/wavefront/Makefile.am b/wavefront/Makefile.am index e8c9fe1..8f67b59 100644 --- a/wavefront/Makefile.am +++ b/wavefront/Makefile.am @@ -17,5 +17,14 @@ hotplugfwdir = hotplugfw_DATA = endif -$(firmware_files): fw_writer - ./fw_writer +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) +$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +$(firmware_files): fw_writer$(BUILD_EXEEXT) + ./fw_writer$(BUILD_EXEEXT) diff --git a/ymfpci/Makefile.am b/ymfpci/Makefile.am index 8795fbc..645b471 100644 --- a/ymfpci/Makefile.am +++ b/ymfpci/Makefile.am @@ -17,5 +17,14 @@ hotplugfwdir = hotplugfw_DATA = endif -$(firmware_files): fw_writer - ./fw_writer +LINK_FOR_BUILD.c = $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(TARGET_ARCH_FOR_BUILD) + +$(fw_writer_OBJECTS) : CC=$(CC_FOR_BUILD) +$(fw_writer_OBJECTS) : CFLAGS=$(CFLAGS_FOR_BUILD) +$(fw_writer_OBJECTS) : CPPFLAGS=$(CPPFLAGS_FOR_BUILD) + +fw_writer$(BUILD_EXEEXT): $(tobin_OBJECTS) + $(LINK_FOR_BUILD.c) $^ $(LOADLIBES_FOR_BUILD) $(LDLIBS_FOR_BUILD) -o $@ + +$(firmware_files): fw_writer$(BUILD_EXEEXT) + ./fw_writer$(BUILD_EXEEXT) -- 2.22.0

1 0

[PATCH] ASoC: Intel: Skylake: Recover BXT FW on DSP boot timeout error
by Pawel Harlozinski 25 Jun '19

25 Jun '19

When DSP boots with timeout error, reinitialize, transfer and boot firmware to recover audio. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek(a)intel.com> --- sound/soc/intel/skylake/bxt-sst.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 440bca7afbf1..a2844bdca1b8 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -455,13 +455,18 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id) /* If core 1 was turned on for booting core 0, turn it off */ skl_dsp_core_power_down(ctx, SKL_DSP_CORE_MASK(1)); if (ret == 0) { - dev_err(ctx->dev, "%s: DSP boot timeout\n", __func__); - dev_err(ctx->dev, "Error code=0x%x: FW status=0x%x\n", + dev_warn(ctx->dev, + "DSP boot timeout: Error code=0x%x: FW status=0x%x\n", sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE), sst_dsp_shim_read(ctx, BXT_ADSP_FW_STATUS)); - dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); - ret = -EIO; - goto err; + + ret = bxt_sst_init_fw(skl->dev, skl); + dev_warn(ctx->dev, "Reload fw status: %d\n", ret); + if (ret < 0) { + dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); + ret = -EIO; + goto err; + } } } -- 2.17.1

1 0

[PATCH] pcm_file: return errno in case of a failed write operation
by Adam Miartus 24 Jun '19

24 Jun '19

allows correct error code propagation for snd_pcm_file_write_bytes caller Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> --- src/pcm/pcm_file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 11d0953..ab47da8 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -402,6 +402,7 @@ static int snd_pcm_file_write_bytes(snd_pcm_t *pcm, size_t bytes) n = cont; err = write(file->fd, file->wbuf + file->file_ptr_bytes, n); if (err < 0) { + err = -errno; SYSERR("%s write failed, file data may be corrupt", file->fname); return err; } -- 2.7.4

1 0

[PATCH 1/2] pcm_file: remove double line
by Adam Miartus 24 Jun '19

24 Jun '19

snd_pcm_file_add_frames called two times by mistake, introduced in 2a800c0c4f259043c9217a4aa6a57afaf9f77477 Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> --- src/pcm/pcm_file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index ca8e0c8..11d0953 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -613,7 +613,6 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc snd_pcm_areas_from_buf(pcm, areas, buffer); snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); __snd_pcm_lock(pcm); - snd_pcm_file_add_frames(pcm, areas, 0, frames); if (snd_pcm_file_add_frames(pcm, areas, 0, frames) < 0) { __snd_pcm_unlock(pcm); return -EPIPE; -- 2.7.4

1 1

[PATCH 0/2] v2 pcm_file propagate write error instead of an assert
by Adam Miartus 12 Jun '19

12 Jun '19

patch possible case whenre file write causes assert in pcm_file plugin, by reporting error to user and printing a message user has a chance to recover error state, or capture correct logs before assert happens, and may have an idea how to recover Adam Miartus (2): pcm_file: do not disrupt playback on output file write fail pcm_file: report write output file error to api user src/pcm/pcm_file.c | 61 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 18 deletions(-) -- 2.7.4

1 2

[PATCH 0/6] alsa-lib: Various portability fixes
by Michael Forney 12 Jun '19

12 Jun '19

Even though alsa-lib doesn't aim for ISO C conformance, hopefully these changes are uncontroversial enough to be considered anyway. Michael Forney (6): Use __func__ instead of __FUNCTION__ List cases in range explicitly Don't return in a void function Make sure parameter qualifiers match between declaration and definition Remove unused empty struct Avoid pointer arithmetic on `void *` aserver/aserver.c | 4 ++-- include/error.h | 8 ++++---- include/local.h | 4 ++-- src/conf.c | 22 ++++++++++++---------- src/pcm/pcm.c | 16 ++++++++-------- src/pcm/pcm_direct.h | 2 -- src/pcm/pcm_hw.c | 2 +- src/pcm/pcm_rate.c | 8 ++++---- src/pcm/pcm_share.c | 4 ++-- 9 files changed, 35 insertions(+), 35 deletions(-) -- 2.20.1

1 6

[PATCH 0/2] pcm_file write file assert case handling
by Adam Miartus 11 Jun '19

11 Jun '19

patched possible case where failed file write can cause assert in pcm_file plugin, by reporting error EPIPE and printing debug message. reporting an error with debug hint message is preferred to assert, user may have a way to recover in upper API level. providing a debug message makes it easier to debug the issue from logs. previously, reaching assert did not provide useful message to API level user. Adam Miartus (2): pcm_file: do not disrupt playback on output file write fail pcm_file: report write output file error to api user src/pcm/pcm_file.c | 63 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 17 deletions(-) -- 2.7.4

3 4

[PATCH] ALSA: usb-audio: Enable .product_name override for Emagic, Unitor 8.
by Stefan Sauer 10 Jun '19

10 Jun '19

>From a41303935608e9a98653d4dff1e10baf1ce07e05 Mon Sep 17 00:00:00 2001 From: Stefan Sauer <ensonic(a)google.com> Date: Mon, 10 Jun 2019 11:26:53 +0200 Subject: [PATCH] ALSA: usb-audio: Enable .product_name override for Emagic Unitor 8. The Emagic Unitor 8 does not provide iManufacturer and iProduct fields in its device descriptor. These fields are used by alsa to make build the device name. Thus uncomment the .product-name in the quirks-table. Without this change the device shows up as 'USB Device 0x86a:0x01'. Output of lsusb and amidi: https://gist.github.com/ensonic/7820a102e91f31575be355da2b6b33bc Signed-off-by: Stefan Sauer <ensonic(a)google.com> --- sound/usb/quirks-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 9e049f60e80e..e918ce346027 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2408,7 +2408,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), USB_DEVICE(0x086a, 0x0001), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "Emagic", - /* .product_name = "Unitor8", */ + .product_name = "Unitor8", .ifnum = 2, .type = QUIRK_MIDI_EMAGIC, .data = & (const struct snd_usb_midi_endpoint_info) { -- 2.21.0

1 0

2023

2022

2021

2020

2019

Patch June 2019