diff options
| author | Robert Zieba <robertzieba@google.com> | 2023-01-19 18:13:52 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-01-20 17:29:36 +0000 |
| commit | e486f56df8fb4a9a18c7597ba8ff058b3cf5eaf5 (patch) | |
| tree | 25ba7fab11d0e55e8456fd860ab66346aab0d020 | |
| parent | 04c37f5640a98872d088f58f9763546bfd7f66c5 (diff) | |
| download | chrome-ec-e486f56df8fb4a9a18c7597ba8ff058b3cf5eaf5.tar.gz | |
zephyr/shim/led_driver: Update `GET_PROP_NVE` macro
Rename the `GET_PROP_NVE` macro to `GET_COLOR_PROP_NVE` since it now
evaluates to `EC_LED_COLOR_INVALID` instead of -1 as a default.
BRANCH=none
BUG=b:260547985
TEST=Builds
Change-Id: I20c16682d4338dc53776907a766391b0af524716
Signed-off-by: Robert Zieba <robertzieba@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4179862
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/shim/src/led_driver/led.h | 7 | ||||
| -rw-r--r-- | zephyr/shim/src/led_driver/led_gpio.c | 10 | ||||
| -rw-r--r-- | zephyr/shim/src/led_driver/led_pwm.c | 10 |
3 files changed, 14 insertions, 13 deletions
diff --git a/zephyr/shim/src/led_driver/led.h b/zephyr/shim/src/led_driver/led.h index a186d97da9..f1d0110a8d 100644 --- a/zephyr/shim/src/led_driver/led.h +++ b/zephyr/shim/src/led_driver/led.h @@ -21,11 +21,12 @@ (DT_STRING_UPPER_TOKEN(id, prop)), (0)) /* - * Return string-token if the property exists, otherwise return -1 + * Return string-token if the property exists, otherwise return + * EC_LED_COLOR_INVALID. */ -#define GET_PROP_NVE(id, prop) \ +#define GET_COLOR_PROP_NVE(id, prop) \ COND_CODE_1(DT_NODE_HAS_PROP(id, prop), \ - (DT_STRING_UPPER_TOKEN(id, prop)), (-1)) + (DT_STRING_UPPER_TOKEN(id, prop)), (EC_LED_COLOR_INVALID)) #define LED_ENUM(id, enum_name) DT_STRING_TOKEN(id, enum_name) #define LED_ENUM_WITH_COMMA(id, enum_name) \ diff --git a/zephyr/shim/src/led_driver/led_gpio.c b/zephyr/shim/src/led_driver/led_gpio.c index 485383402c..dba2571d9c 100644 --- a/zephyr/shim/src/led_driver/led_gpio.c +++ b/zephyr/shim/src/led_driver/led_gpio.c @@ -31,11 +31,11 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1, DT_INST_FOREACH_CHILD(0, GEN_PINS_ARRAY) -#define SET_PIN_NODE(node_id) \ - { .led_color = GET_PROP(node_id, led_color), \ - .led_id = GET_PROP(node_id, led_id), \ - .br_color = GET_PROP_NVE(node_id, br_color), \ - .gpio_pins = PINS_ARRAY(node_id), \ +#define SET_PIN_NODE(node_id) \ + { .led_color = GET_PROP(node_id, led_color), \ + .led_id = GET_PROP(node_id, led_id), \ + .br_color = GET_COLOR_PROP_NVE(node_id, br_color), \ + .gpio_pins = PINS_ARRAY(node_id), \ .pins_count = DT_PROP_LEN(node_id, led_pins) }; /* diff --git a/zephyr/shim/src/led_driver/led_pwm.c b/zephyr/shim/src/led_driver/led_pwm.c index db6310ca22..bad887a86f 100644 --- a/zephyr/shim/src/led_driver/led_pwm.c +++ b/zephyr/shim/src/led_driver/led_pwm.c @@ -47,11 +47,11 @@ BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1, DT_INST_FOREACH_CHILD(0, GEN_PINS_ARRAY) -#define SET_PIN_NODE(node_id) \ - { .led_color = GET_PROP(node_id, led_color), \ - .led_id = GET_PROP(node_id, led_id), \ - .br_color = GET_PROP_NVE(node_id, br_color), \ - .pwm_pins = PINS_ARRAY(node_id), \ +#define SET_PIN_NODE(node_id) \ + { .led_color = GET_PROP(node_id, led_color), \ + .led_id = GET_PROP(node_id, led_id), \ + .br_color = GET_COLOR_PROP_NVE(node_id, br_color), \ + .pwm_pins = PINS_ARRAY(node_id), \ .pins_count = DT_PROP_LEN(node_id, led_pwms) }; /* |