From nobody Fri Oct 04 18:53:42 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 4XKyPL2YPNz5YBxL; Fri, 04 Oct 2024 18:53:42 +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 4XKyPL1cyNz4LWm; Fri, 4 Oct 2024 18:53:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728068022; 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=KwZdAcvti2J4pJQJuoG56NciUVoeg5bFFvmsZnk31OU=; b=ntTmzPL502zSrzFaZ79WYYjzbJLvKsa9iUi2yb6IylQJMaxWXqPT6Z8NCT5R55Kmt1SAzd 6TkNHMOchhlJXNqkalyYVSLyY6IhdOxqxIIwsqBMuW89WRVURjE/Xlsm0AxdbTpw4CvrcQ tYOh+VUTEx8KOR1S0MRxPOZeThUpSd7o1xB2/moKdA81Qw+tLbQI6l2SLBcDWMMVtG5sap rObahLT/7JeiX06A1zMhf+hGQEupYH3Z3ebU8HWQQy+aEXJFFJUjq5rBQdD6Oos0Ls3OHr PdrQVKp6YMxtSrfq0pUq72A9pdnk8ETzQDZ2cO5PFtm1mas8kFvVuIohkTZd/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728068022; 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=KwZdAcvti2J4pJQJuoG56NciUVoeg5bFFvmsZnk31OU=; b=YKy2nIkt0UP2T6k0DTXtpAI1mZ1ImJoXjzqRHCEbW85u14fUGKNm4D5Jl81ba9GX2gJ3dE AJnMi4gMBneGBxq7zLxnF0lSXreuyC3E7i2wdXFHkL/zgcwxG196YecfGyTpRVBEDiZDMi bboZ4pV6wgfKaBgaVZo5PtogjvbpnAViek5vam5JeNrtJ99pmgqbJZ0ZksfGm4egdXPcjt StgH0jA9QVVt1DHQ6Sd6hKbSIu19FEwOMiUp5vL0lr1DolQuTSLRXJ+LxbgGSXNqtRV6H+ zo3hdF6VpiAYzjpkg5CWD3jX6aqA67Xfsfu1SJpRfCNYV6Ck3/9e6wP4Ih/OSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728068022; a=rsa-sha256; cv=none; b=t27IxGO3evYOAu/QRwEqbSqsDG00gnlZZ3AQTK5B86vDI4p+p3TfobebrP02Z1tF5JnlxR jWmlMG5IDcNzAH76CcV1z+0qReLxel1PNlk7GnYJfTpp9zRJcQiTQABLdgPB1yTMlDzYvE PMcNS1xBF0kqWY+chpbTQvlMrC1HhgykkZai+TwXZlxOvW0YBFOFn6F89TpfZ//+JKRGzG /advsX361SREip3S5wD/6IpmD/Jl8DFxEgFqwnbcyVI1QlTVgR9h6cUVJii2ZW9rwvPQhx jtm03r/B1y5S5pjtZtxB1dMXukP/IBxTc5KRGbvci6C2Q33/hfBrZv5cdRfhBw== 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 4XKyPL1C8gzlhJ; Fri, 4 Oct 2024 18:53:42 +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 494Irgt0052498; Fri, 4 Oct 2024 18:53:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 494IrgSW052495; Fri, 4 Oct 2024 18:53:42 GMT (envelope-from git) Date: Fri, 4 Oct 2024 18:53:42 GMT Message-Id: <202410041853.494IrgSW052495@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: e0c37c160b11 - main - snd_hdsp(4): Support AO4S-192 and AI4S-192 extension boards. 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: e0c37c160b115b0bf41847ab60a5dabf0dc71300 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c37c160b115b0bf41847ab60a5dabf0dc71300 commit e0c37c160b115b0bf41847ab60a5dabf0dc71300 Author: Florian Walpen AuthorDate: 2024-10-04 18:51:38 +0000 Commit: Ruslan Bukin CommitDate: 2024-10-04 18:51:49 +0000 snd_hdsp(4): Support AO4S-192 and AI4S-192 extension boards. Create an additional 4 channel pcm device for RME HDSP 9632 sound cards, to support the optional AO4S-192 and AI4S-192 extension boards. For simplicity, the pcm device is always present, even if the extension boards are not installed. Unfortunately I cannot test this with actual hardware, but I made sure the additional channels do not affect the functionality of the HDSP 9632 as currently in src. Reviewed by: christos, br Differential Revision: https://reviews.freebsd.org/D46837 --- share/man/man4/snd_hdsp.4 | 6 +++--- sys/dev/sound/pci/hdsp-pcm.c | 2 +- sys/dev/sound/pci/hdsp.c | 1 + sys/dev/sound/pci/hdsp.h | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/share/man/man4/snd_hdsp.4 b/share/man/man4/snd_hdsp.4 index 23eb98a3ccc2..d6661c80b2ea 100644 --- a/share/man/man4/snd_hdsp.4 +++ b/share/man/man4/snd_hdsp.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 1, 2024 +.Dd September 28, 2024 .Dt SND_HDSP 4 .Os .Sh NAME @@ -56,7 +56,7 @@ driver supports the following audio devices: .Pp .Bl -bullet -compact .It -RME HDSP 9632 +RME HDSP 9632 (optional AO4S-192 and AIS-192 extension boards) .It RME HDSP 9652 .El @@ -86,7 +86,7 @@ For resulting channel numbers consult the following table: .Bl -column "Sound Card" "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 HDSP 9632 Ta " 12 | 12" Ta " 8 | 8" Ta " 4 | 4" +.It HDSP 9632 Ta " 16 | 16" Ta " 12 | 12" Ta " 8 | 8" .It HDSP 9652 Ta " 26 | 26" Ta " 14 | 14" Ta " - | -" .El .Sh SYSCTL TUNABLES diff --git a/sys/dev/sound/pci/hdsp-pcm.c b/sys/dev/sound/pci/hdsp-pcm.c index 29bd0bc70ee4..a50fc2b52fc0 100644 --- a/sys/dev/sound/pci/hdsp-pcm.c +++ b/sys/dev/sound/pci/hdsp-pcm.c @@ -107,7 +107,7 @@ hdsp_port_slot_map(uint32_t ports, uint32_t speed) slot_map |= (0x03 << 8); /* 2 channels SPDIF. */ if (ports & HDSP_CHAN_9632_LINE) slot_map |= (0x03 << 10); /* 2 channels line. */ - if (ports & HDSP_CHAN_9632_EXT_BOARD) + if (ports & HDSP_CHAN_9632_EXT) slot_map |= (0x0f << 12); /* 4 channels extension. */ } else if ((ports & HDSP_CHAN_9652_ALL) && (speed <= 96000)) { /* Map HDSP 9652 ports to slot bitmap, no quad speed. */ diff --git a/sys/dev/sound/pci/hdsp.c b/sys/dev/sound/pci/hdsp.c index 769615cb1f4b..cf251a5636a1 100644 --- a/sys/dev/sound/pci/hdsp.c +++ b/sys/dev/sound/pci/hdsp.c @@ -74,6 +74,7 @@ static struct hdsp_channel chan_map_9632[] = { { HDSP_CHAN_9632_ADAT, "adat" }, { HDSP_CHAN_9632_SPDIF, "s/pdif" }, { HDSP_CHAN_9632_LINE, "line" }, + { HDSP_CHAN_9632_EXT, "ext" }, { 0, NULL }, }; diff --git a/sys/dev/sound/pci/hdsp.h b/sys/dev/sound/pci/hdsp.h index 5ff622892c52..981188ad8aff 100644 --- a/sys/dev/sound/pci/hdsp.h +++ b/sys/dev/sound/pci/hdsp.h @@ -130,10 +130,11 @@ #define HDSP_CHAN_9632_ADAT (1 << 0) #define HDSP_CHAN_9632_SPDIF (1 << 1) #define HDSP_CHAN_9632_LINE (1 << 2) +#define HDSP_CHAN_9632_EXT (1 << 3) /* Extension boards */ #define HDSP_CHAN_9632_ALL (HDSP_CHAN_9632_ADAT | \ HDSP_CHAN_9632_SPDIF | \ - HDSP_CHAN_9632_LINE) -#define HDSP_CHAN_9632_EXT_BOARD (1 << 3) + HDSP_CHAN_9632_LINE | \ + HDSP_CHAN_9632_EXT) #define HDSP_CHAN_9652_ADAT1 (1 << 5) #define HDSP_CHAN_9652_ADAT2 (1 << 6)