Skip to content

Commit 4e93b77

Browse files
galakgalak
committed
samples: Convert DT_ALIAS_* to new DT_ALIAS() macro
Convert DT_ALIAS_* defines to use DT_ALIAS() plus other macros from include/devicetree.h. Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
1 parent cdd629c commit 4e93b77

File tree

36 files changed

+429
-368
lines changed

36 files changed

+429
-368
lines changed

‎samples/basic/blink_led/src/main.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
#include <device.h>
1616
#include <drivers/pwm.h>
1717

18-
#if defined(DT_ALIAS_PWM_LED0_PWMS_CONTROLLER) && defined(DT_ALIAS_PWM_LED0_PWMS_CHANNEL)
18+
#if DT_NODE_HAS_PROP(DT_ALIAS(pwm_led0), pwms) && \
19+
DT_PHA_HAS_CELL(DT_ALIAS(pwm_led0), pwms, channel)
1920
/* get the defines from dt (based on alias 'pwm-led0') */
20-
#define PWM_DRIVER DT_ALIAS_PWM_LED0_PWMS_CONTROLLER
21-
#define PWM_CHANNEL DT_ALIAS_PWM_LED0_PWMS_CHANNEL
22-
#ifdef DT_ALIAS_PWM_LED0_PWMS_FLAGS
23-
#define PWM_FLAGS DT_ALIAS_PWM_LED0_PWMS_FLAGS
21+
#define PWM_DRIVER DT_PWMS_LABEL(DT_ALIAS(pwm_led0))
22+
#define PWM_CHANNEL DT_PWMS_CHANNEL(DT_ALIAS(pwm_led0))
23+
#if DT_PHA_HAS_CELL(DT_ALIAS(pwm_led0), pwms, flags)
24+
#define PWM_FLAGS DT_PWMS_FLAGS(DT_ALIAS(pwm_led0))
2425
#else
2526
#define PWM_FLAGS 0
2627
#endif

‎samples/basic/button/README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ have defined the SW0_* variables.
1818
To use this sample, you will require a board that defines the user switch in its
1919
header file. The :file:`board.h` must define the following variables:
2020

21-
- SW0_GPIO_NAME (or DT_ALIAS_SW0_GPIOS_CONTROLLER)
22-
- DT_ALIAS_SW0_GPIOS_PIN
21+
- SW0_GPIO_NAME (or DT_GPIO_LABEL(DT_ALIAS(sw0), gpios))
22+
- DT_GPIO_PIN(DT_ALIAS(sw0), gpios)
2323

2424
Alternatively, this could also be done by defining 'sw0' alias in the board
2525
devicetree description file.

‎samples/basic/button/src/main.c

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313

1414
#define SLEEP_TIME_MS 1
1515

16-
#ifdef DT_ALIAS_SW0_GPIOS_FLAGS
17-
#define SW0_FLAGS DT_ALIAS_SW0_GPIOS_FLAGS
16+
#if DT_PHA_HAS_CELL(DT_ALIAS(sw0), gpios, flags)
17+
#define SW0_FLAGS DT_GPIO_FLAGS(DT_ALIAS(sw0), gpios)
1818
#else
1919
#define SW0_FLAGS 0
2020
#endif
2121

22-
#ifdef DT_ALIAS_LED0_GPIOS_FLAGS
23-
#define LED0_FLAGS DT_ALIAS_LED0_GPIOS_FLAGS
22+
#if DT_PHA_HAS_CELL(DT_ALIAS(led0), gpios, flags)
23+
#define LED0_FLAGS DT_GPIO_FLAGS(DT_ALIAS(led0), gpios)
2424
#else
2525
#define LED0_FLAGS 0
2626
#endif
@@ -38,59 +38,63 @@ void main(void)
3838
struct device *dev_button;
3939
int ret;
4040

41-
dev_button = device_get_binding(DT_ALIAS_SW0_GPIOS_CONTROLLER);
41+
dev_button = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(sw0), gpios));
4242
if (dev_button == NULL) {
4343
printk("Error: didn't find %s device\n",
44-
DT_ALIAS_SW0_GPIOS_CONTROLLER);
44+
DT_GPIO_LABEL(DT_ALIAS(sw0), gpios));
4545
return;
4646
}
4747

48-
ret = gpio_pin_configure(dev_button, DT_ALIAS_SW0_GPIOS_PIN,
48+
ret = gpio_pin_configure(dev_button, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
4949
SW0_FLAGS | GPIO_INPUT);
5050
if (ret != 0) {
5151
printk("Error %d: failed to configure pin %d '%s'\n",
52-
ret, DT_ALIAS_SW0_GPIOS_PIN, DT_ALIAS_SW0_LABEL);
52+
ret, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
53+
DT_LABEL(DT_ALIAS(sw0)));
5354
return;
5455
}
5556

56-
ret = gpio_pin_interrupt_configure(dev_button, DT_ALIAS_SW0_GPIOS_PIN,
57+
ret = gpio_pin_interrupt_configure(dev_button,
58+
DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
5759
GPIO_INT_EDGE_TO_ACTIVE);
5860
if (ret != 0) {
5961
printk("Error %d: failed to configure interrupt on pin %d '%s'\n",
60-
ret, DT_ALIAS_SW0_GPIOS_PIN, DT_ALIAS_SW0_LABEL);
62+
ret, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
63+
DT_LABEL(DT_ALIAS(sw0)));
6164
return;
6265
}
6366

6467
gpio_init_callback(&button_cb_data, button_pressed,
65-
BIT(DT_ALIAS_SW0_GPIOS_PIN));
68+
BIT(DT_GPIO_PIN(DT_ALIAS(sw0), gpios)));
6669
gpio_add_callback(dev_button, &button_cb_data);
6770

68-
#ifdef DT_ALIAS_LED0_GPIOS_CONTROLLER
71+
#if DT_NODE_HAS_PROP(DT_ALIAS(led0), gpios)
6972
struct device *dev_led;
7073

71-
dev_led = device_get_binding(DT_ALIAS_LED0_GPIOS_CONTROLLER);
74+
dev_led = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(led0), gpios));
7275
if (dev_led == NULL) {
7376
printk("Error: didn't find %s device\n",
74-
DT_ALIAS_LED0_GPIOS_CONTROLLER);
77+
DT_GPIO_LABEL(DT_ALIAS(led0), gpios));
7578
return;
7679
}
7780

78-
ret = gpio_pin_configure(dev_led, DT_ALIAS_LED0_GPIOS_PIN,
81+
ret = gpio_pin_configure(dev_led, DT_GPIO_PIN(DT_ALIAS(led0), gpios),
7982
LED0_FLAGS | GPIO_OUTPUT);
8083
if (ret != 0) {
8184
printk("Error %d: failed to configure pin %d '%s'\n",
82-
ret, DT_ALIAS_LED0_GPIOS_PIN, DT_ALIAS_LED0_LABEL);
85+
ret, DT_GPIO_PIN(DT_ALIAS(led0), gpios),
86+
DT_LABEL(DT_ALIAS(led0)));
8387
return;
8488
}
8589
#endif
86-
printk("Press %s on the board\n", DT_ALIAS_SW0_LABEL);
90+
printk("Press %s on the board\n", DT_LABEL(DT_ALIAS(sw0)));
8791

8892
while (1) {
89-
#ifdef DT_ALIAS_LED0_GPIOS_CONTROLLER
93+
#if DT_NODE_HAS_PROP(DT_ALIAS(led0), gpios)
9094
bool val;
9195

92-
val = gpio_pin_get(dev_button, DT_ALIAS_SW0_GPIOS_PIN);
93-
gpio_pin_set(dev_led, DT_ALIAS_LED0_GPIOS_PIN, val);
96+
val = gpio_pin_get(dev_button, DT_GPIO_PIN(DT_ALIAS(sw0), gpios));
97+
gpio_pin_set(dev_led, DT_GPIO_PIN(DT_ALIAS(led0), gpios), val);
9498
k_msleep(SLEEP_TIME_MS);
9599
#endif
96100
}

‎samples/basic/fade_led/src/main.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
#include <device.h>
1616
#include <drivers/pwm.h>
1717

18-
#if defined(DT_ALIAS_PWM_LED0_PWMS_CONTROLLER) && defined(DT_ALIAS_PWM_LED0_PWMS_CHANNEL)
18+
#if DT_NODE_HAS_PROP(DT_ALIAS(pwm_led0), pwms) && \
19+
DT_PHA_HAS_CELL(DT_ALIAS(pwm_led0), pwms, channel)
1920
/* get the defines from dt (based on alias 'pwm-led0') */
20-
#define PWM_DRIVER DT_ALIAS_PWM_LED0_PWMS_CONTROLLER
21-
#define PWM_CHANNEL DT_ALIAS_PWM_LED0_PWMS_CHANNEL
22-
#ifdef DT_ALIAS_PWM_LED0_PWMS_FLAGS
23-
#define PWM_FLAGS DT_ALIAS_PWM_LED0_PWMS_FLAGS
21+
#define PWM_DRIVER DT_PWMS_LABEL(DT_ALIAS(pwm_led0))
22+
#define PWM_CHANNEL DT_PWMS_CHANNEL(DT_ALIAS(pwm_led0))
23+
#if DT_PHA_HAS_CELL(DT_ALIAS(pwm_led0), pwms, flags)
24+
#define PWM_FLAGS DT_PWMS_FLAGS(DT_ALIAS(pwm_led0))
2425
#else
2526
#define PWM_FLAGS 0
2627
#endif

‎samples/basic/rgb_led/src/main.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,33 @@
1515
#include <device.h>
1616
#include <drivers/pwm.h>
1717

18-
#if defined(DT_ALIAS_RED_PWM_LED_PWMS_CONTROLLER) && \
19-
defined(DT_ALIAS_RED_PWM_LED_PWMS_CHANNEL) && \
20-
defined(DT_ALIAS_GREEN_PWM_LED_PWMS_CONTROLLER) && \
21-
defined(DT_ALIAS_GREEN_PWM_LED_PWMS_CHANNEL) && \
22-
defined(DT_ALIAS_BLUE_PWM_LED_PWMS_CONTROLLER) && \
23-
defined(DT_ALIAS_BLUE_PWM_LED_PWMS_CHANNEL)
18+
#if DT_NODE_HAS_PROP(DT_ALIAS(red_pwm_led), pwms) && \
19+
DT_PHA_HAS_CELL(DT_ALIAS(red_pwm_led), pwms, channel) && \
20+
DT_NODE_HAS_PROP(DT_ALIAS(green_pwm_led), pwms) && \
21+
DT_PHA_HAS_CELL(DT_ALIAS(green_pwm_led), pwms, channel) && \
22+
DT_NODE_HAS_PROP(DT_ALIAS(blue_pwm_led), pwms) && \
23+
DT_PHA_HAS_CELL(DT_ALIAS(blue_pwm_led), pwms, channel)
2424
/* Get the defines from dt (based on aliases 'red-pwm-led', 'green-pwm-led' &
2525
* 'blue-pwm-led')
2626
*/
27-
#define PWM_DEV0 DT_ALIAS_RED_PWM_LED_PWMS_CONTROLLER
28-
#define PWM_CH0 DT_ALIAS_RED_PWM_LED_PWMS_CHANNEL
29-
#ifdef DT_ALIAS_RED_PWM_LED_PWMS_FLAGS
30-
#define PWM_FLAGS0 DT_ALIAS_RED_PWM_LED_PWMS_FLAGS
27+
#define PWM_DEV0 DT_PWMS_LABEL(DT_ALIAS(red_pwm_led))
28+
#define PWM_CH0 DT_PWMS_CHANNEL(DT_ALIAS(red_pwm_led))
29+
#if DT_PHA_HAS_CELL(DT_ALIAS(red_pwm_led), pwms, flags)
30+
#define PWM_FLAGS0 DT_PWMS_FLAGS(DT_ALIAS(red_pwm_led))
3131
#else
3232
#define PWM_FLAGS0 0
3333
#endif
34-
#define PWM_DEV1 DT_ALIAS_GREEN_PWM_LED_PWMS_CONTROLLER
35-
#define PWM_CH1 DT_ALIAS_GREEN_PWM_LED_PWMS_CHANNEL
36-
#ifdef DT_ALIAS_GREEN_PWM_LED_PWMS_FLAGS
37-
#define PWM_FLAGS1 DT_ALIAS_GREEN_PWM_LED_PWMS_FLAGS
34+
#define PWM_DEV1 DT_PWMS_LABEL(DT_ALIAS(green_pwm_led))
35+
#define PWM_CH1 DT_PWMS_CHANNEL(DT_ALIAS(green_pwm_led))
36+
#if DT_PHA_HAS_CELL(DT_ALIAS(green_pwm_led), pwms, flags)
37+
#define PWM_FLAGS1 DT_PWMS_FLAGS(DT_ALIAS(green_pwm_led))
3838
#else
3939
#define PWM_FLAGS1 0
4040
#endif
41-
#define PWM_DEV2 DT_ALIAS_BLUE_PWM_LED_PWMS_CONTROLLER
42-
#define PWM_CH2 DT_ALIAS_BLUE_PWM_LED_PWMS_CHANNEL
43-
#ifdef DT_ALIAS_BLUE_PWM_LED_PWMS_FLAGS
44-
#define PWM_FLAGS2 DT_ALIAS_BLUE_PWM_LED_PWMS_FLAGS
41+
#define PWM_DEV2 DT_PWMS_LABEL(DT_ALIAS(blue_pwm_led))
42+
#define PWM_CH2 DT_PWMS_CHANNEL(DT_ALIAS(blue_pwm_led))
43+
#if DT_PHA_HAS_CELL(DT_ALIAS(blue_pwm_led), pwms, flags)
44+
#define PWM_FLAGS2 DT_PWMS_FLAGS(DT_ALIAS(blue_pwm_led))
4545
#else
4646
#define PWM_FLAGS2 0
4747
#endif

‎samples/basic/servo_motor/src/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include <device.h>
1616
#include <drivers/pwm.h>
1717

18-
#ifndef DT_ALIAS_PWM_0_LABEL
18+
#if !DT_HAS_NODE(DT_ALIAS(pwm_0))
1919
#error "Choose supported board or add new board for the application"
2020
#endif
2121

@@ -38,7 +38,7 @@ void main(void)
3838

3939
printk("PWM demo app-servo control\n");
4040

41-
pwm_dev = device_get_binding(DT_ALIAS_PWM_0_LABEL);
41+
pwm_dev = device_get_binding(DT_LABEL(DT_ALIAS(pwm_0)));
4242
if (!pwm_dev) {
4343
printk("Cannot find PWM device!\n");
4444
return;

‎samples/basic/threads/src/main.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ struct printk_data_t {
2525

2626
K_FIFO_DEFINE(printk_fifo);
2727

28-
#ifdef DT_ALIAS_LED0_GPIOS_FLAGS
29-
#define LED0_FLAGS DT_ALIAS_LED0_GPIOS_FLAGS
28+
#if DT_PHA_HAS_CELL(DT_ALIAS(led0), gpios, flags)
29+
#define LED0_FLAGS DT_GPIO_FLAGS(DT_ALIAS(led0), gpios)
3030
#else
3131
#define LED0_FLAGS 0
3232
#endif
3333

34-
#ifdef DT_ALIAS_LED1_GPIOS_FLAGS
35-
#define LED1_FLAGS DT_ALIAS_LED1_GPIOS_FLAGS
34+
#if DT_PHA_HAS_CELL(DT_ALIAS(led1), gpios, flags)
35+
#define LED1_FLAGS DT_GPIO_FLAGS(DT_ALIAS(led1), gpios)
3636
#else
3737
#define LED1_FLAGS 0
3838
#endif
@@ -82,9 +82,9 @@ void blink(const struct led *led, u32_t sleep_ms, u32_t id)
8282
void blink1(void)
8383
{
8484
const struct led led1 = {
85-
.gpio_dev_name = DT_ALIAS_LED0_GPIOS_CONTROLLER,
86-
.gpio_pin_name = DT_ALIAS_LED0_LABEL,
87-
.gpio_pin = DT_ALIAS_LED0_GPIOS_PIN,
85+
.gpio_dev_name = DT_GPIO_LABEL(DT_ALIAS(led0), gpios),
86+
.gpio_pin_name = DT_LABEL(DT_ALIAS(led0)),
87+
.gpio_pin = DT_GPIO_PIN(DT_ALIAS(led0), gpios),
8888
.gpio_flags = GPIO_OUTPUT | LED0_FLAGS,
8989
};
9090

@@ -94,9 +94,9 @@ void blink1(void)
9494
void blink2(void)
9595
{
9696
const struct led led2 = {
97-
.gpio_dev_name = DT_ALIAS_LED1_GPIOS_CONTROLLER,
98-
.gpio_pin_name = DT_ALIAS_LED1_LABEL,
99-
.gpio_pin = DT_ALIAS_LED1_GPIOS_PIN,
97+
.gpio_dev_name = DT_GPIO_LABEL(DT_ALIAS(led1), gpios),
98+
.gpio_pin_name = DT_LABEL(DT_ALIAS(led1)),
99+
.gpio_pin = DT_GPIO_PIN(DT_ALIAS(led1), gpios),
100100
.gpio_flags = GPIO_OUTPUT | LED1_FLAGS,
101101
};
102102

‎samples/bluetooth/mesh/src/microbit.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,15 @@ static void configure_button(void)
3030
{
3131
static struct gpio_callback button_cb;
3232

33-
gpio = device_get_binding(DT_ALIAS_SW0_GPIOS_CONTROLLER);
33+
gpio = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(sw0), gpios));
3434

35-
gpio_pin_configure(gpio, DT_ALIAS_SW0_GPIOS_PIN,
36-
GPIO_INPUT | DT_ALIAS_SW0_GPIOS_FLAGS);
37-
gpio_pin_interrupt_configure(gpio, DT_ALIAS_SW0_GPIOS_PIN,
35+
gpio_pin_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
36+
GPIO_INPUT | DT_GPIO_FLAGS(DT_ALIAS(sw0), gpios));
37+
gpio_pin_interrupt_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
3838
GPIO_INT_EDGE_TO_ACTIVE);
3939

40-
gpio_init_callback(&button_cb, button_pressed, BIT(DT_ALIAS_SW0_GPIOS_PIN));
40+
gpio_init_callback(&button_cb, button_pressed,
41+
BIT(DT_GPIO_PIN(DT_ALIAS(sw0), gpios)));
4142

4243
gpio_add_callback(gpio, &button_cb);
4344
}
@@ -53,7 +54,7 @@ void board_output_number(bt_mesh_output_action_t action, u32_t number)
5354

5455
oob_number = number;
5556

56-
gpio_pin_interrupt_configure(gpio, DT_ALIAS_SW0_GPIOS_PIN,
57+
gpio_pin_interrupt_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
5758
GPIO_INT_EDGE_TO_ACTIVE);
5859

5960
mb_display_image(disp, MB_DISPLAY_MODE_DEFAULT, K_FOREVER, &arrow, 1);
@@ -69,7 +70,7 @@ void board_prov_complete(void)
6970
{ 0, 1, 1, 1, 0 });
7071

7172

72-
gpio_pin_interrupt_configure(gpio, DT_ALIAS_SW0_GPIOS_PIN,
73+
gpio_pin_interrupt_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
7374
GPIO_INT_DISABLE);
7475

7576
mb_display_image(disp, MB_DISPLAY_MODE_DEFAULT, K_SECONDS(10),

‎samples/bluetooth/mesh_demo/src/microbit.c

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ static void button_pressed(struct device *dev, struct gpio_callback *cb,
4646
{
4747
struct mb_display *disp = mb_display_get();
4848

49-
if (pins & BIT(DT_ALIAS_SW0_GPIOS_PIN)) {
49+
if (pins & BIT(DT_GPIO_PIN(DT_ALIAS(sw0), gpios))) {
5050
k_work_submit(&button_work);
5151
} else {
5252
u16_t target = board_set_target();
@@ -228,20 +228,21 @@ static void configure_button(void)
228228

229229
k_work_init(&button_work, button_send_pressed);
230230

231-
gpio = device_get_binding(DT_ALIAS_SW0_GPIOS_CONTROLLER);
231+
gpio = device_get_binding(DT_GPIO_LABEL(DT_ALIAS(sw0), gpios));
232232

233-
gpio_pin_configure(gpio, DT_ALIAS_SW0_GPIOS_PIN,
234-
GPIO_INPUT | DT_ALIAS_SW0_GPIOS_FLAGS);
235-
gpio_pin_interrupt_configure(gpio, DT_ALIAS_SW0_GPIOS_PIN,
233+
gpio_pin_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
234+
GPIO_INPUT | DT_GPIO_FLAGS(DT_ALIAS(sw0), gpios));
235+
gpio_pin_interrupt_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw0), gpios),
236236
GPIO_INT_EDGE_TO_ACTIVE);
237237

238-
gpio_pin_configure(gpio, DT_ALIAS_SW1_GPIOS_PIN,
239-
GPIO_INPUT | DT_ALIAS_SW1_GPIOS_FLAGS);
240-
gpio_pin_interrupt_configure(gpio, DT_ALIAS_SW1_GPIOS_PIN,
238+
gpio_pin_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw1), gpios),
239+
GPIO_INPUT | DT_GPIO_FLAGS(DT_ALIAS(sw1), gpios));
240+
gpio_pin_interrupt_configure(gpio, DT_GPIO_PIN(DT_ALIAS(sw1), gpios),
241241
GPIO_INT_EDGE_TO_ACTIVE);
242242

243243
gpio_init_callback(&button_cb, button_pressed,
244-
BIT(DT_ALIAS_SW0_GPIOS_PIN) | BIT(DT_ALIAS_SW1_GPIOS_PIN));
244+
BIT(DT_GPIO_PIN(DT_ALIAS(sw0), gpios)) |
245+
BIT(DT_GPIO_PIN(DT_ALIAS(sw1), gpios)));
245246
gpio_add_callback(gpio, &button_cb);
246247
}
247248

‎samples/bluetooth/st_ble_sensor/src/button_svc.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727

2828
LOG_MODULE_REGISTER(button_svc);
2929

30-
#define BUT_PORT DT_ALIAS_SW0_GPIOS_CONTROLLER
31-
#define BUT_PIN DT_ALIAS_SW0_GPIOS_PIN
30+
#define BUT_PORT DT_GPIO_LABEL(DT_ALIAS(sw0), gpios)
31+
#define BUT_PIN DT_GPIO_PIN(DT_ALIAS(sw0), gpios)
3232

3333
extern struct bt_conn *conn;
3434
extern struct bt_gatt_service_static stsensor_svc[];
@@ -72,10 +72,11 @@ int button_init(void)
7272
}
7373

7474
ret = gpio_pin_configure(button_dev, BUT_PIN,
75-
DT_ALIAS_SW0_GPIOS_FLAGS | GPIO_INPUT);
75+
DT_GPIO_FLAGS(DT_ALIAS(sw0), gpios) |
76+
GPIO_INPUT);
7677
if (ret != 0) {
7778
LOG_ERR("Error %d: failed to configure pin %d '%s'\n",
78-
ret, BUT_PIN, DT_ALIAS_SW0_LABEL);
79+
ret, BUT_PIN, DT_LABEL(DT_ALIAS(sw0)));
7980
return ret;
8081

8182
}
@@ -87,7 +88,7 @@ int button_init(void)
8788
GPIO_INT_EDGE_TO_ACTIVE);
8889
if (ret != 0) {
8990
LOG_ERR("Error %d: failed to configure interrupt on pin "
90-
"%d '%s'\n", ret, BUT_PIN, DT_ALIAS_SW0_LABEL);
91+
"%d '%s'\n", ret, BUT_PIN, DT_LABEL(DT_ALIAS(sw0)));
9192
return ret;
9293
}
9394
but_val = 0;

‎samples/bluetooth/st_ble_sensor/src/led_svc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
LOG_MODULE_REGISTER(led_svc);
2222

23-
#define LED_PORT DT_ALIAS_LED0_GPIOS_CONTROLLER
24-
#define LED DT_ALIAS_LED0_GPIOS_PIN
23+
#define LED_PORT DT_GPIO_LABEL(DT_ALIAS(led0), gpios)
24+
#define LED DT_GPIO_PIN(DT_ALIAS(led0), gpios)
2525

2626
struct device *led_dev;
2727
bool led_state;
@@ -47,10 +47,10 @@ int led_init(void)
4747

4848
ret = gpio_pin_configure(led_dev, LED,
4949
GPIO_OUTPUT_ACTIVE
50-
| DT_ALIAS_LED0_GPIOS_FLAGS);
50+
| DT_GPIO_FLAGS(DT_ALIAS(led0), gpios));
5151
if (ret < 0) {
5252
LOG_ERR("Error %d: failed to configure pin %d '%s'\n",
53-
ret, LED, DT_ALIAS_LED0_LABEL);
53+
ret, LED, DT_LABEL(DT_ALIAS(led0)));
5454
return ret;
5555
}
5656

0 commit comments

Comments
 (0)