From nobody Tue Apr 7 15:44:54 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 4fqr9f3LG9z6YSbH for ; Tue, 07 Apr 2026 15:44: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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fqr9f0fQgz3q01 for ; Tue, 07 Apr 2026 15:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775576694; 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=SrUE6uIKA82OM4rao6w40yI7u8RG1s5XTF8ZDNBWXAc=; b=gEMaJzjy/hC5cFIFfMVNXb2lL7YQ6b8Cmb9J0U/hSza52hUneyRAQmhMxCogiaZbY8SXkS hQsUxZ0WJWBX/Jt7ViVFqEwy/tgZ2DQNuY5+0hqivQYPTjQwxDwkgiVajqEClR4nG0uipp Je6ztA4yF8+Z2zH3LY36q4savg6c4bK+XBWr4TJygJ9opLocRCjUoIKXYlh0r0YJSQbf6Z kSTCtUH+pAeggHX/t4eDzXU5LIMYzcQFkNJkHD47Mqjyq4AQ90iB6zqNrzBOSWUNwePcwG idyOUMLIWo2PtONWYzg6aAR6CyVKmuqazNd9Q7oSRhk+bh1wxpkvL7IZEiumBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775576694; a=rsa-sha256; cv=none; b=Cq96ka8L6/TprdUUxivB7hAizxtBkSnAvgFoFEjUIFwaT9CvfW5uDt9Tl5R039/09KTWkf jqwvSzrv6RoDaE2wtpmo+TSs9zxEDFgKbEBQW3znTEzu4wSwKkQHTxs6rjyujGERsW97AV 31harLgqPCWvTeU4bX2sjQkKCdFCFqK/r9o31vtGDAb+h2RrXag1jx9Jt0PlLiNltTsfYU 21sm++cMKmsdtBzuKBab5rCx1+0Rs7jTNM/PyU9tNv89OKRGzSjEc5l+ChSrxox1qQQ5qX Xnow/rYjQccrmVigr9Z+szDarW3zEO2sX3/bBh9zxS61+DHYz/ZxB1fBMDK7Ww== 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=1775576694; 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=SrUE6uIKA82OM4rao6w40yI7u8RG1s5XTF8ZDNBWXAc=; b=WpzzjKJCZo1G21qucS91q2G8K2peigdpVJbOgu6gcxmW97r4gNtgeoQsVwQAx5gJmXO7gi hr3GUzKS1hltRqlV129WAVP+FDwyXWTunmJD+5+C5x0qj/QHGRQvRjH/b+92dvE3EvNf1E r/0PtQOQKXk0GlAtjVTg/TXvP8vGD4y65LiTtRgw7AWhtDpe0Hu0uGti8OIWuGWFK9Ht8M MnSyGLZnPVMiLQy/6hkbWrBdjxHk6nbNncEyoBfyssVCtzLWu8fvzxmIebe/76UqRYvpQA L3h/C0yS+jZ4bxTexZ/dbm5B+JinmIGJBtj9V2MFp9DDZ16I7dvR07fflySI2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqr9f03kjzmD3 for ; Tue, 07 Apr 2026 15:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4509a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 07 Apr 2026 15:44:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 66a82f5fa471 - main - sound: De-macro array definitions in chn_calclatency() 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 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: 66a82f5fa471b8eda018b7566c3725a6742dfc0c Auto-Submitted: auto-generated Date: Tue, 07 Apr 2026 15:44:54 +0000 Message-Id: <69d52676.4509a.61dd7a0a@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=66a82f5fa471b8eda018b7566c3725a6742dfc0c commit 66a82f5fa471b8eda018b7566c3725a6742dfc0c Author: Christos Margiolis AuthorDate: 2026-04-07 15:44:34 +0000 Commit: Christos Margiolis CommitDate: 2026-04-07 15:44:34 +0000 sound: De-macro array definitions in chn_calclatency() Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D56263 --- sys/dev/sound/pcm/channel.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 9b71d93ac7f9..0b940fe4e843 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1748,19 +1748,6 @@ round_blksz(u_int32_t v, int round) * aggressively through possibly real time programming technique. * */ -#define CHN_LATENCY_PBLKCNT_REF \ - {{1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1}, \ - {1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1}} -#define CHN_LATENCY_PBUFSZ_REF \ - {{7, 9, 12, 13, 14, 15, 15, 15, 15, 15, 16}, \ - {11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 17}} - -#define CHN_LATENCY_RBLKCNT_REF \ - {{9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1}, \ - {9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1}} -#define CHN_LATENCY_RBUFSZ_REF \ - {{14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 16}, \ - {15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 17}} #define CHN_LATENCY_DATA_REF 192000 /* 48khz stereo 16bit ~ 48000 x 2 x 2 */ @@ -1768,14 +1755,22 @@ static int chn_calclatency(int dir, int latency, int bps, u_int32_t datarate, u_int32_t max, int *rblksz, int *rblkcnt) { - static int pblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_PBLKCNT_REF; - static int pbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_PBUFSZ_REF; - static int rblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_RBLKCNT_REF; - static int rbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = - CHN_LATENCY_RBUFSZ_REF; + static int pblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1}, + {1, 2, 3, 4, 5, 5, 4, 3, 2, 1, 1} + }; + static int pbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {7, 9, 12, 13, 14, 15, 15, 15, 15, 15, 16}, + {11, 12, 13, 14, 15, 16, 16, 16, 16, 16, 17} + }; + static int rblkcnts[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1}, + {9, 8, 7, 6, 5, 5, 4, 3, 2, 1, 1} + }; + static int rbufszs[CHN_LATENCY_PROFILE_MAX + 1][CHN_LATENCY_MAX + 1] = { + {14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 16}, + {15, 15, 15, 15, 15, 16, 16, 16, 16, 16, 17} + }; u_int32_t bufsz; int lprofile, blksz, blkcnt;