From nobody Sat Apr 25 16:37:04 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 4g2wTX59G0z6bmrg for ; Sat, 25 Apr 2026 16:37:04 +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 4g2wTX4B4tz3C4W for ; Sat, 25 Apr 2026 16:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777135024; 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=0o/LdUam9SJlmWVnUA69DDtMDGWZkSeufSvPaEY8LL4=; b=abtnfnqxIoscbt96aCxTMlXCKBGtsSBMR7o2Wd+vWnu0Gw1SgyF9jYXUMcP0CjHSZw5jCn HfJUWC0B/b6nRitssnMsr6kNMQhNdMdBjvJIb0UsenhiHIg36GeVAI/g43UF21obYiCpAM 0/AfRuNuVQiboN1qEoGHQCJ7v/Yv4dPYuxTXmSXQRcoweDks728frn8EmcfdtQZj3Y/w/h aWxiuJVz8dng9hnOkdmgp13hOYLFHyqW7J7fW9GJKQW26iRxkR1YF2+zhGFvc+nMj6mcaC SPsToMr7OpIDbS7MVNnc89vGFTXMlDxfThpF45xDyDWRGRFPusIu2CG3WL+Kow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777135024; a=rsa-sha256; cv=none; b=WcrDlvYaSvZLCiYQW9pzEvkP/jgukI5rpp9w1FILttnIdPEaxSogA1w9SjQOxj1FrcIpVc nEo6lWT+Xtgslhr4hN1JTLy92WifT75MyJ0sfp/ne/qmjEU/FS1htFNKY+AFPe6fUKhXBV m4G+9x01Fdaz5GFWbjWVJ70RNB/RL8Lu76YqNBlxMlRp6l2bSSyxWHna8eGUZ0OkTwnpSY qMmD1A6KUzl+Gsit2+TCbW3+aDkPlCYBiiA5mIG35kMqfqU2PywEo0r8zCq2tMTKMt8kBV Jbh0zQX0WLpfL6Jdy6owQ82YUPobTs2EfSnLspAGXQ/VqK6Ld+OemJY2ByHXHQ== 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=1777135024; 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=0o/LdUam9SJlmWVnUA69DDtMDGWZkSeufSvPaEY8LL4=; b=IyIrjLZ7c56fTgmrSTGlR6SGMKISc+Xg9b31cAYCZY0mU2SDpC5ebMEdH3ZXhVh13xghCB ENZx55Q6oaFnv+8JB1ucwMAya5v/gO+/YdwMWOO+ZqTruZ6ZKO8CJSlQerLQ9mNvLW7hWM 1ptqBw5ZQoS3BY42H4nHwjMFyZ6OFIGoeAGo9/d026XlOJc9Kr9WGDXtSiJrbJ0rMGgEN3 l5M7OpBuy3R0AWiwFx4sl49LxzJoYjV5NaDbPHjacddAnXuYG39Cor3DQUOQoFizw7Evsm oLBt1fBIryg8ODMRMNx0ttfyZnAy+wSI8khGffvIUXVawWJL2P54geJOFvpoGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g2wTX3lFhzhpb for ; Sat, 25 Apr 2026 16:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 451a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 25 Apr 2026 16:37:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 0f79ce721c25 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 0f79ce721c25486c03f7b9bfa7c57efb815f40f7 Auto-Submitted: auto-generated Date: Sat, 25 Apr 2026 16:37:04 +0000 Message-Id: <69ecedb0.451a0.27172673@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0f79ce721c25486c03f7b9bfa7c57efb815f40f7 commit 0f79ce721c25486c03f7b9bfa7c57efb815f40f7 Author: Enji Cooper AuthorDate: 2026-02-20 06:24:38 +0000 Commit: Enji Cooper CommitDate: 2026-04-25 16:36:55 +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 4007670ab8d9..f4e38736d31f 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 },