From nobody Fri Oct 04 18:41:17 2024
X-Original-To: dev-commits-src-all@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 4XKy722zvNz5YB3d;
Fri, 04 Oct 2024 18:41:18 +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 4XKy72074Kz4JZw;
Fri, 4 Oct 2024 18:41:18 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1728067278;
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=kNg/mWVB58YCTcjAicMZMS6Vk5z7hmsdCsEpcSCco88=;
b=iAIRrwfACth+fagLL2PV0Edu21q898o6+du33PbNxDj1vJHL4RGkVEkFJdfjUqHHckQlFJ
QHl1dnU1aibV2J0dGUV4ek55Km4DGTg8E3VcymzXhQwLlQHlVR9ezbilsA0mbe/DYcnsXu
Yv4sDSYCCl7qjrn1SRFV4LpbgogUOktJwxWt5t+AOGfkPRAX8NVzOI20kljDFKvPfmUzbd
65p5lKC8MXurn1oGJp7p1yVqIyJTyCuMb5CRKA14+Xfcb5HRkC6Z/AGnbu47nenUO7s7mL
Awj6xJSzUfZLkUKpzFdHPmeBTKP5BGv2Lb3LqJp5iSX07ESSBAxh4wiVVy9iEg==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1728067278;
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=kNg/mWVB58YCTcjAicMZMS6Vk5z7hmsdCsEpcSCco88=;
b=Tkf2rowzzNHS1OR51V6mKtbAhdmIhgIHDannb3QBq10FMhPTS+YrHkOnY7ZsgpySdmnNDQ
2yJhyD6xLNiVS4TvQY+FM9EWLviQMZC8fzDryY0yYAzGG3EKW6YFI06d3GRXuucTTbWtaV
7I8tyA9tV9HoXwQR1bnoe/mtGv2NzeGtCsttG4BO0p6fWmpZWWU3LmCy01DR8aFLd6oMdJ
GKdQQryxmZ3PjUIRTj+YJrZqx5LHlAX6FrsJd25I6icR0fs/JYFEMXxRzRTDpVaUzJphQL
TzwlXd8h+Zlm8gN3ttsac/0+RD4EFEsxZMwqJkd0hl5pLhBpcMo6eYDBbqKspA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728067278; a=rsa-sha256; cv=none;
b=gLqz7/djN5HFfB+hFRRFl/1jFm3MpIbPr/oxvXUDgTm48H/MJ/AB1lIzK+ULXX0/XUy+Sp
FXcvdlpm1xxN5yL/JPFAmKhHAD8qQzBrXdoy6RkrwaLxlnki2kBNWj7aY2R6IYoHEKyRpU
WRpid8corsrUNgsnKT9uVxm5X04oaJxvK5z+mG9+fUljrNdQTnfiNQiEtKNkaAa9wrGEWD
fRbSc9mMqIz37dfL5M4Dvsqmj2QY/qltHW33YLFNqd7Q9zjDpGdp8CTIPh6DnzR9LG8ldb
cyZL87wNQobyupX4dIDHDUvime9iUSwI3oh10cWMehcbr7vnmXBQfnWzVEDhkw==
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 4XKy716rQszlsc;
Fri, 4 Oct 2024 18:41:17 +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 494IfHkS029112;
Fri, 4 Oct 2024 18:41:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494IfHn4029109;
Fri, 4 Oct 2024 18:41:17 GMT
(envelope-from git)
Date: Fri, 4 Oct 2024 18:41:17 GMT
Message-Id: <202410041841.494IfHn4029109@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: 9e7e15b539a6 - main - snd_hdspe(4): AO4S/AI4S support.
List-Id: Commit messages for all branches of the src repository
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help:
List-Post:
List-Subscribe:
List-Unsubscribe:
X-BeenThere: dev-commits-src-all@freebsd.org
Sender: owner-dev-commits-src-all@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: 9e7e15b539a6f3ef98854a47ee346c9100875c8a
Auto-Submitted: auto-generated
The branch main has been updated by br:
URL: https://cgit.FreeBSD.org/src/commit/?id=9e7e15b539a6f3ef98854a47ee346c9100875c8a
commit 9e7e15b539a6f3ef98854a47ee346c9100875c8a
Author: Ruslan Bukin
AuthorDate: 2024-10-04 18:33:36 +0000
Commit: Ruslan Bukin
CommitDate: 2024-10-04 18:36:06 +0000
snd_hdspe(4): AO4S/AI4S support.
Add support for RME AO4S/AI4S extension cards. They are designed as a bracket
with 4 stereo TRS jacks each.
https://archiv.rme-audio.de/download/ao4s192_e.pdf
https://archiv.rme-audio.de/download/ai4s192_e.pdf
Reviewed by: Florian Walpen
Differential Revision: https://reviews.freebsd.org/D46409
---
sys/dev/sound/pci/hdspe-pcm.c | 4 ++++
sys/dev/sound/pci/hdspe.c | 1 +
sys/dev/sound/pci/hdspe.h | 22 ++++++++++++----------
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c
index 79bfcbea3406..322fd69723c0 100644
--- a/sys/dev/sound/pci/hdspe-pcm.c
+++ b/sys/dev/sound/pci/hdspe-pcm.c
@@ -136,6 +136,8 @@ hdspe_channel_count(uint32_t ports, uint32_t adat_width)
/* AIO ports. */
if (ports & HDSPE_CHAN_AIO_LINE)
count += 2;
+ if (ports & HDSPE_CHAN_AIO_EXT)
+ count += 4;
if (ports & HDSPE_CHAN_AIO_PHONE)
count += 2;
if (ports & HDSPE_CHAN_AIO_AES)
@@ -189,6 +191,8 @@ hdspe_port_slot_offset(uint32_t port, unsigned int adat_width)
/* AIO ports */
case HDSPE_CHAN_AIO_LINE:
return (0);
+ case HDSPE_CHAN_AIO_EXT:
+ return (2);
case HDSPE_CHAN_AIO_PHONE:
return (6);
case HDSPE_CHAN_AIO_AES:
diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
index 66f5bc5c5d7a..0e25e9599328 100644
--- a/sys/dev/sound/pci/hdspe.c
+++ b/sys/dev/sound/pci/hdspe.c
@@ -78,6 +78,7 @@ static struct hdspe_clock_source hdspe_clock_source_table_aio[] = {
static struct hdspe_channel chan_map_aio[] = {
{ HDSPE_CHAN_AIO_LINE, "line" },
+ { HDSPE_CHAN_AIO_EXT, "ext" },
{ HDSPE_CHAN_AIO_PHONE, "phone" },
{ HDSPE_CHAN_AIO_AES, "aes" },
{ HDSPE_CHAN_AIO_SPDIF, "s/pdif" },
diff --git a/sys/dev/sound/pci/hdspe.h b/sys/dev/sound/pci/hdspe.h
index daffeb4ddebc..2f0bdddd930f 100644
--- a/sys/dev/sound/pci/hdspe.h
+++ b/sys/dev/sound/pci/hdspe.h
@@ -119,23 +119,25 @@
#define HDSPE_DMASEGSIZE (HDSPE_CHANBUF_SIZE * HDSPE_MAX_SLOTS)
#define HDSPE_CHAN_AIO_LINE (1 << 0)
-#define HDSPE_CHAN_AIO_PHONE (1 << 1)
-#define HDSPE_CHAN_AIO_AES (1 << 2)
-#define HDSPE_CHAN_AIO_SPDIF (1 << 3)
-#define HDSPE_CHAN_AIO_ADAT (1 << 4)
+#define HDSPE_CHAN_AIO_EXT (1 << 1)
+#define HDSPE_CHAN_AIO_PHONE (1 << 2)
+#define HDSPE_CHAN_AIO_AES (1 << 3)
+#define HDSPE_CHAN_AIO_SPDIF (1 << 4)
+#define HDSPE_CHAN_AIO_ADAT (1 << 5)
#define HDSPE_CHAN_AIO_ALL_REC (HDSPE_CHAN_AIO_LINE | \
+ HDSPE_CHAN_AIO_EXT | \
HDSPE_CHAN_AIO_AES | \
HDSPE_CHAN_AIO_SPDIF | \
HDSPE_CHAN_AIO_ADAT)
#define HDSPE_CHAN_AIO_ALL (HDSPE_CHAN_AIO_ALL_REC | \
HDSPE_CHAN_AIO_PHONE) \
-#define HDSPE_CHAN_RAY_AES (1 << 5)
-#define HDSPE_CHAN_RAY_SPDIF (1 << 6)
-#define HDSPE_CHAN_RAY_ADAT1 (1 << 7)
-#define HDSPE_CHAN_RAY_ADAT2 (1 << 8)
-#define HDSPE_CHAN_RAY_ADAT3 (1 << 9)
-#define HDSPE_CHAN_RAY_ADAT4 (1 << 10)
+#define HDSPE_CHAN_RAY_AES (1 << 6)
+#define HDSPE_CHAN_RAY_SPDIF (1 << 7)
+#define HDSPE_CHAN_RAY_ADAT1 (1 << 8)
+#define HDSPE_CHAN_RAY_ADAT2 (1 << 9)
+#define HDSPE_CHAN_RAY_ADAT3 (1 << 10)
+#define HDSPE_CHAN_RAY_ADAT4 (1 << 11)
#define HDSPE_CHAN_RAY_ALL (HDSPE_CHAN_RAY_AES | \
HDSPE_CHAN_RAY_SPDIF | \
HDSPE_CHAN_RAY_ADAT1 | \