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;