From nobody Tue May 12 09:53:05 2026 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 4gFBjY2HBkz6dPDn for ; Tue, 12 May 2026 09:53:05 +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 4gFBjY1Twkz3Vl9 for ; Tue, 12 May 2026 09:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778579585; 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=P6QfCeNyUe55iwYIgv2yjKUkbD7a+4qlFO6eYxGlUtw=; b=X7gqTCygX7ALw7qjFXPygdqt/3o9c9AMQBZt4TBOczm6pDONWWL4E0lQ5Zk+3hS9LyXAKt f0FlgTzGo7N3IjWh5PBiK8yDPssLeTweleRwDOM+F6Y35Umu3HnAOWj3pftiabqINXgUTZ vg0NPWOvlodc9oEljHGvSgkG8i1rbnq2kRKILNQNlZcVxXPogH/4vQ2lN2Rcrs5V7L8dBq DOR13iU6Log91C66WS35VBZYPgfqMpvSYBsMqchSk61bMvhNCPwtF/jqrBIHHXpmCrWzSl gpqyWndGS7Wlr1+GP5y6YjZeXnBUg/GPLXPTsOmptWALwECZ+ZX8c8QngtjNOg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778579585; a=rsa-sha256; cv=none; b=OJZfBSMia/OcchT70LvMG6W3q2U7mwpRB8PsmK1FYx9xvjrQmohafXTv/NlLUix3gIlRqo 7x4B3xW930ZNIA0qRYijXR3R9h2oNXZQt8PHTvBH4J94CfDogA2GqxK1gdBuQx+IPb1bt3 Sd4XFrqb1JUeODMaQ/Ox9/O6bg+nnQL7VJdNqMZRPeIkOgv68AplVAuusMRjdaaBQOVZJ7 7BJEenr7vlRnNcySN5YWDUSKqx1SjK92lbbGaREE6Qmcv51QIFkIJLmEqXrHRK9B8/FrP3 NAdYvnbmFcsATXVi2FEtzYM58bAfpFCSbMqla6INelmTOx2MgpO30i4saJuhtQ== 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=1778579585; 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=P6QfCeNyUe55iwYIgv2yjKUkbD7a+4qlFO6eYxGlUtw=; b=UN8K2l27YgcOhkuybK3xQyR9utIugoJMhEKVwkqhMvmOn8ch1DJHX5Ezmkhk8mFvgdUA5m vY+ejT3sSuEmTDuCBp45GNf6Au8xcZXFJzy1d5LhhQbtKMg0tszWs32EgMMAgCfXbhfBDJ 6p0P4JGvzYnlvT67YHdEOQsqorM4BSpE4A0V4bplsR9s0QTaPvcTGe8ULlH4EEY6wbT21U 4pfi4hhEczn6i9RJjnMC/jHaz/aA7J8JBfj1pPbzl6wUAD6DOa6+u59eCIVTd/0A/uXuws fUmPB33gzhlpfZGwpUZlwk7rSKaEE+2sf53nQvVmER8a3DqSxxW0tEN47WWVpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFBjY13PbzyKj for ; Tue, 12 May 2026 09:53:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39142 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 12 May 2026 09:53:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Aymeric Wibo Subject: git: 6f451c60918f - main - power: Rename power transition enum 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obiwac X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f451c60918f2152ebe89f561f04e5219cecffa6 Auto-Submitted: auto-generated Date: Tue, 12 May 2026 09:53:05 +0000 Message-Id: <6a02f881.39142.4116e66@gitrepo.freebsd.org> The branch main has been updated by obiwac: URL: https://cgit.FreeBSD.org/src/commit/?id=6f451c60918f2152ebe89f561f04e5219cecffa6 commit 6f451c60918f2152ebe89f561f04e5219cecffa6 Author: Aymeric Wibo AuthorDate: 2026-05-12 09:46:19 +0000 Commit: Aymeric Wibo CommitDate: 2026-05-12 09:46:24 +0000 power: Rename power transition enum Just so it isn't so long. Changing now before the API freezes, after discussion with olce@. While here, improve the wording in the comments for power transitions and sleep types a bit. Reviewed by: olce Approved by: olce Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56953 --- sys/dev/acpi_support/acpi_ibm.c | 2 +- sys/dev/syscons/syscons.c | 4 ++-- sys/dev/vt/vt_core.c | 4 ++-- sys/kern/subr_power.c | 8 ++++---- sys/sys/power.h | 19 ++++++++++--------- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/sys/dev/acpi_support/acpi_ibm.c b/sys/dev/acpi_support/acpi_ibm.c index 1221384e7d8a..2967832a0878 100644 --- a/sys/dev/acpi_support/acpi_ibm.c +++ b/sys/dev/acpi_support/acpi_ibm.c @@ -1453,7 +1453,7 @@ acpi_ibm_eventhandler(struct acpi_ibm_softc *sc, int arg) * instead of suspend-to-RAM. */ case IBM_EVENT_SUSPEND_TO_RAM: - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case IBM_EVENT_BLUETOOTH: diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 1a2969d6f2d8..fe440b68f209 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -3987,10 +3987,10 @@ next_code: break; case SUSP: - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); break; case STBY: - power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); + power_pm_suspend(POWER_TRANSITION_STANDBY); break; case DBG: diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index f7cffcea5b92..68e9f45cff56 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -804,11 +804,11 @@ vt_machine_kbdevent(struct vt_device *vd, int c) return (1); case SPCLKEY | STBY: /* XXX Not present in kbdcontrol parser. */ /* Put machine into Stand-By mode. */ - power_pm_suspend(POWER_SSTATE_TRANSITION_STANDBY); + power_pm_suspend(POWER_TRANSITION_STANDBY); return (1); case SPCLKEY | SUSP: /* kbdmap(5) keyword `susp`. */ /* Suspend machine. */ - power_pm_suspend(POWER_SSTATE_TRANSITION_SUSPEND); + power_pm_suspend(POWER_TRANSITION_SUSPEND); return (1); } diff --git a/sys/kern/subr_power.c b/sys/kern/subr_power.c index 761c9c0639ce..47682a0ee75e 100644 --- a/sys/kern/subr_power.c +++ b/sys/kern/subr_power.c @@ -176,7 +176,7 @@ power_pm_get_type(void) } void -power_pm_suspend(enum power_sstate_transition trans) +power_pm_suspend(enum power_transition trans) { enum power_stype stype; @@ -184,13 +184,13 @@ power_pm_suspend(enum power_sstate_transition trans) return; switch (trans) { - case POWER_SSTATE_TRANSITION_STANDBY: + case POWER_TRANSITION_STANDBY: stype = power_standby_stype; break; - case POWER_SSTATE_TRANSITION_SUSPEND: + case POWER_TRANSITION_SUSPEND: stype = power_suspend_stype; break; - case POWER_SSTATE_TRANSITION_HIBERNATE: + case POWER_TRANSITION_HIBERNATE: stype = power_hibernate_stype; break; default: diff --git a/sys/sys/power.h b/sys/sys/power.h index 85e0b12391ff..e420717e1aa7 100644 --- a/sys/sys/power.h +++ b/sys/sys/power.h @@ -48,21 +48,22 @@ * Sleep state transition requests. * * These are high-level sleep states that the system can enter. They map to - * a specific generic sleep type (enum power_stype). + * a specific generic sleep type (enum power_stype), depending on the + * kern.power.* sysctls. */ -enum power_sstate_transition { - POWER_SSTATE_TRANSITION_STANDBY, - POWER_SSTATE_TRANSITION_SUSPEND, - POWER_SSTATE_TRANSITION_HIBERNATE, +enum power_transition { + POWER_TRANSITION_STANDBY, + POWER_TRANSITION_SUSPEND, + POWER_TRANSITION_HIBERNATE, }; /* * Sleep type. * * These are the specific generic methods of entering a sleep state. E.g. - * POWER_SSTATE_TRANSITION_SUSPEND could be set to enter either suspend-to-RAM - * (which is S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI systems). - * This would be done through the kern.power.suspend sysctl. + * POWER_TRANSITION_SUSPEND could be set to enter either firmware suspend (which + * is suspend-to-RAM or S3 on ACPI systems), or suspend-to-idle (S0ix on ACPI + * platforms). This would be done through the kern.power.suspend sysctl. */ enum power_stype { POWER_STYPE_AWAKE, @@ -96,7 +97,7 @@ extern int power_pm_register(u_int _pm_type, power_pm_fn_t _pm_fn, void *_pm_arg, bool _pm_supported[static POWER_STYPE_COUNT]); extern u_int power_pm_get_type(void); -extern void power_pm_suspend(enum power_sstate_transition _trans); +extern void power_pm_suspend(enum power_transition _trans); /* * System power API.