From nobody Thu Nov 14 03:25:03 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 4Xplrv3ycbz5d1N9; Thu, 14 Nov 2024 03:25:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xplrv32Qbz4GjY; Thu, 14 Nov 2024 03:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731554703; 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=j84qaDrpHS21Ib9Dbul6J/KIKqkoehjlxAxx9dFjDTU=; b=fNUZv4sxV63xsKgJTAYeuPD1ZMAzzhdU5wTzBWt5HPFBBKaoUnoXhebxRYkdDuScVR7XB5 nOgsXEGdwMQUDNEzlsCKe6BQKh9J8MT3xr5MzRv5xaU4OexMS7MDMQwylJ7dr8y6LmdNau KUEA3n4nsnqDTVDk7tm7Rzg+h5d0iGyNTYcfWB8kfMLmpgjWY1a361e/0FF+41nIba7D10 vCqIX3vM/szipZTSqPOaOBoPryj/AmyRtdceDJ6icowQaBPrkstBka2onIqzcY90VsmgFK RYhMsj2dgiDGnad1uJMkrwi4vG3gU65DPy8LSqeN64rGDC2wCEgkWUjPlziOIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731554703; 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=j84qaDrpHS21Ib9Dbul6J/KIKqkoehjlxAxx9dFjDTU=; b=NKIOVm3AfJPkDWMaxt5SU1q8QvWo/JbjuGoLKqdv/YMRWm7kb3bu07+WA617iCddyJV2Fs x8eR6FLdsVrJUjdOt4K4BzVpyd14xOhbs4bdPSup0SGqptcYoEJDpz2COU1iWHjfsUfUwJ 4YBhihQ4ypu711MgEojh4hw6MYoS1P1QzHYbBzfP54mpepkHkmxCXRfwS68ppzkatdw3PT PCSIgc8VgUeTaBWjF+XYFwEkXbC6YYlLOoHSPilX9fWaCaG2HwosVdj6i6CkZb/CfgWs4p YfpKVKOUfTTv24hIAecaJn9yqNdDn7bip5+l6eZ15Yz9dglaY9DbLJIAafDQGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731554703; a=rsa-sha256; cv=none; b=ExtBHBrqsBSRd/P09QljiXlMZFVLXyLR9ZpAprn3EPBE/zz/Z4QH0Omlw/p9pWY0lYbLee 8UIYe+P3WYydkQ2n3JD5rE6WR1EkK5BUSVdLhWUKfnbczJ/qUXDxj9VCbAlGbyAXvMoykK 3owN+xi8v1/JY2xT2SqVc8ALDVUoYOEnpd/RUbdvPfcy9stF9/mhRe98EQ968jbx+KvEVT +kR36je+7BAeJm0pDjB3GyUnRNvtuPoZ4BpeCT3wrRRGr1dwVE9cU//EUsSXdwybVdwcK8 OSrfXYblDedx8wm6s0D6JbFrDrx3FOtNXudmL2UvtybXTcdrXu5YTBP7plTp0Q== 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 4Xplrv2dVyzM1D; Thu, 14 Nov 2024 03:25:03 +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 4AE3P3Og024744; Thu, 14 Nov 2024 03:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AE3P3qY024741; Thu, 14 Nov 2024 03:25:03 GMT (envelope-from git) Date: Thu, 14 Nov 2024 03:25:03 GMT Message-Id: <202411140325.4AE3P3qY024741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: 200a3cb706f6 - stable/14 - sound: Include snd_cmi only for i386 and amd64 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 200a3cb706f62a61ecfe48e946573fddf6ec9e29 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=200a3cb706f62a61ecfe48e946573fddf6ec9e29 commit 200a3cb706f62a61ecfe48e946573fddf6ec9e29 Author: Jose Luis Duran AuthorDate: 2024-11-04 19:57:25 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-14 03:19:19 +0000 sound: Include snd_cmi only for i386 and amd64 When running FreeBSD on an arm64/aarch64 QEMU virtual machine, using the Intel HD Audio Controller (ich6) (intel-hda), for example, and by following the procedure in the handbook ("Setting Up the Sound Card"): kldload snd_driver The following error is shown: KLD snd_driver.ko: depends on snd_cmi - not available or version mismatch This is because the CMedia sound driver (snd_cmi) is only built for i386 and amd64. Add the same guards to the snd_driver metadriver. Reviewed by: christos, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47399 (cherry picked from commit 0187bc8a472ef21ddb901f797d46075fc0d5eb14) --- sys/dev/sound/driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/sound/driver.c b/sys/dev/sound/driver.c index 927941ab3d01..b9d530dce921 100644 --- a/sys/dev/sound/driver.c +++ b/sys/dev/sound/driver.c @@ -57,7 +57,9 @@ MODULE_VERSION(snd_driver, 1); MODULE_DEPEND(snd_driver, snd_als4000, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_atiixp, 1, 1, 1); +#if defined(__i386__) || defined(__amd64__) MODULE_DEPEND(snd_driver, snd_cmi, 1, 1, 1); +#endif MODULE_DEPEND(snd_driver, snd_cs4281, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_csa, 1, 1, 1); MODULE_DEPEND(snd_driver, snd_csapcm, 1, 1, 1);