From nobody Wed Jul 15 08:15:30 2026 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 4h0TWR3zL7z6l5xD for ; Wed, 15 Jul 2026 08:15:31 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h0TWR0PTsz479w for ; Wed, 15 Jul 2026 08:15:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784103331; 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=tj4122MyF6kV9cQEjDVHtYVHaR9qq7OcbFNJSUDya6g=; b=XcT9W5w/Fn/el9lix1WPIW7SqYBow2ViWI3fUv8xUpRbH5xNf2NFatU/oRa+yaftxYJKBA Uxrk0U/sqthKjXqX3FG6J/B+KScz46HcXUIwbX3jr3Hn3ggU4hOFt7pzhRTe7bEGbd5qjS UHd/Zqa/j43SQvgT/ntq3KUy5oU7u7/GF1qO1u/wse5RMCxJ9DLIJlW19XbDjgsiy6k3gu LS1nFxdjrCsahPZp/mIPvOjppZlP3u88OAOIm0UlOmxsqyErnXnj5AJvenlNTVOUHDXQzR N2roYKNacIeW7hjECkrKybil5cvZwuJRlP+jCHtSGbfRp3PE7Y+D+pm6ftPwlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784103331; a=rsa-sha256; cv=none; b=IGLcf9TAkoNEjHEWzjst3DAAh9WFfM04pseza7X45Yj7yvUqUVIy0EjO2Iekc/SsB1Lk4e FPl+ieVAZ5bCyVcdGoXBTygSCmIdrCJPAM5IpLQthgLH9Hi2XaKO0pCaRVtaBEuCU7ok5l PK5c4ARXuXxN5IRk0wPUd1gUj05GJDZVfVu/kVa2zR/1qmQTB1/ZhFzFNQf2XBbMdAdBYm TQpKE1jfnjNYXglSX1LdJaq3n+glURuI2bkTLSgDqKo25vR+KCllfHf2Q+XJyMqC50FFEI V0TZBo1sESpqLI60P5ydTK/YuAn2yiwvJrGezZ6YDZMS3VDBWwygCFfZVnIySQ== 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=1784103331; 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=tj4122MyF6kV9cQEjDVHtYVHaR9qq7OcbFNJSUDya6g=; b=Ep+ji+LFbcIXYRP3PCNvAFhKZErFBN+aekZ2yYXlQgzZKG0qWro2CQFfcb4QW1A3uN8U2F t+BVXtO1bCrqR+WPa5ZYx6u1wLrPSsnfbWtcyDhjk83e/7S8yAvtW7krc/3IyaVnFQ9DyW G7onEERa2kdZuPXOZ5hsNIxC8xeo+NkJYb9f8Y9V1//lnkv8kBW+x7NGky4V6gv1FPYn1k +9ws9vEgz578CoA4xdAWLWlVbkmU12bcDgiExv8SUNUBS6HtxiqzVbCyFClItxz0tPOk9u eFMeyLEwa6axL11+r7iZOgyhjUA4gkdaKIStp6srFz+7AHmiYaEyjU3hTDeTNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h0TWQ6HTrz6s6 for ; Wed, 15 Jul 2026 08:15:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d18f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 15 Jul 2026 08:15:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 896f9ba7d4cc - stable/15 - sound: Pass format and speed as arguments to sndbuf_create() 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/15 X-Git-Reftype: branch X-Git-Commit: 896f9ba7d4cc98ba476cdae425898269d53952dc Auto-Submitted: auto-generated Date: Wed, 15 Jul 2026 08:15:30 +0000 Message-Id: <6a5741a2.3d18f.35edd6d3@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=896f9ba7d4cc98ba476cdae425898269d53952dc commit 896f9ba7d4cc98ba476cdae425898269d53952dc Author: Christos Margiolis AuthorDate: 2026-07-08 18:18:49 +0000 Commit: Christos Margiolis CommitDate: 2026-07-15 08:15:25 +0000 sound: Pass format and speed as arguments to sndbuf_create() Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit 815dc35b7b5ed694fc1986d054149e375b8a17bd) --- sys/dev/sound/pcm/buffer.c | 5 ++++- sys/dev/sound/pcm/buffer.h | 2 +- sys/dev/sound/pcm/channel.c | 8 ++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 86278a46a731..73f75716a198 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -46,7 +46,8 @@ #include "snd_fxdiv_gen.h" struct snd_dbuf * -sndbuf_create(struct pcm_channel *channel, const char *desc) +sndbuf_create(struct pcm_channel *channel, u_int32_t fmt, u_int32_t spd, + const char *desc) { struct snd_dbuf *b; @@ -54,6 +55,8 @@ sndbuf_create(struct pcm_channel *channel, const char *desc) refcount_init(&b->refcount, 1); snprintf(b->name, SNDBUF_NAMELEN, "%s:%s", channel->name, desc); b->channel = channel; + sndbuf_setfmt(b, fmt); + sndbuf_setspd(b, spd); return b; } diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index fee41db2ff82..34f885db6609 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -60,7 +60,7 @@ struct snd_dbuf { char name[SNDBUF_NAMELEN]; }; -struct snd_dbuf *sndbuf_create(struct pcm_channel *channel, const char *desc); +struct snd_dbuf *sndbuf_create(struct pcm_channel *channel, u_int32_t fmt, u_int32_t spd, const char *desc); void sndbuf_destroy(struct snd_dbuf *b); void sndbuf_ref(struct snd_dbuf *b); void sndbuf_rele(struct snd_dbuf *b); diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 40a08d48fb21..ff7620c772c3 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1223,8 +1223,8 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, chn_vpc_reset(c, SND_VOL_C_PCM, 1); CHN_UNLOCK(c); - b = sndbuf_create(c, "primary"); - bs = sndbuf_create(c, "secondary"); + b = sndbuf_create(c, c->format, c->speed, "primary"); + bs = sndbuf_create(c, c->format, c->speed, "secondary"); if (b == NULL || bs == NULL) { device_printf(d->dev, "%s(): failed to create %s buffer\n", __func__, b == NULL ? "hardware" : "software"); @@ -1246,10 +1246,6 @@ chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, goto fail; } - sndbuf_setfmt(b, c->format); - sndbuf_setspd(b, c->speed); - sndbuf_setfmt(bs, c->format); - sndbuf_setspd(bs, c->speed); sndbuf_setup(bs, NULL, 0); /**