kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-24 22:13:52 +01:00
Code Releases Activity

net/gnrc_netif: move netdev init code to ops->init

Browse Source
This commit is contained in:
Jose Alamos 2021-09-30 10:44:57 +02:00
parent e7fac9f661
commit 415704fa76
No known key found for this signature in database
GPG Key ID: F483EB800EF89DD9
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -1579,6 +1579,16 @@ static void _test_options(gnrc_netif_t *netif)
int gnrc_netif_default_init(gnrc_netif_t *netif)
{
netdev_t *dev = netif->dev;
/* register the event callback with the device driver */
dev->event_callback = _event_cb;
dev->context = netif;
int res = dev->driver->init(dev);
if (res < 0) {
return res;
}
netif_register(&netif->netif);
_check_netdev_capabilities(dev);
_init_from_device(netif);
#ifdef DEVELHELP
_test_options(netif);
@ -1829,7 +1839,6 @@ static void *_gnrc_netif_thread(void *args)
DEBUG("gnrc_netif: starting thread %i\n", thread_getpid());
netif = ctx->netif;
gnrc_netif_acquire(netif);
dev = netif->dev;
netif->pid = thread_getpid();
#if IS_USED(MODULE_GNRC_NETIF_EVENTS)
@ -1840,20 +1849,15 @@ static void *_gnrc_netif_thread(void *args)
/* setup the link-layer's message queue */
msg_init_queue(msg_queue, GNRC_NETIF_MSG_QUEUE_SIZE);
/* register the event callback with the device driver */
dev->event_callback = _event_cb;
dev->context = netif;
/* initialize low-level driver */
ctx->result = dev->driver->init(dev);
ctx->result = netif->ops->init(netif);
/* signal that driver init is done */
mutex_unlock(&ctx->init_done);
if (ctx->result < 0) {
LOG_ERROR("gnrc_netif: netdev init failed: %d\n", ctx->result);
LOG_ERROR("gnrc_netif: init failed: %d\n", ctx->result);
return NULL;
}
netif_register(&netif->netif);
_check_netdev_capabilities(dev);
netif->ops->init(netif);
dev = netif->dev;
#if DEVELHELP
assert(options_tested);
#endif