From nobody Sat Apr 25 16:37:50 2026 X-Original-To: dev-commits-src-branches@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 4g2wVR0C85z6bmlb for ; Sat, 25 Apr 2026 16:37:51 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g2wVQ6YGCz3CQJ for ; Sat, 25 Apr 2026 16:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777135070; 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=M6Qj28mDhn+YUvDJeJVcjfJ8jhy8X8uwwPgolBM4zS8=; b=pGed+Z6RsrylhiYTZ3ebUrtOw+qX5IW1IlJjLEkkjgJzgs2j2kc91wu6VZALNE9qjjOmnF d/Q3xCSqGJbwXGFiC4aO08I6fQ026cz1B4YTMJ7G5UnhSstQTxmpfy2q50d9DYFlWKW4g9 z/2H9sUXPDQztj40IEThRG9qHPwYWLPt/YGDq74WWMGwetlA8Vk9X1hTFs6hITWyV4BJ8N cZh97dGjxZH2XBMe0DQOK53ulZz5vtRiGjoXAQogLMpYIvpGWMeGdrjHeYOblKGqE1puIs Scu6h1JUTJ6XYJD68B+htCG1cHtbE72z2c6ye7nWbVYbdCGfid3+/AUU60V7SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777135070; a=rsa-sha256; cv=none; b=SvIOpagDWtgeGMXQSJ2O28+Xv705SLKUVCRrat7VxWFUij5fNa9x1Ey4HmwAaiSqhgBO9Q sHnXlmanIMyggJXvU6JYeZg673r6csjOHMBXOI0V3yDGoOek05ebWa4+MHVTbMOdNzXimM RPoOs5E6+4CEm9MUE3JeCLdFtcoiAm4SyvKiKo92Fh0Xd25ig4D5glm/CKTOLOySPZUybW YQ504jtOcI/P7gpz+Fxmwuv8xH3bVL5kDxNVakpVweHatWwWze6k3L4pD5fNfdZKdjnQLH FV9PR6zyOeed+RhQ3/Jtg0sHhYyorsRq033wLInkLDnvBLBZbu7uzhoNR6mKJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777135070; 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=M6Qj28mDhn+YUvDJeJVcjfJ8jhy8X8uwwPgolBM4zS8=; b=c/1N75ewwX4g0fLLnTFI+w7fgR8w99tNTtBHasUR+Srhcj8eL07c9Abump9+7Mmyn/tLLq Qm+RU5MlxXpKz+11ZelSdkH/L+85byKMY0CW8vUkabRJnMzyYMSLw3g0jt3PDRdzbtj8qP pOViejeX/3cd7i5Zea09SHptRVyP5FUS/ZeLdfrbrZBJI92PVLSMjYZwbNImBgjWzjlPcP IXpdWqIYsCrHxiIc3HyXreOp8hxQUX45VkWf9aTfucCmUphBpISox9pIeWxrbfzJMDTSnE fZDCKkWqYTMu/zGtB2gwiySaBlDZcoyljOtcG3yCoR6zAx+RMgvtrmlTmVVglQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2wVQ5sDTzj3X for ; Sat, 25 Apr 2026 16:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42b75 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:37:50 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: c8ad757af8c8 - stable/14 - asmc: use symbolic names with the MacPro3,1 model List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8ad757af8c87f15ae6e007c2e6bc65140464c15 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:37:50 +0000 Message-Id: <69ecedde.42b75.528df51@gitrepo.freebsd.org> The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=c8ad757af8c87f15ae6e007c2e6bc65140464c15 commit c8ad757af8c87f15ae6e007c2e6bc65140464c15 Author: Enji Cooper AuthorDate: 2026-02-20 06:24:38 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:37:08 +0000 asmc: use symbolic names with the MacPro3,1 model Use `ASMC_LIGHT_FUNCS_DISABLED` and `ASMC_SMS_FUNCS_DISABLED` instead of the unrolled versions of the macros. This makes it easier to adjust the underlying macros/fields for `struct asmc_model`. No functional change intended. MFC after: 1 week (cherry picked from commit 90edc16166a6fef03d2384247d07d64656f03309) --- sys/dev/asmc/asmc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/asmc/asmc.c b/sys/dev/asmc/asmc.c index 8c7e48dfd121..7f3a661b863b 100644 --- a/sys/dev/asmc/asmc.c +++ b/sys/dev/asmc/asmc.c @@ -420,9 +420,9 @@ static const struct asmc_model asmc_models[] = { /* Idem for the Mac Pro (Early 2008) */ { "MacPro3,1", "Apple SMC Mac Pro (Early 2008)", - NULL, NULL, NULL, + ASMC_SMS_FUNCS_DISABLED, ASMC_FAN_FUNCS, - NULL, NULL, NULL, + ASMC_LIGHT_FUNCS_DISABLED, ASMC_MP31_TEMPS, ASMC_MP31_TEMPNAMES, ASMC_MP31_TEMPDESCS },