From patchwork Sun Mar 7 13:30:02 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: 395166 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=-16.0 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 9006EC433DB for ; Sun, 7 Mar 2021 13:32:20 +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 D17F8650E7 for ; Sun, 7 Mar 2021 13:32:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D17F8650E7 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 7423D1928; Sun, 7 Mar 2021 14:31:28 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 7423D1928 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1615123938; bh=S7IWAbPv5qnh3Ho4oFKppBM3Ltr7CXQAYFjP/7PAjQY=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=Ik2lkEwYHSWYJc9OnGQ2xs9oMfkFG6eNWxTur5Z1doUnC2A74DpN1xiaU1rPFki+B qbu6TTmC761Q03dwxKNhZXLQpylm8YSxIINKAp7XD2kE7WH0JbDfTLGYPRAth99EAi 2fOxBIRcTK2WdVPfOGqLu5X4wxoTt/YUljYyjWP0= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 91C59F8029B; Sun, 7 Mar 2021 14:30:39 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 4A44EF802E7; Sun, 7 Mar 2021 14:30:33 +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 C2F3EF80256 for ; Sun, 7 Mar 2021 14:30:14 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C2F3EF80256 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="g04CdcwB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615123812; 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=i047CKFCjWISjT8RgNvNjcSgYVkSqF6L9d0bgC4eBM0=; b=g04CdcwBAZKRJrSCDAlb6IaAB8ukTZZE72BoY19UUTWdLJKWcBpPwfpKk08cY1e82lBKi6 nmQcI2pyKz3Af7MoopPqj7se/NPzxjr5wMxTFDHhAKS+MBmT7f/nhOaqc2lztEKeP2LR6O c6BHCpzT53GdqNF7ux+SUL4vqm1L4Wo= 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-513-TJgNWWD-NvCp_7PFRoVMuA-1; Sun, 07 Mar 2021 08:30:10 -0500 X-MC-Unique: TJgNWWD-NvCp_7PFRoVMuA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C14DF8143F0; Sun, 7 Mar 2021 13:30:09 +0000 (UTC) Received: from x1.localdomain (ovpn-112-90.ams2.redhat.com [10.36.112.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 020C25C1CF; Sun, 7 Mar 2021 13:30:08 +0000 (UTC) From: Hans de Goede To: Jaroslav Kysela , alsa-devel@alsa-project.org Subject: [PATCH alsa-lib v3 2/5] mixer: simple - Move handling of 3D Control - Depth controls to the exceptions list Date: Sun, 7 Mar 2021 14:30:02 +0100 Message-Id: <20210307133005.30801-3-hdegoede@redhat.com> In-Reply-To: <20210307133005.30801-1-hdegoede@redhat.com> References: <20210307133005.30801-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" Remove the custom handling of 3D Control - Depth control-names, replacing this with adding the 3 full names which are used for such controls to the exceptions list: "3D Control - Depth" "3D Control Sigmatel - Depth" "3D Control Sigmatel - Rear Depth" Signed-off-by: Hans de Goede --- src/mixer/simple_none.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 30d5aa8b..b29554cb 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -922,6 +922,10 @@ static const struct excep { /* Avoid these Capture Volume/Switch controls getting seen as GLOBAL VOL/SW */ {"Capture Volume", 7, CTL_CAPTURE_VOLUME}, {"Capture Switch", 7, CTL_CAPTURE_SWITCH}, + /* Playback Volume/Switch controls without a " Playback ..." suffix */ + {"3D Control - Depth", 18, CTL_PLAYBACK_VOLUME}, + {"3D Control Sigmatel - Depth", 27, CTL_PLAYBACK_VOLUME}, + {"3D Control Sigmatel - Rear Depth", 32, CTL_PLAYBACK_VOLUME}, {NULL,} }; #endif @@ -953,13 +957,6 @@ static int base_len(const char *name, selem_ctl_type_t *type) } } - if (strstr(name, "3D Control")) { - if (strstr(name, "Depth")) { - *type = CTL_PLAYBACK_VOLUME; - return strlen(name); - } - } - *type = CTL_SINGLE; return strlen(name); } From patchwork Sun Mar 7 13:30:04 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: 395165 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=-16.0 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 95BEDC433E0 for ; Sun, 7 Mar 2021 13:33:11 +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 A9480650BD for ; Sun, 7 Mar 2021 13:33:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A9480650BD 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 66A8D1F28; Sun, 7 Mar 2021 14:32:16 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 66A8D1F28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1615123986; bh=p7VWHgR1ITEEX+8LlwQB+9+He2yowwjdKGL0H260rgc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=fqnPp9byYrNovYd1dVfTtQYRjr8XGmpggebdzFyIkyS38py6v7qVzYuRJwN5yS7E7 juC/MEUz/JWRBIAywDutZYqZZRogZXWIUHRi7E1TurMc6Jkp7SNIRT/XOpBsQd2oRr sAHmt5iOp+WYRfX7R/5i3WnO0yQNoN9oZphoCjCc= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 7B12CF8042F; Sun, 7 Mar 2021 14:30:41 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id D28EAF8025A; Sun, 7 Mar 2021 14:30:33 +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 5FD8BF80275 for ; Sun, 7 Mar 2021 14:30:18 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 5FD8BF80275 Authentication-Results: alsa1.perex.cz; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="bSabm9Uu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615123816; 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=j/CX1bmk7VyVvG8DVLSSYlp5BHvTlqOBOy5C6FxS73U=; b=bSabm9UuPJelR9bY1iKZ3BYyJTHKPSoHwWGbeKxzixeVMex5tIXooyR+kMzsqH8tZ+sKNI Lcn3OHL4AAe0iyuib9m643u/89nZOpvb89SRapNMHXblJjCD/9OxkW3tEe9lZ6v2N6Uf70 kiGS9Johqg645VIoITKKV2V4YcbHreU= 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-549-_64VhUY2NDK9J5FWvku3DQ-1; Sun, 07 Mar 2021 08:30:13 -0500 X-MC-Unique: _64VhUY2NDK9J5FWvku3DQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 209578143F0; Sun, 7 Mar 2021 13:30:12 +0000 (UTC) Received: from x1.localdomain (ovpn-112-90.ams2.redhat.com [10.36.112.90]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26BCB5C1CF; Sun, 7 Mar 2021 13:30:11 +0000 (UTC) From: Hans de Goede To: Jaroslav Kysela , alsa-devel@alsa-project.org Subject: [PATCH alsa-lib v3 4/5] mixer: simple - Add exceptions for some capture-vol-ctls which have a " Volume" suffix Date: Sun, 7 Mar 2021 14:30:04 +0100 Message-Id: <20210307133005.30801-5-hdegoede@redhat.com> In-Reply-To: <20210307133005.30801-1-hdegoede@redhat.com> References: <20210307133005.30801-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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" And sound/soc/codecs/es8316.c uses "ADC PGA Gain Volume". Note how these are suffixed with just " Volume" instead of "Capture Volume". Add these to the exceptions table, 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 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c index 8f964959..de81966f 100644 --- a/src/mixer/simple_none.c +++ b/src/mixer/simple_none.c @@ -920,8 +920,15 @@ static const struct excep { */ {"Input Source", 12, CTL_CAPTURE_ROUTE}, /* Avoid these Capture Volume/Switch controls getting seen as GLOBAL VOL/SW */ + {"ADC PGA Gain Volume", 12, CTL_CAPTURE_VOLUME}, {"Capture Volume", 7, CTL_CAPTURE_VOLUME}, {"Capture Switch", 7, CTL_CAPTURE_SWITCH}, + {"IN1 Boost Volume", 9, CTL_CAPTURE_VOLUME}, + {"IN2 Boost Volume", 9, CTL_CAPTURE_VOLUME}, + {"IN3 Boost Volume", 9, CTL_CAPTURE_VOLUME}, + {"Mono ADC Boost Gain Volume", 19, CTL_CAPTURE_VOLUME}, + {"STO1 ADC Boost Gain Volume", 19, CTL_CAPTURE_VOLUME}, + {"STO2 ADC Boost Gain Volume", 19, CTL_CAPTURE_VOLUME}, /* Playback Volume/Switch controls without a " Playback ..." suffix */ {"3D Control - Depth", 18, CTL_PLAYBACK_VOLUME}, {"3D Control Sigmatel - Depth", 27, CTL_PLAYBACK_VOLUME},