From nobody Thu May 29 10:25:25 2025 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 4b7MvV2t0Tz5y3cQ; Thu, 29 May 2025 10:25:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b7MvT5MPFz3xM6; Thu, 29 May 2025 10:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514325; 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=x3WeQJgTBKKZCsG7kajIcjwZKcfS/dW5ctmxX4G1EEo=; b=Gu4zkoQvGXvL2okgG4+/41ACbG58AW9FIraWoJ+ixhyT0rlSB/AxwmJPucMrShREKlQMGF euFCOdJitrM/z/yks6MXb7DBY5mJ2B6A61WalU9tmGV2Y+bOd0Qx3gp2uNUm77wZePojXu qF8a8PBQWMGCitk2iPXk2+jIDH9gAfscmQzNZVzSnKCJ5WI0JzEvaqOxgzlRYJM1tA2U5k xiLGAmh7PcCbnawBjKsK0wSIbssDTq6NfWq0DfK64J3PEakIcR6cHmIeV8+p8TT24zcafE 5Zr1eD+zC0hqEG7RVbgoIo3V8aYF+8HVXFneASYPwy8ksY5xO7WJIVeKBIEKMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748514325; a=rsa-sha256; cv=none; b=AWdvShClQDD6x6ivu7ytTwN8naKG2SMVXYiaGhtqWVATUDz+ACZwbx1CqBiE6trfJDObxO JSdoLvHjizMxi4L67rJxFgOPBcZTgLE9sPHFufyCVe15slvJC4O5+vioWIbf+Bsx6FzcnN uoHoQEaRuo+lLCZzqVF6cKr/04qfCa1x1kfkrGbCtgmybpcY5iVEdRjvNSkFaYsi9Bsi2A d49qRC+8ssI70lhvpMadfrmyQGzZEtFIfh9TUX5waNwnkluGrFmsweM+/aPXwyrdh8HjtE x2xPo41oP10WenlwetHuC+3GnMX4CCUMVWIzL4zm+DRkx3Rjn88AoJH2qMg3FA== 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=1748514325; 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=x3WeQJgTBKKZCsG7kajIcjwZKcfS/dW5ctmxX4G1EEo=; b=K7TLjWrRVCKCDtjZ3o0R4wNVNM8cnjSSs3nSzls7VHgmw3UU3O6xJnDhaueL7uRuV/iQgm EDMcvGlyG5L+fj6TqbKwtJLKDvUIbaogtmWDIoC+KPi9KIkVYJyZQN1LS14tiojgV6K91h Jd37W40NMDjTOYYy54ZrA+CoqrxtZ7Sr7Y6JlRmA5Ga5nHc+RbTebhVie14KLLkjaigc8+ mk1SZl+iibPpTUDxko912WGvgCjE116G/RfcUozihd15zfeOCUvIqiAbjau8VpXXnHK7BC a/bYOM6U9nWIYa2m9ZjXaePP92qnXDV0Bj9rOEd86bh9+0A83YLnntj8fRHK5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b7MvT4Rdzz1HgJ; Thu, 29 May 2025 10:25:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54TAPP21061027; Thu, 29 May 2025 10:25:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TAPPIY061024; Thu, 29 May 2025 10:25:25 GMT (envelope-from git) Date: Thu, 29 May 2025 10:25:25 GMT Message-Id: <202505291025.54TAPPIY061024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: a946852ff296 - main - sound: Merge pcm_sysinit() with pcm_register() 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: a946852ff2963b5ec83cb7ccb5eee214b1d47ad5 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=a946852ff2963b5ec83cb7ccb5eee214b1d47ad5 commit a946852ff2963b5ec83cb7ccb5eee214b1d47ad5 Author: Christos Margiolis AuthorDate: 2025-05-29 10:24:08 +0000 Commit: Christos Margiolis CommitDate: 2025-05-29 10:25:18 +0000 sound: Merge pcm_sysinit() with pcm_register() There is no need for a separate function here. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: adrian, markj Differential Revision: https://reviews.freebsd.org/D50409 --- sys/dev/sound/pcm/sound.c | 67 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 38 deletions(-) diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index e690b53c411d..cb510d526fa8 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -57,8 +57,6 @@ SYSCTL_INT(_hw_snd, OID_AUTO, default_auto, CTLFLAG_RWTUN, SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Sound driver"); -static void pcm_sysinit(device_t); - /** * @brief Unit number allocator for syncgroup IDs */ @@ -351,41 +349,6 @@ sysctl_dev_pcm_mode(SYSCTL_HANDLER_ARGS) return (sysctl_handle_int(oidp, &mode, 0, req)); } -static void -pcm_sysinit(device_t dev) -{ - struct snddev_info *d = device_get_softc(dev); - - sysctl_ctx_init(&d->play_sysctl_ctx); - d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play", - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node"); - sysctl_ctx_init(&d->rec_sysctl_ctx); - d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx, - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec", - CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node"); - - /* XXX: a user should be able to set this with a control tool, the - sysadmin then needs min+max sysctls for this */ - SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), - OID_AUTO, "buffersize", CTLFLAG_RD, &d->bufsz, 0, "allocated buffer size"); - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, - sizeof(d), sysctl_dev_pcm_bitperfect, "I", - "bit-perfect playback/recording (0=disable, 1=enable)"); - SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), - SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, - "mode", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, d, sizeof(d), - sysctl_dev_pcm_mode, "I", - "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " - "one mode is supported)"); - vchan_initsys(dev); - if (d->flags & SD_F_EQ) - feeder_eq_initsys(dev); -} - /* * Basic initialization so that drivers can use pcm_addchan() before * pcm_register(). @@ -455,7 +418,35 @@ pcm_register(device_t dev, char *str) * Create all sysctls once SD_F_REGISTERED is set else * tunable sysctls won't work: */ - pcm_sysinit(dev); + sysctl_ctx_init(&d->play_sysctl_ctx); + d->play_sysctl_tree = SYSCTL_ADD_NODE(&d->play_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "play", + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "playback channels node"); + sysctl_ctx_init(&d->rec_sysctl_ctx); + d->rec_sysctl_tree = SYSCTL_ADD_NODE(&d->rec_sysctl_ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, "rec", + CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "recording channels node"); + + /* XXX: a user should be able to set this with a control tool, the + sysadmin then needs min+max sysctls for this */ + SYSCTL_ADD_UINT(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), + OID_AUTO, "buffersize", CTLFLAG_RD, &d->bufsz, 0, + "allocated buffer size"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "bitperfect", CTLTYPE_INT | CTLFLAG_RWTUN | CTLFLAG_MPSAFE, d, + sizeof(d), sysctl_dev_pcm_bitperfect, "I", + "bit-perfect playback/recording (0=disable, 1=enable)"); + SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev), + SYSCTL_CHILDREN(device_get_sysctl_tree(dev)), OID_AUTO, + "mode", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE, d, sizeof(d), + sysctl_dev_pcm_mode, "I", + "mode (1=mixer, 2=play, 4=rec. The values are OR'ed if more than " + "one mode is supported)"); + vchan_initsys(dev); + if (d->flags & SD_F_EQ) + feeder_eq_initsys(dev); if (snd_unit_auto < 0) snd_unit_auto = (snd_unit < 0) ? 1 : 0;