From nobody Wed Jul 8 18:19:50 2026 X-Original-To: dev-commits-src-main@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 4gwRFy6WhLz6kdhN for ; Wed, 08 Jul 2026 18:19:50 +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 4gwRFy3WN4z4HXf for ; Wed, 08 Jul 2026 18:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783534790; 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=HMY2F5LWYvtkARX26EpWtZdB7PgozTIQiPykLeh0iAI=; b=doOVc9Ptb8CXnrRwGNWT2e7pr6yLw0u+AiEzE+JeW1mrumqzKutvVsKGGHxIYdIuoyHod6 lpSkDOBFpvqwZi5EPIXoafVZovBfOxBhpUp8HBpN7hwZFkf6vauLg3Nt5124DE53pu3EPw vxucfAFS1r6X3016ybuUOnPKimhdL1KCNv0KNqdNJQYH5tRGa6zdOMzzpaE05V2RTLqf68 JE0LAPNBpcYryEr9PG3bbIaQNfygQBov5smZig/D6dL6odhl5QbWBjB0THhWbnEE6s7q9G 8wcZd5YMJqO2BYzbGZxXVqeEj+V2pGm2w32c7mOHH4naGb1gZVgHKHFmFQZDlA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783534790; a=rsa-sha256; cv=none; b=MQwZW0mAjWiAtoNdgVdtBd4VymLogFqqr79fjYijrJHxRd9s6D8HFyu62Vo9primajxyqp n4gnoFp4ImzOvEcXxuJ6b36DCd984k8Hag9H6+kEWGmFNcwfGDozOWFI2GsfeBlGJ25wx9 etxs80/y2B3bhDUClMSyK31Lz93gm1B87xJpmhoL68wlXe/kOO3Fxtx+hb5qCti3DGUa+l E7BXOpUfoFJ+TZ8PXyUoh1Ha7HKwxDW0wigoLgSLzZ+/OawF93rBuBcNEyBb/q6IyKyP9f wO+00GGW7kfJ7soTkTmT93SzqL2Xftn8TuVAMs+2KwUIFoZAENwS/eZjsiXEYQ== 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=1783534790; 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=HMY2F5LWYvtkARX26EpWtZdB7PgozTIQiPykLeh0iAI=; b=PCTL9P1+w7ZERoQRhJ66XC0aJFF3M5e+e6BIVgvhOOCFzflQpKAeXhsCIdlkEQpoxxR6Ja xGSeAmhpNh8OLzxQ/1erW2oioBphNO3wPF1Iq9W9Fqu7LXvSCrKgP89J6vBzjpfvL92xfW VJWn9780a9N74/jID3pNmD4hoIj1mjDNCSliWohr2fsvSi6YaUIC3Oj25T8mrxoF+1LLJ9 YBNN5yBwkcqw4rt+1XeYIUvObzyv5zgC5m0EArVb5Qr5lGv3nh/E8nItdbin/3ZtJ369p6 pHxhyYh+Mix1ZypFbOj2mj3EConN9s20kNsAaUoAIxkJ4VjpBNVjV493ZNtG6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gwRFy2MW1zZdB for ; Wed, 08 Jul 2026 18:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b26d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 08 Jul 2026 18:19:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 815dc35b7b5e - main - sound: Pass format and speed as arguments to sndbuf_create() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 815dc35b7b5ed694fc1986d054149e375b8a17bd Auto-Submitted: auto-generated Date: Wed, 08 Jul 2026 18:19:50 +0000 Message-Id: <6a4e94c6.3b26d.558a76c7@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=815dc35b7b5ed694fc1986d054149e375b8a17bd commit 815dc35b7b5ed694fc1986d054149e375b8a17bd Author: Christos Margiolis AuthorDate: 2026-07-08 18:18:49 +0000 Commit: Christos Margiolis CommitDate: 2026-07-08 18:18:49 +0000 sound: Pass format and speed as arguments to sndbuf_create() Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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); /**