From nobody Wed Nov 18 10:24:34 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 4jTyQC0myZz71J8N for ; Wed, 18 Nov 2026 10:24:35 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTyQB69L9z4fXX for ; Wed, 18 Nov 2026 10:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794997474; 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=fN678yolnpXdeS4m5qrOE1kg/aox26YxWdN1MRF1hCE=; b=YY3w3j96hRDpXWtkCmrTYH0IDVqU/iUFeTSfrvDSU+ThTQryMewTVFkJpea9b6gVtaARVd Yqk4owNA1LQV2B25vzsszVwwgnOjmJ6hxn23LgZSnMpKF+SXy/id6EUfYdGQECYHFHWG1J RFq5qlYTz9Gqt30X6uukptg3sM957lsAwRDIc3OsVgS25ZeX2TkyFQd5z1LwFMQLuFHUUC RPTDwGS2fA7aH+N/vtFwXB7SmDVKjC7cZiOPtOArGYEaRdtgstfZiXOs2BH84UhubzHgEY DhXRyzCrScmaiPtK5Yiny2VVP7Rr9E5/84JCDoUfJp/T4mS3ahJ7OysFz6yoTg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794997474; b=cBCpw8ftpCNdhzHoxBxicxWs/RFt65MQmvs0AxHznWCiPgw1MPHwI2sHaknv3T0wacwthL W7O3zgt35i1a7HU6t6mAj24AwqmApIrPIsMNI1ta7RiIRie83rcxsF/0fltnw1D/eNPcnF MNs99gTvItfbjGAjCEXfypDeLQIN7NITV2Dl83bIZ8Hhox3LzOa0p3bG9yy4Xg72FJEO4c 4Fx0w8TW87xfZKa2sLsP1T1O7TUd06TkdpVir+nWx4FlMGYtRBZuOwqqGVRy140EPNU/U4 lbu7l6NXuhEaPhWSW36VEy+Xskv1IaV1cn1HxITkmYrvbP7cT4gJQ3VtZGaIkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794997474; 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=fN678yolnpXdeS4m5qrOE1kg/aox26YxWdN1MRF1hCE=; b=YyjVJCfthYl4wDmozCbTmMWjYP7zlFYNY6LXlLnEZ0KpHj8+tLz+dJHbzQiJFyGQFRv5nz FvT3jO3HWTSCaeWk8X93gxd9O2CLE80hJcp5tWaJQym1BNxYMG2x4PyWz9+l27LKA+1Ksj h70HiA17WX+3OSALLA2eeWbxK6AlPgIyvtuGSNjHlJmx3TUDghhy3InmizQxSBK85/Qb8Y 3ZEYws/SoSS1Av1GU2UGnPJXiU+VDGwJ7ab7KKfzUzgSi8lltZZ8NhRgz+9Kk8WdjNZDB+ d8SvGktnfdF13F3m1f5cBg3vth0C+pvYtk0o9gYHdveaIOXqahn2AIz07xLBAg== 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 4jTyQB5CT6z1PDh for ; Wed, 18 Nov 2026 10:24:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 539f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Nov 2026 10:24:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f7571b01f3c1 - main - sound: Move channel teardown functions from sound.c to channel.c List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: f7571b01f3c11bfc2c5bacedea0be01ede100e5e Auto-Submitted: auto-generated Date: Wed, 18 Nov 2026 10:24:34 +0000 Message-Id: <6afd7ce2.539f.6588728e@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f7571b01f3c11bfc2c5bacedea0be01ede100e5e commit f7571b01f3c11bfc2c5bacedea0be01ede100e5e Author: Christos Margiolis AuthorDate: 2026-11-18 10:18:07 +0000 Commit: Christos Margiolis CommitDate: 2026-11-18 10:18:07 +0000 sound: Move channel teardown functions from sound.c to channel.c This was a layering violation. No functional change intended. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D60129 --- sys/dev/sound/pcm/channel.c | 39 +++++++++++++++++++++++++++++- sys/dev/sound/pcm/channel.h | 3 ++- sys/dev/sound/pcm/sound.c | 59 +++++++++------------------------------------ 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index ba9cd75109e4..8e2de264bdd6 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -1334,7 +1334,7 @@ chn_kill(struct pcm_channel *c) free(c, M_DEVBUF); } -void +static void chn_shutdown(struct pcm_channel *c) { CHN_LOCKASSERT(c); @@ -1343,6 +1343,43 @@ chn_shutdown(struct pcm_channel *c) c->flags |= CHN_F_DEAD; } +void +chn_shutdownall(struct snddev_info *d) +{ + struct pcm_channel *c; + + PCM_BUSYASSERT(d); + KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__)); + + CHN_FOREACH(c, d, channels.pcm) { + CHN_LOCK(c); + chn_shutdown(c); + if (c->inprog == 0 && CHN_STOPPED(c)) { + CHN_UNLOCK(c); + continue; + } + if (c->direction == PCMDIR_PLAY) + chn_flush(c); + else + chn_abort(c); + CHN_UNLOCK(c); + } +} + +void +chn_killall(struct snddev_info *d) +{ + struct pcm_channel *c; + + PCM_BUSYASSERT(d); + KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__)); + + while (!CHN_EMPTY(d, channels.pcm)) { + c = CHN_FIRST(d, channels.pcm); + chn_kill(c); + } +} + /* release a locked channel and unlock it */ int chn_release(struct pcm_channel *c) diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h index 30b9ff801605..7f8e9fd26ee3 100644 --- a/sys/dev/sound/pcm/channel.h +++ b/sys/dev/sound/pcm/channel.h @@ -261,7 +261,8 @@ char *chn_mkname(char *buf, size_t len, struct pcm_channel *c); struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent, kobj_class_t cls, int dir, void *devinfo); void chn_kill(struct pcm_channel *c); -void chn_shutdown(struct pcm_channel *c); +void chn_shutdownall(struct snddev_info *d); +void chn_killall(struct snddev_info *d); int chn_release(struct pcm_channel *c); int chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd); int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right, diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 28c1abd2a91d..7e44deab1abf 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -146,52 +146,6 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo) return (err); } -static void -pcm_shutdownchans(struct snddev_info *d) -{ - struct pcm_channel *ch; - - PCM_BUSYASSERT(d); - KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__)); - - CHN_FOREACH(ch, d, channels.pcm) { - CHN_LOCK(ch); - chn_shutdown(ch); - if (ch->inprog == 0 && CHN_STOPPED(ch)) { - CHN_UNLOCK(ch); - continue; - } - if (ch->direction == PCMDIR_PLAY) - chn_flush(ch); - else - chn_abort(ch); - CHN_UNLOCK(ch); - } -} - -static void -pcm_killchans(struct snddev_info *d) -{ - struct pcm_channel *ch; - - PCM_BUSYASSERT(d); - KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__)); - - while (!CHN_EMPTY(d, channels.pcm)) { - ch = CHN_FIRST(d, channels.pcm); - chn_kill(ch); - } - - if (d->p_unr != NULL) - delete_unrhdr(d->p_unr); - if (d->vp_unr != NULL) - delete_unrhdr(d->vp_unr); - if (d->r_unr != NULL) - delete_unrhdr(d->r_unr); - if (d->vr_unr != NULL) - delete_unrhdr(d->vr_unr); -} - static int pcm_best_unit(int old) { @@ -458,7 +412,7 @@ pcm_unregister(device_t dev) PCM_ACQUIRE(d); d->flags &= ~SD_F_REGISTERED; - pcm_shutdownchans(d); + chn_shutdownall(d); PCM_RELEASE(d); /* @@ -469,7 +423,16 @@ pcm_unregister(device_t dev) dsp_destroy_dev(dev); PCM_ACQUIRE(d); - pcm_killchans(d); + chn_killall(d); + + if (d->p_unr != NULL) + delete_unrhdr(d->p_unr); + if (d->vp_unr != NULL) + delete_unrhdr(d->vp_unr); + if (d->r_unr != NULL) + delete_unrhdr(d->r_unr); + if (d->vr_unr != NULL) + delete_unrhdr(d->vr_unr); PCM_RELEASE(d); if (d->play_sysctl_tree != NULL) {