|
1208 | 1208 | * @return the property's value as a sequence of tokens, with no quotes
|
1209 | 1209 | */
|
1210 | 1210 | #define DT_STRING_UNQUOTED_BY_IDX(node_id, prop, idx) \
|
1211 |
| - DT_CAT4(node_id, _P_, prop##_IDX_##idx, _STRING_UNQUOTED) |
| 1211 | + DT_CAT6(node_id, _P_, prop, _IDX_, idx, _STRING_UNQUOTED) |
1212 | 1212 |
|
1213 | 1213 | /*
|
1214 | 1214 | * phandle properties
|
|
1383 | 1383 | * @return the cell's value or @p default_value
|
1384 | 1384 | */
|
1385 | 1385 | #define DT_PHA_BY_IDX_OR(node_id, pha, idx, cell, default_value) \
|
1386 |
| - DT_PROP_OR(node_id, pha##_IDX_##idx##_VAL_##cell, default_value) |
| 1386 | + DT_PROP_OR(node_id, DT_CAT5(pha, _IDX_, idx, _VAL_, cell), default_value) |
1387 | 1387 |
|
1388 | 1388 | /**
|
1389 | 1389 | * @brief Equivalent to DT_PHA_BY_IDX(node_id, pha, 0, cell)
|
|
1476 | 1476 | * @return the cell's value or @p default_value
|
1477 | 1477 | */
|
1478 | 1478 | #define DT_PHA_BY_NAME_OR(node_id, pha, name, cell, default_value) \
|
1479 |
| - DT_PROP_OR(node_id, pha##_NAME_##name##_VAL_##cell, default_value) |
| 1479 | + DT_PROP_OR(node_id, DT_CAT5(pha, _NAME_, name, _VAL_, cell), default_value) |
1480 | 1480 |
|
1481 | 1481 | /**
|
1482 | 1482 | * @brief Get a phandle's node identifier from a phandle array by @p name
|
|
0 commit comments