From nobody Fri Jan 9 23:27:55 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 4dnycX04wnz6Mp8T for ; Fri, 09 Jan 2026 23:27:56 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnycW57Qtz3n1r for ; Fri, 09 Jan 2026 23:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001275; 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=Ai67DrN4q4k50bo3HT96CeNJ8Y5A4zU7fxaQ22v6jB4=; b=f/XcRME42XMtnzL7DYQWBftxoj6Q0hk34CUsawaUULLv8BBvjvTTasHuL2zQS/qjuge4lB 5BXEUuvcTGhsyzrEXyYOBGm6yzDa+QfaVbnOHqffcnmPNYOYlpb8gJG/SSRcqujXdzIa7y /ceuY35yvSTb/UNUckwmOmSYlRS1TIpcnwBbRoNOD0cNMxWllyMlTOEFpfLHi4Q23KeZ4O gw1/3CXthALYeOPXUkZyQNFi5kCLdAlVRas/DeBvAMBdiLl/jeem0lX5K8gUQuEpFBlS3v PqB6kmVmje+Rd8vCbI3mVv1IaND91ghxjv51WDvN2SLETZ8hKV2uawpUIuvHbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001275; 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=Ai67DrN4q4k50bo3HT96CeNJ8Y5A4zU7fxaQ22v6jB4=; b=kTg3pTwh+MFwyRDCRt3o7LFJbOsZTOoj0HDT+UZebRDrLSPwr/nkjM/FYhjahoBmMvTrtD HqCj7A9tsiKX7aW9hFd/4c8+FR4ozeUTDw/pM4NpCR+7Dnj+9b0gKz7Ygh9kO3lyXlkx8I BKZ1YUE05CDYTCuisSiD9w7IlBGm7069U+qIyQRvLHAbGwrHprh/3ij7xIxC8BuxRYeXn8 dC4uEprAfOpApy2duQPjxhxLlng7NBXgvqXVkoVgfHdtoT/LDWuxi4z/OmyBfqF+u0OGL0 kx5VIED2qrDbmfbLCdkDRaFNHodCqgkX/AA1dty9hObLamLGgjPYM7ykPtPD8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768001275; a=rsa-sha256; cv=none; b=Z+6rMOCu4+xdXt70edCtsFvdxlhg/Lx4+2/crvMDjbRq3ex++4I6NQkAvtjppDddLCYpB1 TvYrf3prI9AEj2+yg2Z9i5ScejWWYRMz4gFceiUq1SJpodLc8bYYL9gQX5PwcU8dQzAfkE yi3erQTmLrpv53P2ecRP3+0AQ+Q00jqwwusDFA4pOQ8uTloIdpGb0JXNioH7aqpLGoR8fP JBX5g9R8yKXOt/xGryilagzZHCTfsZs+KgkOkKdHgSj/kxvQCr21Obb/Nnty09+Np1UdpN ExnbuoioOLkgKXOSmkWhWLyY4sNFAZEwtxWZohnqHxxN8hndPtMlYlXn0NrXfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dnycW4D3tzD7X for ; Fri, 09 Jan 2026 23:27:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32d96 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 23:27:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 3b9a2db3c2a5 - stable/15 - sound: Move sndstat out of pcm/ 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/15 X-Git-Reftype: branch X-Git-Commit: 3b9a2db3c2a5935c79dc65f75441fcc579ba9ffc Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 23:27:55 +0000 Message-Id: <69618efb.32d96.227680a3@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3b9a2db3c2a5935c79dc65f75441fcc579ba9ffc commit 3b9a2db3c2a5935c79dc65f75441fcc579ba9ffc Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:41 +0000 Commit: Christos Margiolis CommitDate: 2026-01-09 23:27:24 +0000 sound: Move sndstat out of pcm/ Needed by follow-up patches that will add sndstat support for midi/ Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D54140 (cherry picked from commit bafa8c951d8cfaec75e774af03d7ab6fadb448b9) --- sys/dev/sound/pcm/sound.c | 1 + sys/dev/sound/pcm/sound.h | 4 ---- sys/dev/sound/{pcm => }/sndstat.c | 4 +++- sys/dev/sound/sndstat.h | 37 +++++++++++++++++++++++++++++++++++++ sys/modules/sound/sound/Makefile | 3 ++- 5 files changed, 43 insertions(+), 6 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 29dac6b576ae..1e4b2eebdcaa 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 3ba6eb3692ee..de9af6bd5324 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -66,7 +66,6 @@ #include #include #include -#include #include #include #include @@ -167,9 +166,6 @@ void *pcm_getdevinfo(device_t dev); int snd_setup_intr(device_t dev, struct resource *res, int flags, driver_intr_t hand, void *param, void **cookiep); -int sndstat_register(device_t dev, char *str); -int sndstat_unregister(device_t dev); - /* These are the function codes assigned to the children of sound cards. */ enum { SCF_PCM, diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/sndstat.c similarity index 99% rename from sys/dev/sound/pcm/sndstat.c rename to sys/dev/sound/sndstat.c index 8f414e07757d..eee9e0b18108 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/sndstat.c @@ -40,13 +40,15 @@ #endif #include +#include #include #include #include -#include +#include #include #include +#include #include "feeder_if.h" diff --git a/sys/dev/sound/sndstat.h b/sys/dev/sound/sndstat.h new file mode 100644 index 000000000000..d6735f74af31 --- /dev/null +++ b/sys/dev/sound/sndstat.h @@ -0,0 +1,37 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Christos Margiolis + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _SNDSTAT_H_ +#define _SNDSTAT_H_ + +int sndstat_register(device_t dev, char *str); +int sndstat_unregister(device_t dev); + +#endif /* _SNDSTAT_H_ */ diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index f3978e9bd9cc..22884eb5ec71 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -16,8 +16,9 @@ SRCS+= feeder_eq_gen.h feeder_rate_gen.h snd_fxdiv_gen.h SRCS+= mpu_if.h mpufoi_if.h SRCS+= mpu_if.c mpufoi_if.c SRCS+= ac97.c buffer.c channel.c dsp.c -SRCS+= mixer.c sndstat.c sound.c vchan.c +SRCS+= mixer.c sound.c vchan.c SRCS+= midi.c mpu401.c +SRCS+= sndstat.c feeder_eq_gen.h: ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk ${AWK} -f ${SYSDIR}/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > ${.TARGET}