From patchwork Wed Feb 24 10:05:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 12101619 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B1E9C433DB for ; Wed, 24 Feb 2021 10:07:00 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 65A4C64ED1 for ; Wed, 24 Feb 2021 10:06:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65A4C64ED1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id EC8911676; Wed, 24 Feb 2021 11:06:05 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz EC8911676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1614161216; bh=E4CWuuHmPTS+VZ8JcV0Nl28ae2zoDzxCfnvM61EHSz0=; h=From:To:Subject:Date:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=J6ZCcY1cP60rBNlL2B9nD7/WN0QxyDzIACs50PJK3JotkpQzGoBJuH2P5oCpLh+E/ Bui+17RkSUGN/ep2be83URhykCp+uiA+HaTcfZx6kIhEtpP35NfvAlSzdmO6BkISt9 qIbic23MNs7QIP6tuKMrXb7jgMGNeXJ7jhwsXmgo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 76A6DF8016C; Wed, 24 Feb 2021 11:06:05 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3CDE1F8022B; Wed, 24 Feb 2021 11:06:04 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 75982F80159 for ; Wed, 24 Feb 2021 11:05:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 75982F80159 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Hb/yylXm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614161157; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqYNf7sFdh8qp1/+UHpQTi4e/KbQaUusEFZ/0Cmda0I=; b=Hb/yylXmMhsR89ZoXTw0m7eBhw7vJ1Dp7yFoKoaBpUskwlB1pDt8XsvPPK2nxboCsGu81A xOCcHlTL9f4N8TiYC1VM0VVUGGpV1ekG68do7Q6ch/wMAYe0UFLmN1O8IJDMxqylSmBVFW ruCjufQMOVliA8fqli70pVmwfKUB1KM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-367-IQjQA1OlO6acwRz2mVjl7A-1; Wed, 24 Feb 2021 05:05:55 -0500 X-MC-Unique: IQjQA1OlO6acwRz2mVjl7A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C7181935799; Wed, 24 Feb 2021 10:05:54 +0000 (UTC) Received: from x1.localdomain (ovpn-113-243.ams2.redhat.com [10.36.113.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 115355D9D0; Wed, 24 Feb 2021 10:05:52 +0000 (UTC) From: Hans de Goede To: Jaroslav Kysela , alsa-devel@alsa-project.org Subject: [PATCH alsa-lib 1/3] mixer: Unify simple_none: base_len() exception handling Date: Wed, 24 Feb 2021 11:05:49 +0100 Message-Id: <20210224100551.15141-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Hans de Goede X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Unify simple_none: base_len() exception handling: 1. In the "Input Source" and "3D Control" cases the base-name is the same as the full-name and base_len() simply returns strlen(name). Instead of returning 0 when the type is unknown, set the type to CTL_SINGLE and return strlen(name). This allows removing the special case for base_len() returning 0 in simple_event_add(). 2. Move the special handling for "Capture Volume" and "Capture Switch" from simple_event_add() to base_len(), so that we handle all exceptions inside base_len(). Instead of handling some special cases in base_len() and other special cases in simple_event_add(). Signed-off-by: Hans de Goede --- src/mixer/simple_none.c | 43 ++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index e9dc1730..7da7de1e 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -907,11 +907,22 @@ static const struct suf { }; #endif -/* Return base length or 0 on failure */ +/* Return base length */ static int base_len(const char *name, selem_ctl_type_t *type) { const struct suf *p; size_t nlen = strlen(name); + + /* exception: "Capture Volume" and "Capture Switch" */ + if (!strcmp(name, "Capture Volume")) { + *type = CTL_CAPTURE_VOLUME; + return strlen("Capture"); + } + if (!strcmp(name, "Capture Switch")) { + *type = CTL_CAPTURE_SWITCH; + return strlen("Capture"); + } + p = suffixes; while (p->suffix) { size_t slen = strlen(p->suffix); @@ -944,7 +955,9 @@ static int base_len(const char *name, selem_ctl_type_t *type) return strlen(name); } } - return 0; + + *type = CTL_SINGLE; + return strlen(name); } @@ -1605,8 +1618,10 @@ static int simple_add1(snd_mixer_class_t *class, const char *name, static int simple_event_add(snd_mixer_class_t *class, snd_hctl_elem_t *helem) { const char *name = snd_hctl_elem_get_name(helem); + selem_ctl_type_t type; + char ename[128]; size_t len; - selem_ctl_type_t type = CTL_SINGLE; /* to shut up warning */ + if (snd_hctl_elem_get_interface(helem) != SND_CTL_ELEM_IFACE_MIXER) return 0; if (strcmp(name, "Capture Source") == 0) { @@ -1633,22 +1648,14 @@ static int simple_event_add(snd_mixer_class_t *class, snd_hctl_elem_t *helem) } return 0; } + len = base_len(name, &type); - if (len == 0) { - return simple_add1(class, name, helem, CTL_SINGLE, 0); - } else { - char ename[128]; - if (len >= sizeof(ename)) - len = sizeof(ename) - 1; - memcpy(ename, name, len); - ename[len] = 0; - /* exception: Capture Volume and Capture Switch */ - if (type == CTL_GLOBAL_VOLUME && !strcmp(ename, "Capture")) - type = CTL_CAPTURE_VOLUME; - else if (type == CTL_GLOBAL_SWITCH && !strcmp(ename, "Capture")) - type = CTL_CAPTURE_SWITCH; - return simple_add1(class, ename, helem, type, 0); - } + if (len >= sizeof(ename)) + len = sizeof(ename) - 1; + memcpy(ename, name, len); + ename[len] = 0; + + return simple_add1(class, ename, helem, type, 0); } static int simple_event_remove(snd_hctl_elem_t *helem, From patchwork Wed Feb 24 10:05:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 12101621 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B1AEC433E0 for ; Wed, 24 Feb 2021 10:07:49 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A674164EC3 for ; Wed, 24 Feb 2021 10:07:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A674164EC3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id D1AD91684; Wed, 24 Feb 2021 11:06:56 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz D1AD91684 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1614161266; bh=r1d1SFbLadvmoNzMdx50IJS7usJkBWvkj81VivA9BKE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=JzQAFPn0nOBuuCPrlnaXU1wnejRm1+nhGDhg3Tra97//kfa10JOil21jco1Rjq5t6 /mUN4LQWIcv15EW6e1d6ht/dUy1QeHjFhY3tk1zo5W/AvFrGs6MRoo2U8xcuBJNbpK YtZ3rsuSHW0Zdv6jARYf00jRJpfr8LCULp5uSfJM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 5208AF80129; Wed, 24 Feb 2021 11:06:13 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 05422F8016C; Wed, 24 Feb 2021 11:06:04 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 40B72F80129 for ; Wed, 24 Feb 2021 11:06:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 40B72F80129 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Np3qh10b" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614161160; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bbQoqNtkB2ZH0cWvNq9ipZPSrKT0JOS3TmG+KK0si3Y=; b=Np3qh10bxebtXlSVgFmfwYXf5s/h0xCkqaZogT2o6pC6Ol0pJZalttdWArk66nOMtbhcWX zhhmroIPNfzweTQX4xBKwaejiGARM1Y7iE0kjne0/s1ko2tFX7fwAiFNPcpN8BcL9RbkVP WhZ/OQo7bjgVAVt86p0vMcGB9K6HrgM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-476-sZ-nBWitPBS36ZI80jip9A-1; Wed, 24 Feb 2021 05:05:56 -0500 X-MC-Unique: sZ-nBWitPBS36ZI80jip9A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7CA02193579C; Wed, 24 Feb 2021 10:05:55 +0000 (UTC) Received: from x1.localdomain (ovpn-113-243.ams2.redhat.com [10.36.113.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id AB9E95D9D3; Wed, 24 Feb 2021 10:05:54 +0000 (UTC) From: Hans de Goede To: Jaroslav Kysela , alsa-devel@alsa-project.org Subject: [PATCH alsa-lib 2/3] mixer: Add exception for non " Volume" suffixed capture vol-ctls used in ASoC realtek codec drivers Date: Wed, 24 Feb 2021 11:05:50 +0100 Message-Id: <20210224100551.15141-2-hdegoede@redhat.com> In-Reply-To: <20210224100551.15141-1-hdegoede@redhat.com> References: <20210224100551.15141-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Hans de Goede X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The following ASoC codec drivers: sound/soc/codecs/rt5640.c sound/soc/codecs/rt5645.c sound/soc/codecs/rt5651.c sound/soc/codecs/rt5677.c Use capture-volume-control names like: "IN1 Boost", note the missing " Volume" suffix. This causes the mixer code to not identify these as volume-controls, which causes some of the dB related sm_elem_ops to return -EINVAL. This in turn causes alsamixer to not show dB info and causes UCM profile HW volume control support in pulseaudio to not work properly due to the lacking dB scale info. This cannot be fixed on the kernel side because the non " Volume" suffixed names are used in UCM profiles currently shipping in alsa-ucm-conf. Add some code to the base_len() function, which is responsbile for getting the control-type to deal with these special cases. Signed-off-by: Hans de Goede --- src/mixer/simple_none.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 7da7de1e..262e3516 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -905,13 +905,29 @@ static const struct suf { {" Volume", CTL_GLOBAL_VOLUME}, {NULL, 0} }; + +/* + * Some kernel drivers use mixer-element names for capture-volumes which + * are not suffixed with " Capture Volume". This cannot be fixed on the + * kernel side because the non-suffixed names are used in UCM profiles, + * so we map these to CTL_CAPTURE_VOLUME based on their full name. + */ +const char * const capture_volume_names[] = { + "ADC Boost Gain", + "IN1 Boost", + "IN2 Boost", + "IN3 Boost", + NULL +}; #endif /* Return base length */ static int base_len(const char *name, selem_ctl_type_t *type) { - const struct suf *p; size_t nlen = strlen(name); + const struct suf *p; + char buf[32]; + int i; /* exception: "Capture Volume" and "Capture Switch" */ if (!strcmp(name, "Capture Volume")) { @@ -923,6 +939,13 @@ static int base_len(const char *name, selem_ctl_type_t *type) return strlen("Capture"); } + for (i = 0; capture_volume_names[i]; i++) { + if (!strcmp(name, capture_volume_names[i])) { + *type = CTL_CAPTURE_VOLUME; + return nlen; + } + } + p = suffixes; while (p->suffix) { size_t slen = strlen(p->suffix); From patchwork Wed Feb 24 10:05:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 12101623 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96626C433E0 for ; Wed, 24 Feb 2021 10:07:53 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EBB0964ED3 for ; Wed, 24 Feb 2021 10:07:52 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EBB0964ED3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 61D6A1688; Wed, 24 Feb 2021 11:07:01 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 61D6A1688 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1614161271; bh=2NT7p0NVgMhor1KO8/DzeO9ElRFnd5xwOX6HBTz9zsI=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Qrf+ZaaG+QXReyUxKPsVYurwp6P1AM+ZcH/HhWRUpdCOy9f1YX7HzNtzkbLti2noT 7XtL/1Y04ZiycfShiBl+nADbrsy1+uBgCZiL5GKHvOsQ6dZHfImJ592ICcPLsX1/hs nJRzAXAQCoqLTeBb63FHMWEjNUnIZfnB+sJVKj/A= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id E5352F8028B; Wed, 24 Feb 2021 11:06:34 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A1C66F80249; Wed, 24 Feb 2021 11:06:06 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 11978F80129 for ; Wed, 24 Feb 2021 11:06:02 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 11978F80129 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="UZ544cyF" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1614161161; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0bTYgtc4Hl30yZ4TyerVO4zFF6aAkGW0u5Hqu3UH8Ag=; b=UZ544cyFcZMon76jsbNJ30kj3teRzTz+YL94WLcsZ5G93jifGuN4wxdhS0njQL2VXRgIpZ 19rXRFsW8uXfuTmkqP878CaU6KWQwgUtdCyNa2USYp8Th6cavto+cgMg4ljGYtnpMlIIRt SnTf+X+YxGjozLvxwFSYdqD5zIlxDFs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-477-w6Cpi0tXMFWpqHZoU9vY8g-1; Wed, 24 Feb 2021 05:05:57 -0500 X-MC-Unique: w6Cpi0tXMFWpqHZoU9vY8g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8EF9E193578F; Wed, 24 Feb 2021 10:05:56 +0000 (UTC) Received: from x1.localdomain (ovpn-113-243.ams2.redhat.com [10.36.113.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id C42F55D9D0; Wed, 24 Feb 2021 10:05:55 +0000 (UTC) From: Hans de Goede To: Jaroslav Kysela , alsa-devel@alsa-project.org Subject: [PATCH alsa-lib 3/3] mixer: Add exception for some capture-vol-ctls which have a " Volume" suffix Date: Wed, 24 Feb 2021 11:05:51 +0100 Message-Id: <20210224100551.15141-3-hdegoede@redhat.com> In-Reply-To: <20210224100551.15141-1-hdegoede@redhat.com> References: <20210224100551.15141-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=hdegoede@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Cc: Hans de Goede X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" The following ASoC codec drivers: sound/soc/codecs/rt5659.c sound/soc/codecs/rt5660.c sound/soc/codecs/rt5665.c sound/soc/codecs/rt5668.c sound/soc/codecs/rt5670.c sound/soc/codecs/rt5682.c Use the following troublesome capture-volume-control names: "IN1 Boost Volume" "IN2 Boost Volume" "IN3 Boost Volume" "STO1 ADC Boost Gain Volume" "STO2 ADC Boost Gain Volume" "Mono ADC Boost Gain Volume" Note how these are suffixed with just " Volume" instead of "Capture Volume" add some special handling for this to the base_len() function, which is responsbile for getting the control-type, so that the type correctly gets set to CTL_CAPTURE_VOLUME instead of CTL_GLOBAL_VOLUME. This correctly makes snd_mixer_selem_has_capture_volume() return true for these (and makes snd_mixer_selem_has_common_volume() return false). Signed-off-by: Hans de Goede --- src/mixer/simple_none.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 262e3516..a20b4315 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -917,6 +917,9 @@ const char * const capture_volume_names[] = { "IN1 Boost", "IN2 Boost", "IN3 Boost", + "Mono ADC Boost Gain", + "STO1 ADC Boost Gain", + "STO2 ADC Boost Gain", NULL }; #endif @@ -944,6 +947,17 @@ static int base_len(const char *name, selem_ctl_type_t *type) *type = CTL_CAPTURE_VOLUME; return nlen; } + + /* + * Sometimes these have a " Volume" suffix instead of a + * " Capture Volume" suffix. Check for this so that we set + * type to CTL_CAPTURE_VOLUME instead of CTL_GLOBAL_VOLUME. + */ + snprintf(buf, sizeof(buf), "%s Volume", capture_volume_names[i]); + if (!strcmp(name, buf)) { + *type = CTL_CAPTURE_VOLUME; + return nlen - strlen(" Volume"); + } } p = suffixes;