From nobody Tue Nov 18 00:52:14 2025 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 4d9R0G4KhSz6HH9M; Tue, 18 Nov 2025 00:52: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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9R0G1k4Dz3ypN; Tue, 18 Nov 2025 00:52:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427134; 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=35Ilraxo4BouqET7df6zHxiYnxqHJr3pD9vj6iEM8Xk=; b=nE7fq0Rs8UFaBkGlTArLRMdjWUxxMnPZJ/U0+E5Z/pHzNHXdeaoQR6/CGNd+kAgHrvlvwW m0ndPO8Jig2XlvmCpPatplAE7H6AxJYc8n3po5z59gjn1YGS4vxnawRkJD4KnQ6suGSsxA GIzz3sgTCkF7MkFEWa/YytyEAWoDiA77FRw8h1tupdapTxQwRkR+1W5vvDGeCjrxZKOBn0 YpidkPn3V+bcghUsD7hSdCHQpwMmGm9FVvRdpybK8wzQi7DUc65i/VTuoFzCMq+vHoxqkj G/WqYfJ6/oSRPWZ3+WRfq2FJJg4wwSANcWf1/+yuuoOd9H7b9ZJkNGUCFj3Veg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763427134; 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=35Ilraxo4BouqET7df6zHxiYnxqHJr3pD9vj6iEM8Xk=; b=R5EPLcau1hrucAenmfHpHPioDMiSj1o7forLuiRE5BL3MSAUOsRrC//2ZgNRCzkFyRHwJT 0fHGSx7/AA333tPh1aHEbLTkAKwzXoiWTKjkZo4GdcuIR4mDgTpCB5S1RUtlJ9S6Weoddz JI1cYMLfRjICAPhTyyZY8y0RxZDkqd7TG8CIf+6ttnbk/xc4311n2NAPY5on2qKDHgeieY qRf6suL1hxyAcjyLjAN6E6k0+tA34a1rcw3qp2LJzP9TwWhq7b+sAa3R37kCH8UlMjj0nC FBVVGZvR8FIZSeCTLzgAR+xIUEXze4/CXiUKIxGVnwQ6o1CDPo8mxqzRruEBJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763427134; a=rsa-sha256; cv=none; b=LjQquvewODBbJW0Y2/kqw9l/igQG+VdkRMPtOFi3QuaD9JL3nARehvdwZ9xh6D0srl8Cnb MXw4RmHsfkFG9pTRRJ6ChCgtBIyXTdfq1H+KYTLavxLqUJDGGqHdgajC4lrWw5Z5op1eqJ KqB9ydcxXTK5AsU7xY6o7X3FSII/zy5EbsoS1YtdWDto95b8U3Z2GCqkGonrh+STt1lWsY Gx8KcY/3jJKuzOEmAdYK2o9QhzSWgEyEXNUkjnom/BiJrAtj352TIZCNdF0X8QAc21dYqK 2VX/yF2+GeJbMfzDoGFKOOcU7fbQRAazFg6LgnztBhc7Vx3iowFvDtWPaOTXZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d9R0G146CzXdk; Tue, 18 Nov 2025 00:52:14 +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 5AI0qEeF046911; Tue, 18 Nov 2025 00:52:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AI0qEA5046908; Tue, 18 Nov 2025 00:52:14 GMT (envelope-from git) Date: Tue, 18 Nov 2025 00:52:14 GMT Message-Id: <202511180052.5AI0qEA5046908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 8517a76e34b6 - stable/15 - sound: Retire DSP_DEFAULT_SPEED 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: 8517a76e34b642cc11f4f16892e429b9c780bb53 Auto-Submitted: auto-generated The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=8517a76e34b642cc11f4f16892e429b9c780bb53 commit 8517a76e34b642cc11f4f16892e429b9c780bb53 Author: Christos Margiolis AuthorDate: 2025-11-11 12:06:47 +0000 Commit: Christos Margiolis CommitDate: 2025-11-18 00:51:24 +0000 sound: Retire DSP_DEFAULT_SPEED Only a few drivers use this, but this is not really our "default" speed. And even those drivers most likely override that value at some point once CHANNEL_SETSPEED() has been called. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53562 (cherry picked from commit 16ae4c2398c89dcc5c03f1aac72a2fce2a60e724) --- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/es137x.c | 2 +- sys/dev/sound/pci/maestro3.c | 4 ++-- sys/dev/sound/pci/vibes.c | 2 +- sys/dev/sound/pcm/sound.h | 2 -- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 75fbefe27633..a8c3303af74f 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -221,7 +221,7 @@ alschan_init(kobj_t obj, void *devinfo, ch->channel = c; ch->bps = 1; ch->format = SND_FORMAT(AFMT_U8, 1, 0); - ch->speed = DSP_DEFAULT_SPEED; + ch->speed = 8000; ch->buffer = b; snd_mtxunlock(sc->lock); diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index a1356f58b567..28427d449c8d 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -352,7 +352,7 @@ cmichan_init(kobj_t obj, void *devinfo, ch->channel = c; ch->bps = 1; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->buffer = b; ch->dma_active = 0; if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index af2b4da76aba..5b0b229a021b 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -326,7 +326,7 @@ cs4281chan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channe ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->bps = 1; ch->blksz = ch->buffer->bufsize; diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index eb546de81f65..6b2093e16246 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -987,7 +987,7 @@ es1370_init(struct es_info *es) es->escfg = ES_SET_FIXED_RATE(es->escfg, fixed_rate); else { es->escfg = ES_SET_FIXED_RATE(es->escfg, 0); - fixed_rate = DSP_DEFAULT_SPEED; + fixed_rate = 8000; } if (single_pcm) es->escfg = ES_SET_SINGLE_PCM_MIX(es->escfg, 1); diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index ee39f5f3c90d..bad2b4eee1cd 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -437,7 +437,7 @@ m3_pchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel ch->parent = sc; ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; M3_UNLOCK(sc); /* XXX */ if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_pchan_init chn_allocbuf failed\n"); @@ -816,7 +816,7 @@ m3_rchan_init(kobj_t kobj, void *devinfo, struct snd_dbuf *b, struct pcm_channel ch->parent = sc; ch->channel = c; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; M3_UNLOCK(sc); /* XXX */ if (sndbuf_alloc(ch->buffer, sc->parent_dmat, 0, sc->bufsz) != 0) { device_printf(sc->dev, "m3_rchan_init chn_allocbuf failed\n"); diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 6df76306b28f..1b7353464503 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -204,7 +204,7 @@ svchan_init(kobj_t obj, void *devinfo, struct snd_dbuf *b, struct pcm_channel *c } ch->buffer = b; ch->fmt = SND_FORMAT(AFMT_U8, 1, 0); - ch->spd = DSP_DEFAULT_SPEED; + ch->spd = 8000; ch->dma_active = ch->dma_was_active = 0; return ch; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 6bd435d0ea25..19da1a22871a 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -148,8 +148,6 @@ struct snd_mixer; #define RANGE(var, low, high) (var) = \ (((var)<(low))? (low) : ((var)>(high))? (high) : (var)) -#define DSP_DEFAULT_SPEED 8000 - extern int snd_unit; extern int snd_verbose; extern devclass_t pcm_devclass;