From nobody Sun Jul 06 13:09:10 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 4bZnkv06HGz61RYy; Sun, 06 Jul 2025 13:09:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bZnkt3lmvz448G; Sun, 06 Jul 2025 13:09:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751807350; 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=WYvnoWP58DIGeF38+BqOT/QXPCktkaYB488vPIKgEzs=; b=AnZTc8Jp+M/RYlhe3eN0BisXATjyt5XoEpzyyKYUiWvficsC056cHdnKIaHqCKPSsXM2BJ xqrCW+Mk0xCuOYpe61L8A/KjRfVjQwrRBKNeI5LJ/f3R2Zo7T7rxqXxAsCYGMxjb7LU7tm oE2w+7ae1Lwv4TFuF+JS7ruKCQaD6JPuSRzj+yt2v1J3QiDRuIpoyL0UF62OUC48Y4rFen JqnTUGCuHivTvgJl4dhb3k7AsQjB2l/rfqeHVwbrQcHTvDRR97agrik/dIR5Y6qF/l17he DyHwcKUQpf/FbVYk15TfHwHqj/WRpvJQrDZ1ot+AK4UwZi0X6NXYlRcFcxeAVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751807350; 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=WYvnoWP58DIGeF38+BqOT/QXPCktkaYB488vPIKgEzs=; b=Dmabsq2YoB/VPkAmB0O1bCYk1+7IiupMShmu4AUXHQBBb3app7Xqnpap3tR35ksDQUx45v xbY2nUigIZhMBEGo74ds8LFjYb640/KmkH+TJDWfgypB715guyo5TRfV9PX0FWlMPnTGSf Zm0EWR3gDqgbQDmZ3MeiNqvVbVdMtM165hPtWXQxK0dW0z4LWPzp9XwPqN/3ktYzl/cGTT 2aE87P8Z9egVSwvjkvRUaxNg50Zfn4/RuT5ivA5oxkY9Hrc76Tm0ehDDZ7onFpBj08Mh6f I3VaSciAn7I49fzdGLY8fDCR1B63T/MtNkVUhMxgSe1FGg1pCmgYMWPkX5vZCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751807350; a=rsa-sha256; cv=none; b=s2g8GpjDZheL/wwjipwDUvI9nLi0ZnwxGNBifluaBIB/kJdJlT8hCCEHXTTE5Z6kRjuxQU kbJFAEGMTzWkBRLQmCrMm6sECR6ZgcrVHp5TXpUP+47SmItmHZ45QMcp+4GB6nTqbYvBu0 H6gieE3fpVCwXOVE+YQ8c9WDpnP6zxjgDu5UromzFgolh//3Qyfr9Qq76VDp1CL2+CuoQI nEEwTI/C4DRRlEsw0neiZp3hrZU8iKH1aT6siCyLXwkUuAGB5b6TS6FI7iFAJXeIWhaccW /4Mqe3nJ4nXKZLwJHHMFXMcECV359u6WA7aHUvFWDqst4/6Ew2T3qZkZuJ/ziw== 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 4bZnkt3M2Xz1LTy; Sun, 06 Jul 2025 13:09:10 +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 566D9ATx083409; Sun, 6 Jul 2025 13:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 566D9AF4083406; Sun, 6 Jul 2025 13:09:10 GMT (envelope-from git) Date: Sun, 6 Jul 2025 13:09:10 GMT Message-Id: <202507061309.566D9AF4083406@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: 3ba480f41801 - main - sound: Retire SND_DEV_* 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: 3ba480f4180149da9ec7dc8869df2a51335b66d0 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3ba480f4180149da9ec7dc8869df2a51335b66d0 commit 3ba480f4180149da9ec7dc8869df2a51335b66d0 Author: Christos Margiolis AuthorDate: 2025-07-06 13:08:50 +0000 Commit: Christos Margiolis CommitDate: 2025-07-06 13:08:50 +0000 sound: Retire SND_DEV_* Specifying unit numbers is not needed anymore, and half of those weren't used anymore in the first place. Sponsored by: The FreeBSD Foundation Reviewed by: adrian, markj, emaste Differential Revision: https://reviews.freebsd.org/D50690 --- sys/dev/sound/pcm/mixer.c | 4 ++-- sys/dev/sound/pcm/sndstat.c | 4 ++-- sys/dev/sound/pcm/sound.h | 7 ------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 092af3298f0e..f281dff36248 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -750,8 +750,8 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo) mixer_setrecsrc(m, 0); /* Set default input. */ - pdev = make_dev(&mixer_cdevsw, SND_DEV_CTL, UID_ROOT, GID_WHEEL, 0666, - "mixer%d", unit); + pdev = make_dev(&mixer_cdevsw, 0, UID_ROOT, GID_WHEEL, 0666, "mixer%d", + unit); pdev->si_drv1 = m; snddev->mixer_dev = pdev; diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index a11c6f53f58b..51d0fb3bb686 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -1438,8 +1438,8 @@ static void sndstat_sysinit(void *p) { sx_init(&sndstat_lock, "sndstat lock"); - sndstat_dev = make_dev(&sndstat_cdevsw, SND_DEV_STATUS, - UID_ROOT, GID_WHEEL, 0644, "sndstat"); + sndstat_dev = make_dev(&sndstat_cdevsw, 0, UID_ROOT, GID_WHEEL, 0644, + "sndstat"); } SYSINIT(sndstat_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, sndstat_sysinit, NULL); diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 5256916aaab3..6bd435d0ea25 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -148,13 +148,6 @@ struct snd_mixer; #define RANGE(var, low, high) (var) = \ (((var)<(low))? (low) : ((var)>(high))? (high) : (var)) -enum { - SND_DEV_CTL = 0, /* Control port /dev/mixer */ - SND_DEV_MIDIN, /* Raw midi access */ - SND_DEV_DSP, /* Digitized voice /dev/dsp */ - SND_DEV_STATUS, /* /dev/sndstat */ -}; - #define DSP_DEFAULT_SPEED 8000 extern int snd_unit;