From nobody Tue Mar 31 09:55:14 2026 X-Original-To: dev-commits-src-branches@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 4flNlQ5kj9z6WcTm for ; Tue, 31 Mar 2026 09:55:14 +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 4flNlQ2pkcz3kV5 for ; Tue, 31 Mar 2026 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774950914; 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=D8ArgG4rHpLjQEhxtFWK5nxrU5fhU9GYaPO7wsjw+Jw=; b=WAP4uVAx+BszD0b4wN40kD7sMYLRI6xXS4O8He7ybhYpJo86Z7tnPTMTOHDMak3vngGI83 DraeoC0hRSl2SiVqTxajsxyr6YPDxFahNj6hAJVa7B74Dec7Sti58HZroi93tHuoLPngZf oPSWjaJv+m6vlmTFJiXjcRDdScs8Y6esVvW51wEz+Rk+ahrXcZxYDm8UQmv7PoMpnjJWxf lsfDSLKUQJGD6BLz5ZI8lZzXf0QBW4FINW7ago3eE/6bf6CbJxkpILYJspwPD9xpPfD5aX zIMJGXgH7DAZoHxBxzGRTsB70BR0lqaQe/oIE/2UhPOJ/E8NUCFYVDH2d699Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774950914; a=rsa-sha256; cv=none; b=ekqXUcP2+Tc3qoTGjhAeoP3mH0aCqA+D9J294IL+vMjOX22FJGbWIK7Rush4Psp8yXBrDj ZIiw53StHyboi2mphH1/+v2RDnxHrONKlK0JYX3s06j079IQlTj74No196nu29myxhZuxY szcfRVM9GD6znSP1dnUHKyd9ind4+MXDcZbrM9uMDEMH5VWUDzDYkKWKY2v2oXyQk00FdS 0/XzrkwGwofx4msZy7UuRAYjrpMERbvby11C/P90IDLQn/KrePKzeu1ZpESk27jpgwFzPQ RLV9/+pWWkToXmwnaq65vly52gD0O+tdnztEu412lQpajipwmXD+pig6f5ZOTQ== 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=1774950914; 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=D8ArgG4rHpLjQEhxtFWK5nxrU5fhU9GYaPO7wsjw+Jw=; b=m6VdLlCT+B6BVB2fjZ88+qs68IDPRYROtebyf89UFaTW/gBoX8eU94KcOJBiqhJtSuI6rt hQQPMBE3wii2fGgTNT3J60W5jtRlDTOIF+uM/WWo3PkDMpqEoR/60evVHTs2wmrMKY5gDB 1liCvxWAo7R8zTg3uxEOTZtHtsg2PdEzlb1yMFgaKF2eCgXIZPQzr0hx4STNpLksrrVzW3 rMX7pGMEP910kNLk9IH44uYQFtD7A6qzf295VGxMQycdopS/9/bcP/lS9W6K3P9MvWvzX9 sC1ieopiCAuVhFkbl992fBOO9Q5HeVElXpwSJko1IbaVdOWq3k/FKC6/yoWjdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4flNlQ25w3z8K6 for ; Tue, 31 Mar 2026 09:55:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b1dd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 31 Mar 2026 09:55:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 02c9c1a2a611 - stable/15 - sound: Remove most Z_RATE_* aliases List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: 02c9c1a2a611d42ffca007175aaa0fb8096b0940 Auto-Submitted: auto-generated Date: Tue, 31 Mar 2026 09:55:14 +0000 Message-Id: <69cb9a02.3b1dd.af63169@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=02c9c1a2a611d42ffca007175aaa0fb8096b0940 commit 02c9c1a2a611d42ffca007175aaa0fb8096b0940 Author: Christos Margiolis AuthorDate: 2026-03-24 10:32:17 +0000 Commit: Christos Margiolis CommitDate: 2026-03-31 09:54:44 +0000 sound: Remove most Z_RATE_* aliases They introduce an extra level of abstraction for no reason at all. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D56041 (cherry picked from commit 0ee95151931688e3d321ea7fb13e037b211a40ba) --- sys/dev/sound/pcm/feeder_rate.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 03bdbbc789bd..8c69f0b4f3c2 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -89,17 +89,6 @@ #define Z_RATE_DEFAULT 48000 -#define Z_RATE_MIN FEEDRATE_RATEMIN -#define Z_RATE_MAX FEEDRATE_RATEMAX -#define Z_ROUNDHZ FEEDRATE_ROUNDHZ -#define Z_ROUNDHZ_MIN FEEDRATE_ROUNDHZ_MIN -#define Z_ROUNDHZ_MAX FEEDRATE_ROUNDHZ_MAX - -#define Z_RATE_SRC FEEDRATE_SRC -#define Z_RATE_DST FEEDRATE_DST -#define Z_RATE_QUALITY FEEDRATE_QUALITY -#define Z_RATE_CHANNELS FEEDRATE_CHANNELS - #define Z_PARANOID 1 #ifdef _KERNEL @@ -149,9 +138,9 @@ struct z_info { z_resampler_t z_resample; }; -int feeder_rate_min = Z_RATE_MIN; -int feeder_rate_max = Z_RATE_MAX; -int feeder_rate_round = Z_ROUNDHZ; +int feeder_rate_min = FEEDRATE_RATEMIN; +int feeder_rate_max = FEEDRATE_RATEMAX; +int feeder_rate_round = FEEDRATE_ROUNDHZ; int feeder_rate_quality = Z_QUALITY_DEFAULT; static int feeder_rate_polyphase_max = Z_POLYPHASE_MAX; @@ -220,10 +209,10 @@ sysctl_hw_snd_feeder_rate_round(SYSCTL_HANDLER_ARGS) if (err != 0 || req->newptr == NULL || val == feeder_rate_round) return (err); - if (val < Z_ROUNDHZ_MIN || val > Z_ROUNDHZ_MAX) + if (val < FEEDRATE_ROUNDHZ_MIN || val > FEEDRATE_ROUNDHZ_MAX) return (EINVAL); - feeder_rate_round = val - (val % Z_ROUNDHZ); + feeder_rate_round = val - (val % FEEDRATE_ROUNDHZ); return (0); } @@ -1408,21 +1397,21 @@ z_resampler_set(struct pcm_feeder *f, int what, int32_t value) info = f->data; switch (what) { - case Z_RATE_SRC: + case FEEDRATE_SRC: if (value < feeder_rate_min || value > feeder_rate_max) return (E2BIG); if (value == info->rsrc) return (0); info->rsrc = value; break; - case Z_RATE_DST: + case FEEDRATE_DST: if (value < feeder_rate_min || value > feeder_rate_max) return (E2BIG); if (value == info->rdst) return (0); info->rdst = value; break; - case Z_RATE_QUALITY: + case FEEDRATE_QUALITY: if (value < Z_QUALITY_MIN || value > Z_QUALITY_MAX) return (EINVAL); if (value == info->quality) @@ -1439,7 +1428,7 @@ z_resampler_set(struct pcm_feeder *f, int what, int32_t value) return (0); info->quality = oquality; break; - case Z_RATE_CHANNELS: + case FEEDRATE_CHANNELS: if (value < SND_CHN_MIN || value > SND_CHN_MAX) return (EINVAL); if (value == info->channels) @@ -1461,13 +1450,13 @@ z_resampler_get(struct pcm_feeder *f, int what) info = f->data; switch (what) { - case Z_RATE_SRC: + case FEEDRATE_SRC: return (info->rsrc); - case Z_RATE_DST: + case FEEDRATE_DST: return (info->rdst); - case Z_RATE_QUALITY: + case FEEDRATE_QUALITY: return (info->quality); - case Z_RATE_CHANNELS: + case FEEDRATE_CHANNELS: return (info->channels); }