Skip to content

Commit 1f82e32

Browse files
galakgalak
committed
tests: gpio-api-1pin: Convert test to use DEVICE_DT_GET
Move to use DEVICE_DT_GET instead of device_get_binding as we work on phasing out use of DTS 'label' property. Signed-off-by: Kumar Gala <[email protected]>
1 parent 6026022 commit 1f82e32

File tree

5 files changed

+58
-58
lines changed

5 files changed

+58
-58
lines changed

‎tests/drivers/gpio/gpio_api_1pin/src/test_config.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@ void test_gpio_pin_configure_push_pull(void)
5050
const struct device *port;
5151
int ret;
5252

53-
port = device_get_binding(TEST_DEV);
54-
zassert_not_null(port, "device " TEST_DEV " not found");
53+
port = DEVICE_DT_GET(TEST_NODE);
54+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
5555

56-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
56+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
5757

5858
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT);
5959
zassert_equal(ret, 0, "Failed to configure the pin as an output");
@@ -167,10 +167,10 @@ void test_gpio_pin_configure_single_ended(void)
167167
unsigned int cfg_flag;
168168
int ret;
169169

170-
port = device_get_binding(TEST_DEV);
171-
zassert_not_null(port, "device " TEST_DEV " not found");
170+
port = DEVICE_DT_GET(TEST_NODE);
171+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
172172

173-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
173+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
174174

175175
/* If the LED is connected directly between the MCU pin and power or
176176
* ground we can test only one of the Open Drain / Open Source modes.

‎tests/drivers/gpio/gpio_api_1pin/src/test_gpio_api.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <ztest.h>
1313

1414
#if DT_NODE_HAS_PROP(DT_ALIAS(led0), gpios)
15-
#define TEST_DEV DT_GPIO_LABEL(DT_ALIAS(led0), gpios)
15+
#define TEST_NODE DT_GPIO_CTLR(DT_ALIAS(led0), gpios)
1616
#define TEST_PIN DT_GPIO_PIN(DT_ALIAS(led0), gpios)
1717
#define TEST_PIN_DTS_FLAGS DT_GPIO_FLAGS(DT_ALIAS(led0), gpios)
1818
#else

‎tests/drivers/gpio/gpio_api_1pin/src/test_pin.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ void test_gpio_pin_toggle(void)
6363
int val_expected;
6464
int ret;
6565

66-
port = device_get_binding(TEST_DEV);
67-
zassert_not_null(port, "device " TEST_DEV " not found");
66+
port = DEVICE_DT_GET(TEST_NODE);
67+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
6868

69-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
69+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
7070

7171
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
7272
if (ret == -ENOTSUP) {
@@ -105,10 +105,10 @@ void test_gpio_pin_toggle_visual(void)
105105
int val_expected;
106106
int ret;
107107

108-
port = device_get_binding(TEST_DEV);
109-
zassert_not_null(port, "device " TEST_DEV " not found");
108+
port = DEVICE_DT_GET(TEST_NODE);
109+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
110110

111-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
111+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
112112

113113
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT |
114114
TEST_PIN_DTS_FLAGS);
@@ -144,10 +144,10 @@ void test_gpio_pin_set_get_raw(void)
144144
4, 1, 45, 0, 0, -7, 0, 0, 0, INT_MAX, INT_MIN, 0
145145
};
146146

147-
port = device_get_binding(TEST_DEV);
148-
zassert_not_null(port, "device " TEST_DEV " not found");
147+
port = DEVICE_DT_GET(TEST_NODE);
148+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
149149

150-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
150+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
151151

152152
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
153153
if (ret == -ENOTSUP) {
@@ -181,10 +181,10 @@ void test_gpio_pin_set_get(void)
181181
1, 2, 3, 0, 4, 0, 0, 0, 17, INT_MAX, INT_MIN, 0
182182
};
183183

184-
port = device_get_binding(TEST_DEV);
185-
zassert_not_null(port, "device " TEST_DEV " not found");
184+
port = DEVICE_DT_GET(TEST_NODE);
185+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
186186

187-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
187+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
188188

189189
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
190190
if (ret == -ENOTSUP) {
@@ -218,10 +218,10 @@ void test_gpio_pin_set_get_active_high(void)
218218

219219
const int test_vector[] = {0, 2, 0, 9, -1, 0, 0, 1, INT_MAX, INT_MIN};
220220

221-
port = device_get_binding(TEST_DEV);
222-
zassert_not_null(port, "device " TEST_DEV " not found");
221+
port = DEVICE_DT_GET(TEST_NODE);
222+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
223223

224-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
224+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
225225

226226
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT |
227227
GPIO_ACTIVE_HIGH);
@@ -268,10 +268,10 @@ void test_gpio_pin_set_get_active_low(void)
268268

269269
const int test_vector[] = {0, 4, 0, 0, 1, 8, -3, -12, 0};
270270

271-
port = device_get_binding(TEST_DEV);
272-
zassert_not_null(port, "device " TEST_DEV " not found");
271+
port = DEVICE_DT_GET(TEST_NODE);
272+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
273273

274-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
274+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
275275

276276
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT |
277277
GPIO_ACTIVE_LOW);

‎tests/drivers/gpio/gpio_api_1pin/src/test_pin_interrupt.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ void test_gpio_pin_interrupt_edge(unsigned int cfg_flags,
5353
unsigned int cfg_out_flag;
5454
int ret;
5555

56-
port = device_get_binding(TEST_DEV);
57-
zassert_not_null(port, "device " TEST_DEV " not found");
56+
port = DEVICE_DT_GET(TEST_NODE);
57+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
5858

59-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
59+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
6060

6161
ret = gpio_pin_configure(port, TEST_PIN, GPIO_INPUT | GPIO_OUTPUT);
6262
if (ret == -ENOTSUP) {
@@ -127,10 +127,10 @@ void test_gpio_pin_interrupt_level(unsigned int cfg_flags,
127127
int pin_out_val;
128128
int ret;
129129

130-
port = device_get_binding(TEST_DEV);
131-
zassert_not_null(port, "device " TEST_DEV " not found");
130+
port = DEVICE_DT_GET(TEST_NODE);
131+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
132132

133-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
133+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
134134

135135
ret = gpio_pin_configure(port, TEST_PIN, GPIO_INPUT | GPIO_OUTPUT);
136136
if (ret == -ENOTSUP) {

‎tests/drivers/gpio/gpio_api_1pin/src/test_port.c‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ void test_gpio_port_toggle(void)
114114
gpio_port_value_t val_expected;
115115
int ret;
116116

117-
port = device_get_binding(TEST_DEV);
118-
zassert_not_null(port, "device " TEST_DEV " not found");
117+
port = DEVICE_DT_GET(TEST_NODE);
118+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
119119

120-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
120+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
121121

122122
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
123123
if (ret == -ENOTSUP) {
@@ -163,10 +163,10 @@ void test_gpio_port_set_masked_get_raw(void)
163163
0x00000000,
164164
};
165165

166-
port = device_get_binding(TEST_DEV);
167-
zassert_not_null(port, "device " TEST_DEV " not found");
166+
port = DEVICE_DT_GET(TEST_NODE);
167+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
168168

169-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
169+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
170170

171171
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
172172
if (ret == -ENOTSUP) {
@@ -203,10 +203,10 @@ void test_gpio_port_set_masked_get(void)
203203
0x00000000,
204204
};
205205

206-
port = device_get_binding(TEST_DEV);
207-
zassert_not_null(port, "device " TEST_DEV " not found");
206+
port = DEVICE_DT_GET(TEST_NODE);
207+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
208208

209-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
209+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
210210

211211
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
212212
if (ret == -ENOTSUP) {
@@ -244,10 +244,10 @@ void test_gpio_port_set_masked_get_active_high(void)
244244
0x00000000,
245245
};
246246

247-
port = device_get_binding(TEST_DEV);
248-
zassert_not_null(port, "device " TEST_DEV " not found");
247+
port = DEVICE_DT_GET(TEST_NODE);
248+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
249249

250-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
250+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
251251

252252
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT |
253253
GPIO_ACTIVE_HIGH);
@@ -295,10 +295,10 @@ void test_gpio_port_set_masked_get_active_low(void)
295295
0x00000000,
296296
};
297297

298-
port = device_get_binding(TEST_DEV);
299-
zassert_not_null(port, "device " TEST_DEV " not found");
298+
port = DEVICE_DT_GET(TEST_NODE);
299+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
300300

301-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
301+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
302302

303303
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT |
304304
GPIO_ACTIVE_LOW);
@@ -339,10 +339,10 @@ void test_gpio_port_set_bits_clear_bits_raw(void)
339339
{TEST_GPIO_PORT_VALUE_MAX, TEST_GPIO_PORT_VALUE_MAX},
340340
};
341341

342-
port = device_get_binding(TEST_DEV);
343-
zassert_not_null(port, "device " TEST_DEV " not found");
342+
port = DEVICE_DT_GET(TEST_NODE);
343+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
344344

345-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
345+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
346346

347347
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
348348
if (ret == -ENOTSUP) {
@@ -378,10 +378,10 @@ void test_gpio_port_set_bits_clear_bits(void)
378378
{0x00000000, 0x55555555},
379379
};
380380

381-
port = device_get_binding(TEST_DEV);
382-
zassert_not_null(port, "device " TEST_DEV " not found");
381+
port = DEVICE_DT_GET(TEST_NODE);
382+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
383383

384-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
384+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
385385

386386
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
387387
if (ret == -ENOTSUP) {
@@ -419,10 +419,10 @@ void test_gpio_port_set_clr_bits_raw(void)
419419
{0x00000000, TEST_GPIO_PORT_VALUE_MAX},
420420
};
421421

422-
port = device_get_binding(TEST_DEV);
423-
zassert_not_null(port, "device " TEST_DEV " not found");
422+
port = DEVICE_DT_GET(TEST_NODE);
423+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
424424

425-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
425+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
426426

427427
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
428428
if (ret == -ENOTSUP) {
@@ -456,10 +456,10 @@ void test_gpio_port_set_clr_bits(void)
456456
{0x00000000, TEST_GPIO_PORT_VALUE_MAX},
457457
};
458458

459-
port = device_get_binding(TEST_DEV);
460-
zassert_not_null(port, "device " TEST_DEV " not found");
459+
port = DEVICE_DT_GET(TEST_NODE);
460+
zassert_true(device_is_ready(port), "GPIO dev is not ready");
461461

462-
TC_PRINT("Running test on port=%s, pin=%d\n", TEST_DEV, TEST_PIN);
462+
TC_PRINT("Running test on port=%s, pin=%d\n", port->name, TEST_PIN);
463463

464464
ret = gpio_pin_configure(port, TEST_PIN, GPIO_OUTPUT | GPIO_INPUT);
465465
if (ret == -ENOTSUP) {

0 commit comments

Comments
 (0)