Skip to content

devicetree.h: Rework DT_ANY_INST_HAS_PROP_STATUS_OKAY #70385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabiobaltieri merged 1 commit into from
Mar 20, 2024
Merged

devicetree.h: Rework DT_ANY_INST_HAS_PROP_STATUS_OKAY #70385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion include/zephyr/devicetree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4190,7 +4190,7 @@
* @endcode
*/
#define DT_ANY_INST_HAS_PROP_STATUS_OKAY(prop) \
(DT_INST_FOREACH_STATUS_OKAY_VARGS(DT_INST_NODE_HAS_PROP_AND_OR, prop) 0)
COND_CODE_1(IS_EMPTY(DT_ANY_INST_HAS_PROP_STATUS_OKAY_(prop)), (0), (1))

/**
* @brief Call @p fn on all nodes with compatible `DT_DRV_COMPAT`
Expand Down Expand Up @@ -4425,6 +4425,34 @@

/** @cond INTERNAL_HIDDEN */

/** @brief Helper for DT_ANY_INST_HAS_PROP_STATUS_OKAY_
*
* This macro generates token "1," for instance of a device,
* identified by index @p idx, if instance has property @p prop.
*
* @param idx instance number
* @param prop property to check for
*
* @return Macro evaluates to `1,` if instance has the property,
* otherwise it evaluates to literal nothing.
*/
#define DT_ANY_INST_HAS_PROP_STATUS_OKAY__(idx, prop) \
COND_CODE_1(DT_INST_NODE_HAS_PROP(idx, prop), (1,), ())
/** @brief Helper for DT_ANY_INST_HAS_PROP_STATUS_OKAY
*
* This macro uses DT_ANY_INST_HAS_PROP_STATUS_OKAY_ with
* DT_INST_FOREACH_STATUS_OKAY_VARG to generate comma separated list of 1,
* where each 1 on the list represents instance that has a property
* @p prop; the list may be empty, and the upper bound on number of
* list elements is number of device instances.
*
* @param prop property to check
*
* @return Evaluates to list of 1s (e.g: 1,1,1,) or nothing.
*/
#define DT_ANY_INST_HAS_PROP_STATUS_OKAY_(prop) \
DT_INST_FOREACH_STATUS_OKAY_VARGS(DT_ANY_INST_HAS_PROP_STATUS_OKAY__, prop)

#define DT_PATH_INTERNAL(...) \
UTIL_CAT(DT_ROOT, MACRO_MAP_CAT(DT_S_PREFIX, __VA_ARGS__))
/** @brief DT_PATH_INTERNAL() helper: prepends _S_ to a node name
Expand Down
19 changes: 19 additions & 0 deletions tests/lib/devicetree/api/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,25 @@ ZTEST(devicetree_api, test_any_inst_prop)
zassert_equal(DT_ANY_INST_HAS_PROP_STATUS_OKAY(bar), 1, "");
zassert_equal(DT_ANY_INST_HAS_PROP_STATUS_OKAY(baz), 0, "");
zassert_equal(DT_ANY_INST_HAS_PROP_STATUS_OKAY(does_not_exist), 0, "");

zassert_equal(COND_CODE_1(DT_ANY_INST_HAS_PROP_STATUS_OKAY(foo),
(5), (6)),
5, "");
zassert_equal(COND_CODE_0(DT_ANY_INST_HAS_PROP_STATUS_OKAY(foo),
(5), (6)),
6, "");
zassert_equal(COND_CODE_1(DT_ANY_INST_HAS_PROP_STATUS_OKAY(baz),
(5), (6)),
6, "");
zassert_equal(COND_CODE_0(DT_ANY_INST_HAS_PROP_STATUS_OKAY(baz),
(5), (6)),
5, "");
zassert_true(IS_ENABLED(DT_ANY_INST_HAS_PROP_STATUS_OKAY(foo)), "");
zassert_true(!IS_ENABLED(DT_ANY_INST_HAS_PROP_STATUS_OKAY(baz)), "");
zassert_equal(IF_ENABLED(DT_ANY_INST_HAS_PROP_STATUS_OKAY(foo), (1)) + 1,
2, "");
zassert_equal(IF_ENABLED(DT_ANY_INST_HAS_PROP_STATUS_OKAY(baz), (1)) + 1,
1, "");
}

ZTEST(devicetree_api, test_default_prop_access)
Expand Down