From nobody Mon Nov 04 19:59:21 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 4Xj2Nn739Vz5cTs1; Mon, 04 Nov 2024 19:59:21 +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 4Xj2Nn6SFKz4Kwm; Mon, 4 Nov 2024 19:59:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730750361; 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=DFD1eQwrCtnTj1a7wSb5b7sX72d+jQX8MO8Dbz+8HEI=; b=Pl/uBK4rWmgR48HOK8wNkAtK9YBojj6cqxCTe8OY/Stbs8x2wMi7cu4J/z+WnVUhkzGbNY ZjnANvxndgt4J0sWF2apb8nIV5X++YGgKlfQTtIHEVcFxHxnaeP93AOZXsboQvhblCzZrl I/SRQ6zoaMdzxS3gvNDwNCpwy0VK17n3Siv8EE1/28XpLgWAzirgWfgpGMKomtyheTC8cF Nh0s0pyOaFwGNZQqCYOSlUsF+TJT6xVCDqSRRiPzUe//GXZY/jnF4B/Y+KMXjtbvC7/Y3Q K4M3JAZYe7A+Slg45LaSHKoBtZ0w3IlMpS/iPY1pZNC5lyEc/RELG/7pmz/R5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730750361; 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=DFD1eQwrCtnTj1a7wSb5b7sX72d+jQX8MO8Dbz+8HEI=; b=jEDsqmP6GTh34uvuGLOGgqmKGoXw2ziiJI2bFZusZ1nJQpvewGe9cDDWZvLzGmz5RYrFzE diBlKJFJaJQFDoJOp2zzFF6RWowWnw9zldoc77t68+0ipY3i2uEgM8KyAxXmtoyUSiOTN2 TRsQ4gi4CWGGxcAC0qDjA/Axdwd4J93vTjNNwfTZpPA9JCp7cAvruORNoc+wURtKktS78f bs1N7FnhGdxQQmYzT0uXna/ZU61XmSI5urbJZEzpDWeWfzT8wLrYUSwRNEXcax8KgvatLL XfilazSQiL9fpwSIlIdLML0nJeC+jRWQqJyy4015E/eC4++spXBMAL/B+da1yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730750361; a=rsa-sha256; cv=none; b=XUzY4orScXMRYMsA3p802jw8ownlo1xJHXoOeEZ6WGOnF6rSEnDtF+UvysHi44oIRb7UL+ lAGeLBYY1E2r+IYbbEXhYJ86/CIKZWMIl67BZ9lJNFzT+yNeT53WYsB2ZTfRtqALC0F3Pw Jck2q/l1+wCV2iYCuelVe7re9KdQaYnhBWhxHUKEpCwO78oaVCpDmCAG2nZQ/oqZp+0xJq qNxMu/tMg4UAtig2DZlq7b8/c0EfgUjRkwORuqs78lDAc9uUgUN+Nn0l4vv9+1N+azoEua kQCyuVJH7s7jGiaUxWrRCr1ECBd8+stKk8NyfNCp1Nj2gje6wMVROvUA1ER2rQ== 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 4Xj2Nn5yT1zmSF; Mon, 4 Nov 2024 19:59:21 +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 4A4JxL9r019758; Mon, 4 Nov 2024 19:59:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A4JxL30019755; Mon, 4 Nov 2024 19:59:21 GMT (envelope-from git) Date: Mon, 4 Nov 2024 19:59:21 GMT Message-Id: <202411041959.4A4JxL30019755@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 0187bc8a472e - main - sound: Include snd_cmi only for i386 and amd64 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0187bc8a472ef21ddb901f797d46075fc0d5eb14 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=0187bc8a472ef21ddb901f797d46075fc0d5eb14 commit 0187bc8a472ef21ddb901f797d46075fc0d5eb14 Author: Jose Luis Duran AuthorDate: 2024-11-04 19:57:25 +0000 Commit: Jose Luis Duran CommitDate: 2024-11-04 19:57:25 +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 --- 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 6bfe6c51fa3e..13218f419a28 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);