Skip to content

Commit c0419e8

Browse files
authored
Merge pull request #18751 from benpicco/backport/2022.10/pr/fix_link_up
tests: set netdev `event_callback` before calling init [backport 2022.10]
2 parents 5d5e8d6 + 64a1b38 commit c0419e8

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

tests/driver_cc2538_rf/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ int netdev_ieee802154_minimal_init_devs(netdev_event_cb_t cb) {
3636
netdev_register(netdev, NETDEV_CC2538, 0);
3737
netdev_ieee802154_submac_init(&cc2538_rf);
3838

39+
/* set the application-provided callback */
40+
netdev->event_callback = cb;
41+
3942
/* setup and initialize the specific driver */
4043
cc2538_rf_hal_setup(&cc2538_rf.submac.dev);
4144
cc2538_init();
4245

43-
/* set the application-provided callback */
44-
netdev->event_callback = cb;
45-
4646
/* initialize the device driver */
4747
int res = netdev->driver->init(netdev);
4848
if (res != 0) {

tests/driver_nrf802154/main.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ int netdev_ieee802154_minimal_init_devs(netdev_event_cb_t cb) {
3636
netdev_register(netdev, NETDEV_CC2538, 0);
3737
netdev_ieee802154_submac_init(&nrf802154);
3838

39+
/* set the application-provided callback */
40+
netdev->event_callback = cb;
41+
3942
/* setup and initialize the specific driver */
4043
nrf802154_hal_setup(&nrf802154.submac.dev);
4144
nrf802154_init();
4245

43-
/* set the application-provided callback */
44-
netdev->event_callback = cb;
45-
4646
/* initialize the device driver */
4747
int res = netdev->driver->init(netdev);
4848
if (res != 0) {

tests/driver_sx126x/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,13 +325,13 @@ int main(void)
325325

326326
netdev->driver = &sx126x_driver;
327327

328+
netdev->event_callback = _event_cb;
329+
328330
if (netdev->driver->init(netdev) < 0) {
329331
puts("Failed to initialize SX126X device, exiting");
330332
return 1;
331333
}
332334

333-
netdev->event_callback = _event_cb;
334-
335335
_recv_pid = thread_create(stack, sizeof(stack), THREAD_PRIORITY_MAIN - 1,
336336
THREAD_CREATE_STACKTEST, _recv_thread, netdev,
337337
"recv_thread");

tests/driver_sx127x/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,13 +545,13 @@ int main(void)
545545

546546
netdev->driver = &sx127x_driver;
547547

548+
netdev->event_callback = _event_cb;
549+
548550
if (netdev->driver->init(netdev) < 0) {
549551
puts("Failed to initialize SX127x device, exiting");
550552
return 1;
551553
}
552554

553-
netdev->event_callback = _event_cb;
554-
555555
_recv_pid = thread_create(stack, sizeof(stack), THREAD_PRIORITY_MAIN - 1,
556556
THREAD_CREATE_STACKTEST, _recv_thread, NULL,
557557
"recv_thread");

tests/driver_sx1280/main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,13 +355,13 @@ int main(void)
355355

356356
netdev->driver = &sx1280_driver;
357357

358+
netdev->event_callback = _event_cb;
359+
358360
if (netdev->driver->init(netdev) < 0) {
359361
puts("Failed to initialize SX1280 device, exiting");
360362
return 1;
361363
}
362364

363-
netdev->event_callback = _event_cb;
364-
365365
_recv_pid = thread_create(stack, sizeof(stack), THREAD_PRIORITY_MAIN - 1,
366366
THREAD_CREATE_STACKTEST, _recv_thread, netdev,
367367
"recv_thread");

tests/socket_zep/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ static void test_init(void)
5555
printf("Initializing socket ZEP with (local: [%s]:%s, remote: [%s]:%s)\n",
5656
p->local_addr, p->local_port, p->remote_addr, p->remote_port);
5757
netdev_register(&_socket_zep_netdev.dev.netdev, NETDEV_SOCKET_ZEP, 0);
58+
netdev->event_callback = _event_cb;
5859
netdev_ieee802154_submac_init(&_socket_zep_netdev);
5960
socket_zep_hal_setup(&_dev, &_socket_zep_netdev.submac.dev);
6061
socket_zep_setup(&_dev, p);
61-
netdev->event_callback = _event_cb;
6262
expect(netdev->driver->init(netdev) >= 0);
6363
_print_info(netdev);
6464
}

0 commit comments

Comments
 (0)