From nobody Mon Mar 17 18:36:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZGkGG2HY9z5qVch; Mon, 17 Mar 2025 18:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZGkGF6ThJz43Mj; Mon, 17 Mar 2025 18:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5DYAun6evAFJpjXmRl7kS1UiYQx1vyU8DKcb1UVrwQ=; b=ivUzUP59m/khuP8FxeHCx9xoHujx+4DUGPi83Zzr5kbAJT+owZlD5dcqU1ENrZCI6D3bz1 Hym1kVgEPnWGak53mbTU70RTk9sm4MdbW6LViMVW4B2kAIK97zXlksVHFmluAfvZXeZanO p0EWpk77b+IwBDT/cXgSLJwgxRDsnls/kqZpnRuElsbnRTtEYg4gLMqOol3PCrzMPELRan Lm0YfX8OwxeMizlFzlmdE/WD0cY1tCR1Gn5MI6Q7S4oe+R6G6t8tu6z+ab3LM3+K4Y+p6E be+NPcaZckKNhixGgl537KpbLAzwtk+BtmzS2w5ZXqNuAkyL0Y3K8iLsJKl6sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742236614; a=rsa-sha256; cv=none; b=WPDPdanLwPyG/DqvuPekDjKp4lWACFSkePYrhvddpUhH65PURA2+cnhZY4+qZBnfPbfJAN OakuPaawJ0w+7uYtwhh5u6sezvyxjuli/SXPdeSBW0ronFPEsa++lo6EdBJnd8oMzKi60Z yZLohBi+4432t7FjRp3JWTQYyZO3p8RfUVP5cl89rWsjaPnYVu/UGfiuy2MgsCbsKkMM5n 0+L5gZu2WeLyI5EY+jmr5XgUi2m8LRQMjR70ZWLE/x55ntmezVj/tAiew1Ol1qRqkD8Ijl Wzz1qQYyqV96ioJtd5xCgzpbt+xzdRKRs7PgFRhRsrypkk52QEncgiWbYGS1Lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742236614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5DYAun6evAFJpjXmRl7kS1UiYQx1vyU8DKcb1UVrwQ=; b=kv9vRzKh5/K4DrQQcxMV1rQ0TdiYY7cpKXSrVzyxIPFLunhiY38EETjmB2E15aXVYOLQVv RE3gEynjwwyER33BxBFIYI4j8pIybH7Tn69gZd2d0cjjwtU3yt5qEjQNywVKFIE1cyjLe4 w1enzjznQPopD82z+gDhUQzoZw5IleX4lk/PHTm/CsNg1IMhcjs31GGOynbkmc+QGhIMV1 5S9WvNqA6IaBGmpKvYuHcY0gAfzSKRU9QVibgjoBwnaP/XgAQ2QUt0J9BF18M9oC5oK2eX bT0zpVoCeEYwKQ5COybAZO5VjhDWyW8gBAT2wIeWbB9UEyAXOKZBx7XrPJi7fw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZGkGF5Ft6zxyn; Mon, 17 Mar 2025 18:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52HIarxw013262; Mon, 17 Mar 2025 18:36:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52HIarcu013259; Mon, 17 Mar 2025 18:36:53 GMT (envelope-from git) Date: Mon, 17 Mar 2025 18:36:53 GMT Message-Id: <202503171836.52HIarcu013259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 31ddfe9d9cf4 - stable/14 - sound: Retire SD_F_AUTOVCHAN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 31ddfe9d9cf4a7bdd724ffc6c0efe88587759186 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=31ddfe9d9cf4a7bdd724ffc6c0efe88587759186 commit 31ddfe9d9cf4a7bdd724ffc6c0efe88587759186 Author: Christos Margiolis AuthorDate: 2025-03-10 20:47:35 +0000 Commit: Christos Margiolis CommitDate: 2025-03-17 18:29:15 +0000 sound: Retire SD_F_AUTOVCHAN This flag is redundant and essentially a no-op, as it is set when the device supports at least playback or recording, which is almost always the case. But even if the device is mixer-only (i.e., 0 channels), there is no reason to keep this flag; it is only used to bail out of the vchan sysctl handlers, but we already bail out anyway if we try to use the sysctl in a vchan direction that is not supported. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49021 (cherry picked from commit b768f2c7773b6e306fb43687657414f9f42a27d4) --- sys/dev/sound/pcm/sound.c | 7 +------ sys/dev/sound/pcm/sound.h | 4 ++-- sys/dev/sound/pcm/vchan.c | 8 ++++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 9459b207bba0..ac5d11b83ea3 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -242,10 +242,6 @@ pcm_setstatus(device_t dev, char *str) if (d->playcount == 0 || d->reccount == 0) d->flags |= SD_F_SIMPLEX; - - if (d->playcount > 0 || d->reccount > 0) - d->flags |= SD_F_AUTOVCHAN; - if (d->playcount > 0) d->flags |= SD_F_PVCHANS; if (d->reccount > 0) @@ -412,8 +408,7 @@ pcm_sysinit(device_t dev) OID_AUTO, "mode", CTLFLAG_RD, NULL, mode, "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " "one mode is supported)"); - if (d->flags & SD_F_AUTOVCHAN) - vchan_initsys(dev); + vchan_initsys(dev); if (d->flags & SD_F_EQ) feeder_eq_initsys(dev); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 2a5ea4711146..b47d6dfeecf8 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -99,7 +99,7 @@ struct snd_mixer; #define SOUND_MAXVER SOUND_MODVER #define SD_F_SIMPLEX 0x00000001 -#define SD_F_AUTOVCHAN 0x00000002 +/* unused 0x00000002 */ #define SD_F_SOFTPCMVOL 0x00000004 #define SD_F_BUSY 0x00000008 #define SD_F_MPSAFE 0x00000010 @@ -122,7 +122,7 @@ struct snd_mixer; #define SD_F_BITS "\020" \ "\001SIMPLEX" \ - "\002AUTOVCHAN" \ + /* "\002 */ \ "\003SOFTPCMVOL" \ "\004BUSY" \ "\005MPSAFE" \ diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 27739fe68852..2b300e90ea4d 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -260,7 +260,7 @@ sysctl_dev_pcm_vchans(SYSCTL_HANDLER_ARGS) int err, enabled, flag; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d); @@ -318,7 +318,7 @@ sysctl_dev_pcm_vchanmode(SYSCTL_HANDLER_ARGS) char dtype[16]; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d); @@ -409,7 +409,7 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS) int *vchanrate, direction, ret, newspd, restart; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d); @@ -508,7 +508,7 @@ sysctl_dev_pcm_vchanformat(SYSCTL_HANDLER_ARGS) char fmtstr[AFMTSTR_LEN]; d = devclass_get_softc(pcm_devclass, VCHAN_SYSCTL_UNIT(oidp->oid_arg1)); - if (!PCM_REGISTERED(d) || !(d->flags & SD_F_AUTOVCHAN)) + if (!PCM_REGISTERED(d)) return (EINVAL); PCM_LOCK(d);