From nobody Fri Oct 04 18:49:38 2024
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 4XKyJf5vLGz5YBQp;
Fri, 04 Oct 2024 18:49:38 +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 4XKyJf4WRnz4KtK;
Fri, 4 Oct 2024 18:49:38 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1728067778;
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=syL4c805njtmQhDuI5f5jbsNDEwyBOrQ9hLkIy98n3Q=;
b=uBAXqpTwgTFvfpxVJFhiOf1jKtO+IM5BJhiv5xWyxn2hd+lh56xBYH3RosIY0EUaMmphvX
0MSC5e1Xvqka+FJCen2qQkpPFgu25sl841oK78/i3YpEfksB3tGT2c02FJat7yr6Zu9tEv
3U7T74lF5mI6ay3sy1CVhwsjq3XSJGvsyrlXNB1eRnlmJQEaFgvzCP6GVxrRDP3h9IHMk1
D33CHeZsuSeKXogLwMhYy1gCLPIa5DzAzLhN2iGWpHsTvIRdS58Psgkz7944T9qdegu4Ic
LM9JmC+H51rrcMlFmW8uodx+phmFSXYqb1hyk+kU7hJRhR6iMXvbRom+QifPBw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1728067778;
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=syL4c805njtmQhDuI5f5jbsNDEwyBOrQ9hLkIy98n3Q=;
b=gjeto0QKH7l/YC2kS6ekWWWuCQnsB1zqhPoV4cqxNfKYNBt+8P+gwNt0GHHB3W8b2un+B3
vWss+z2i/lu3x3WK127/3qY2ReFosNIeMInefEWjuXKM2XWh26j6mS20ayofwIl4NAQRrZ
5JpcdQCweuDPEo8wdoPlUpAq8uuScee2dY1JtEAf/WV80NdJCM6LkwtNnprDpVqvs/9u29
mhUC7EhUghi/GQKffmkLnDWXrl8LgkMVwFvSEs3xup63gCIJnh8on19nRLputo8Y63nytV
acIzxVQA9Ujyb6n6mPZKCqKxTKOJPapqp0XbvyMPq9+MDcfv/w7nhedGwCCDzg==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728067778; a=rsa-sha256; cv=none;
b=LCD6L5xmsWAXKQHuPXao2YZEfyUNPLTHwH5we66u7OFpWk6E7kdSLN5HznX6FUwl6ZjVS6
euSHLZBqSwoSFG/Ur31bbRP8blVtSWmXrSZyGAR6LsRpPBZIGc1q5Lr10ld9TXPkAdGXTF
Z4FQMTGb5dW45Swcg1ZuvtjTsN3cmPyT8Meq9cz0ftHk5p11ZE54Aslq73SFEwsQA1YCln
FEQ3lJMeIYwx8RW7FVvjNkVetFDrgqbC9liMbkLHCMSkuRm7TNWlETawQX3lct0n/oG3ZE
88V6HvOduJc+45a2RHVk5cSDca21w6z+DaAieYUF9L/WQQERg1AXzEhxqkaU2w==
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 4XKyJf3RW5zlt0;
Fri, 4 Oct 2024 18:49:38 +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 494Inccx036912;
Fri, 4 Oct 2024 18:49:38 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494Inc0k036909;
Fri, 4 Oct 2024 18:49:38 GMT
(envelope-from git)
Date: Fri, 4 Oct 2024 18:49:38 GMT
Message-Id: <202410041849.494Inc0k036909@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Ruslan Bukin
Subject: git: 8fb467568877 - main - snd_hdspe(4): Addendum to
AO4S-192 and AI4S-192 support.
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: br
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 8fb4675688770783203e012fe21aa61154bb32f6
Auto-Submitted: auto-generated
The branch main has been updated by br:
URL: https://cgit.FreeBSD.org/src/commit/?id=8fb4675688770783203e012fe21aa61154bb32f6
commit 8fb4675688770783203e012fe21aa61154bb32f6
Author: Florian Walpen
AuthorDate: 2024-10-04 18:46:39 +0000
Commit: Ruslan Bukin
CommitDate: 2024-10-04 18:46:39 +0000
snd_hdspe(4): Addendum to AO4S-192 and AI4S-192 support.
Fix unified pcm mode after support for the AO4S-192 and AI4S-192
extension boards was added. Adjust the man page accordingly.
Reviewed by: br
Differential Revision: https://reviews.freebsd.org/D46946
---
share/man/man4/snd_hdspe.4 | 6 +++---
sys/dev/sound/pci/hdspe-pcm.c | 6 ++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/share/man/man4/snd_hdspe.4 b/share/man/man4/snd_hdspe.4
index a8c7be538dd1..ac81356fb783 100644
--- a/share/man/man4/snd_hdspe.4
+++ b/share/man/man4/snd_hdspe.4
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd February 9, 2024
+.Dd September 28, 2024
.Dt SND_HDSPE 4
.Os
.Sh NAME
@@ -55,7 +55,7 @@ driver supports the following audio devices:
.Pp
.Bl -bullet -compact
.It
-RME HDSPe AIO
+RME HDSPe AIO (optional AO4S-192 and AI4S-192 extension boards)
.It
RME HDSPe RayDAT
.El
@@ -84,7 +84,7 @@ For resulting channel numbers consult the following table:
.Bl -column "HDSPe RayDAT" "Single Speed" "Double Speed" "Quad Speed"
.Sy "Sound Card" Ta Sy "Single Speed" Ta Sy "Double Speed" Ta Sy "Quad Speed"
.It "" Ta "Play | Rec" Ta "Play | Rec" Ta "Play | Rec"
-.It HDSPe AIO Ta " 16 | 14" Ta " 12 | 10" Ta " 10 | 8"
+.It HDSPe AIO Ta " 20 | 18" Ta " 16 | 14" Ta " 14 | 12"
.It HDSPe RayDAT Ta " 36 | 36" Ta " 20 | 20" Ta " 12 | 12"
.El
.Sh SYSCTL TUNABLES
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
index 322fd69723c0..1f8fbbcef078 100644
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -114,10 +114,8 @@ hdspe_port_first_row(uint32_t ports)
uint32_t ends;
/* Restrict ports to one set with contiguous slots. */
- if (ports & HDSPE_CHAN_AIO_LINE)
- ports = HDSPE_CHAN_AIO_LINE; /* Gap in the AIO slots here. */
- else if (ports & HDSPE_CHAN_AIO_ALL)
- ports &= HDSPE_CHAN_AIO_ALL; /* Rest of the AIO slots. */
+ if (ports & HDSPE_CHAN_AIO_ALL)
+ ports &= HDSPE_CHAN_AIO_ALL; /* All AIO slots. */
else if (ports & HDSPE_CHAN_RAY_ALL)
ports &= HDSPE_CHAN_RAY_ALL; /* All RayDAT slots. */