From nobody Sat Oct 17 19:49:48 2026 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 4j6XT85TxQz6wgYf for ; Sat, 17 Oct 2026 19:49:48 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4j6XT84Jl0z4v0K for ; Sat, 17 Oct 2026 19:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792266588; 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=SMCS0eKJ0k/iZ+SxvBb0y9RzFtRU+W7uqMw5Iao0Hz4=; b=p3wNFtlTs8O5mY9diw9GTsvNAg7hidCE2Q2gMbS13XQV/ktNEzubTrAErgc7h5LTV49VzJ hTc6zhkUF0XPp6cC0c61OQ/GcSvGNffiTFJhnLcWQMBotXAUSjzhQGr+xcYkoksnzuMO7A zTCRl/xIYepIuONk4kKbEAljuEoNoi8WGhz82PR5Os8tTmZ9Wu3jV+pajECm/IHOEhPfy9 6LYHFQi59u2LENG9EUrrWvSsAP3ZN0jV6kLS7FtZTtAfVdt05NICH3eGeRATPUdvbzpBp5 UoIFwY8KncB5222m6WJABNypaZnQ7JvIS07nVVJsIfXVN/SL3nSBJn1Zaqymig== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792266588; b=GUjb3WGZjGEJP+ZhJy/8dqauSw6+KEwU5bJrLvadKuYupr44k371/83kiB1jJIUKYSEx0Y maPyB09jZiL89Dvtg+v5PVkeYpj23vi6v4blwpoUEPU+Jf+etn1RMJ7ZSbhIUx3dojsiZm DbtGBUWdkmBEuBgbliHGFwqhIrELR4dYYs0W3TiKkwGvuf1sKPAFKfctJZ/QYRZUP1gPO0 /zgVmnsFRPefZ6EenqQrCZZk2mEwep9zxNnlFPCwiU/8InG9mJ88AVADT5QQzisQF868+8 Xwr6cBmG1DN9PiqDDNRZHbdn7YBOlpELOaLDkYF0HSNXjAnReLjuCHhO0OvHoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792266588; 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=SMCS0eKJ0k/iZ+SxvBb0y9RzFtRU+W7uqMw5Iao0Hz4=; b=JUDOmfkiYQZd/CafPM2DTdjVWh19Uj7Ka0AB5ZzVY6tagg0Q40MRB5Bwq2edN8xV5fWZdM Rtr2mCbFKZk4W7wkPK/7Tdaj/rcVPI8XAOmtE7Oi2pn/ip2+VuRYdlNV5bKkDCmtzEJR8J +fSxk+Zr3lZMpu09mqnvS0Gf1SZGV3vEBeCV2VBx7d5Y7TTLZXXXgW6kZ8b+Ui80zrld0i ZhUTf/Yaakbst/me33LAzKo61BE+u0ipHhH7FLeE4+bL3xkDlgec+gAubg1YyB22Su92G1 d8NuFhsd2UrEVHO2NtWWlib7zLsfbYY/cJjyOzTMrqyWfZ1cVI+mJevvSIdHZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j6XT833zfzGP6 for ; Sat, 17 Oct 2026 19:49:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32742 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 17 Oct 2026 19:49:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Abdelkader Boudih Subject: git: 4a059dac7815 - main - acpi_apple: make the device mode a typed enum List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a059dac78157e6163d6e8ed6e7be5ec65a78a5f Auto-Submitted: auto-generated Date: Sat, 17 Oct 2026 19:49:48 +0000 Message-Id: <6ad3d15c.32742.5f78ff8d@gitrepo.freebsd.org> The branch main has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=4a059dac78157e6163d6e8ed6e7be5ec65a78a5f commit 4a059dac78157e6163d6e8ed6e7be5ec65a78a5f Author: Abdelkader Boudih AuthorDate: 2026-10-17 19:49:19 +0000 Commit: Abdelkader Boudih CommitDate: 2026-10-17 19:49:19 +0000 acpi_apple: make the device mode a typed enum The two mode values were spelled as bit flags, but a device is exactly one of the two and the dispatch compared the field for equality. Turned them into an enum, type the softc field with it, and dispatch with a switch that lists every value No functional change. Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D60793 --- sys/dev/acpi_apple/acpi_apple.c | 15 +++++++++++---- sys/dev/acpi_apple/acpi_apple.h | 8 +++++--- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sys/dev/acpi_apple/acpi_apple.c b/sys/dev/acpi_apple/acpi_apple.c index 4425cb27d8f9..d0efca087b20 100644 --- a/sys/dev/acpi_apple/acpi_apple.c +++ b/sys/dev/acpi_apple/acpi_apple.c @@ -77,10 +77,13 @@ acpi_apple_attach(device_t dev) else sc->mode = ACPI_APPLE_PLATFORM; - if (sc->mode == ACPI_APPLE_PLATFORM) + switch (sc->mode) { + case ACPI_APPLE_PLATFORM: return (acpi_apple_platform_attach(sc)); - else + case ACPI_APPLE_BACKLIGHT: return (acpi_apple_backlight_attach(sc)); + } + return (ENXIO); } static int @@ -89,10 +92,14 @@ acpi_apple_detach(device_t dev) struct acpi_apple_softc *sc; sc = device_get_softc(dev); - if (sc->mode == ACPI_APPLE_PLATFORM) + switch (sc->mode) { + case ACPI_APPLE_PLATFORM: acpi_apple_platform_detach(sc); - else + break; + case ACPI_APPLE_BACKLIGHT: acpi_apple_backlight_detach(sc); + break; + } return (0); } diff --git a/sys/dev/acpi_apple/acpi_apple.h b/sys/dev/acpi_apple/acpi_apple.h index cfd7b65f53c9..4e02b43559de 100644 --- a/sys/dev/acpi_apple/acpi_apple.h +++ b/sys/dev/acpi_apple/acpi_apple.h @@ -21,8 +21,10 @@ #include #include -#define ACPI_APPLE_PLATFORM 0x01 /* WoL + lid (APP000B/APP9876) */ -#define ACPI_APPLE_BACKLIGHT 0x02 /* panel backlight (APP0002) */ +enum acpi_apple_mode { + ACPI_APPLE_PLATFORM, /* WoL + lid (APP000B/APP9876) */ + ACPI_APPLE_BACKLIGHT, /* panel backlight (APP0002) */ +}; /* * Apple GMUX (GPU multiplexer) registers. @@ -116,7 +118,7 @@ struct apple_bl_hw { struct acpi_apple_softc { device_t dev; ACPI_HANDLE handle; - int mode; + enum acpi_apple_mode mode; /* Backlight */ struct mtx bl_mtx; /* protects hw access + cache */