From nobody Thu Apr 16 17:50:25 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 4fxQXK3bwfz6ZKRt for ; Thu, 16 Apr 2026 17:50:25 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxQXK37b6z3fwC for ; Thu, 16 Apr 2026 17:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776361825; 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=YzBqTkFlHRugsrw2AsgqbHLJ3R3KkE2OBk8zD8A38Es=; b=OI87bfyfYIK5kC+vZLvx0jMkLiHYGAwQn+OoTnUPnMr094z1uGKM1EaA+NdB82T+ynEV8Q fkmLnAMLU6JL2ZVs6b+NaMdx/b3by0R7cMNl4GIcnwI51zt/bp5Ndff2+jeKl0ZmQp5PKK VbCgwLqPAavuYu3XBeH6U8xJkJZD5D7L9lukThiBTf3ClJzZ98fziFEo2e0d99bMvwFiO7 XoDjWWyL16p+1ZJMdzguX24fVgJz3eeno9LMPjvSJcnjwbu9zGSq3+7dEKoIn8JrUYFQIG 68waUW7U+GTgI4YHO/+YuzszAwaAkShqGElkPgIC+1ATZ5ODvYQSmWMBwaxU/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776361825; a=rsa-sha256; cv=none; b=HGvojHbiKCvVIqd7Cs50d46zjDxQWcILJSCbfG91uVEKDMsMkzdTJZHDcMlm1A2GzIBoXl au34DG8O8FsU3AMn5H8JvWjxP+NVEb9ArKQio91SkqAFh4I5cbxOK0ER8HsfKq7zAdDDAp CsLRlPFVOtynPYgArmd0gcy3FG4yUq5l3i/w7ldOhvK9dItTbMjm6MY25AWaKkWYOoDLYb 8tX4S53D+qKZ08qhKY8bdIs+SrtrGjH0865KijtCOQuuTUhytbH9F7y4ADqYI0HvXYet9q Xx6gKyo+zSlgV7IxNfyqi6ssIf6oA3snvoyW9gwGxKQZE6is5jK3rMCjuhseOQ== 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=1776361825; 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=YzBqTkFlHRugsrw2AsgqbHLJ3R3KkE2OBk8zD8A38Es=; b=tExsv0NyiTLiJC8vpU2bERS6tnCOe3GEItUfHRXIBi5gimW+0IrkqzuS2z3myaKcHzxhyU 75sLbQtUL65haALgKbG01d7fhAGGgyn4GaW7F07TIOZIqaUjrbjjbZdf5L85pZyoK/8T+A Nsh4gTlgBzFgSyvp+R3+Y+iAKhvLn1PnUcMjEBD+f7sZtwYZbxZtRFOIQQdxOPQO+2r3Sv N6G1UnVdKsjWFIoa7eedXfbZ9leFA8sk23KEo31bXseF1uuVmbEMrBP3pIv/7XG+cKmqN2 LFseHOEj6evzgBdhR4cgphnDPTIpc5cnVFFpUOhCm0PcE4DuHQ+tqbGwcBPMdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxQXK2Y5Jz1tp for ; Thu, 16 Apr 2026 17:50:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 375b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 17:50:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 48a05f833c7d - main - stand/libofw: make OF_hasprop() part of the library 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48a05f833c7d0c089d37522cc234039ec823edf4 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 17:50:25 +0000 Message-Id: <69e12161.375b1.47fbd670@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=48a05f833c7d0c089d37522cc234039ec823edf4 commit 48a05f833c7d0c089d37522cc234039ec823edf4 Author: Mitchell Horne AuthorDate: 2026-04-16 17:48:46 +0000 Commit: Mitchell Horne CommitDate: 2026-04-16 17:50:14 +0000 stand/libofw: make OF_hasprop() part of the library Currently it is only needed by powerpc ofwfdt.c, and defined statically there. Make it available as part of libofw, mirroring what we have in the kernel. Two small tweaks are made to the implementation: 1. Return type is changed to bool 2. Return 'true' when OF_getproplen() == 0. This matches the expected semantics of the kernel version, described in OF_hasprop(9). Reviewed by: manu, imp, adrian MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D56429 --- stand/libofw/openfirm.c | 7 +++++++ stand/libofw/openfirm.h | 1 + stand/powerpc/ofw/ofwfdt.c | 6 ------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/stand/libofw/openfirm.c b/stand/libofw/openfirm.c index 1df65784e47a..ce4444262f6d 100644 --- a/stand/libofw/openfirm.c +++ b/stand/libofw/openfirm.c @@ -288,6 +288,13 @@ OF_getencprop(phandle_t package, const char *propname, cell_t *buf, int buflen) return (retval); } +/* Check existence of a property of a package. */ +bool +OF_hasprop(phandle_t node, const char *prop) +{ + return (OF_getproplen(node, prop) >= 0); +} + /* Get the next property of a package. */ int OF_nextprop(phandle_t package, const char *previous, char *buf) diff --git a/stand/libofw/openfirm.h b/stand/libofw/openfirm.h index 35d10c320b57..b4890762b0f9 100644 --- a/stand/libofw/openfirm.h +++ b/stand/libofw/openfirm.h @@ -89,6 +89,7 @@ phandle_t OF_instance_to_package(ihandle_t); int OF_getproplen(phandle_t, const char *); int OF_getprop(phandle_t, const char *, void *, int); int OF_getencprop(phandle_t, const char *, cell_t *, int); +bool OF_hasprop(phandle_t, const char *); int OF_nextprop(phandle_t, const char *, char *); int OF_setprop(phandle_t, const char *, void *, int); int OF_canon(const char *, char *, int); diff --git a/stand/powerpc/ofw/ofwfdt.c b/stand/powerpc/ofw/ofwfdt.c index eeb5f132a3f2..5422924a3b4c 100644 --- a/stand/powerpc/ofw/ofwfdt.c +++ b/stand/powerpc/ofw/ofwfdt.c @@ -32,12 +32,6 @@ extern int command_fdt_internal(int argc, char *argv[]); -static int -OF_hasprop(phandle_t node, const char *prop) -{ - return (OF_getproplen(node, (char *)prop) > 0); -} - static void add_node_to_fdt(void *buffer, phandle_t node, int fdt_offset) {