git: 8fb467568877 - main - snd_hdspe(4): Addendum to AO4S-192 and AI4S-192 support.

The branch main has been updated by br:

URL: https://cgit.FreeBSD.org/src/commit/?id=8fb4675688770783203e012fe21aa61154bb32f6

commit 8fb4675688770783203e012fe21aa61154bb32f6
Author:     Florian Walpen <dev@submerge.ch>
AuthorDate: 2024-10-04 18:46:39 +0000
Commit:     Ruslan Bukin <br@FreeBSD.org>
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. */