riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16001 from yarrick/esp_netif

Browse Source 
lwip/esp: Support adding both netifs (eth+wifi)
This commit is contained in:
Martine Lenders 2021-02-13 18:07:14 +01:00 committed by GitHub
commit c50f7a177c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/lwip/contrib/lwip.c
View File

@ -98,12 +98,13 @@
#define LWIP_NETIF_NUMOF ARRAY_SIZE(socket_zep_params) #define LWIP_NETIF_NUMOF ARRAY_SIZE(socket_zep_params)
#endif #endif
#ifdef MODULE_ESP_ETH /* is mutual exclusive with above ifdef */ /* is mutual exclusive with above ifdef */
#define LWIP_NETIF_NUMOF (1) #if IS_USED(MODULE_ESP_ETH) && IS_USED(MODULE_ESP_WIFI)
#endif #define LWIP_NETIF_NUMOF (2)
#define ESP_WIFI_INDEX (1)
#ifdef MODULE_ESP_WIFI /* is mutual exclusive with above ifdef */ #elif IS_USED(MODULE_ESP_ETH) || IS_USED(MODULE_ESP_WIFI)
#define LWIP_NETIF_NUMOF (1) #define LWIP_NETIF_NUMOF (1)
#define ESP_WIFI_INDEX (0)
#endif #endif
#ifdef MODULE_STM32_ETH #ifdef MODULE_STM32_ETH
@ -234,20 +235,23 @@ void lwip_bootstrap(void)
return; return;
} }
} }
#elif defined(MODULE_ESP_ETH) #elif (IS_USED(MODULE_ESP_ETH) || IS_USED(MODULE_ESP_WIFI))
#if IS_USED(MODULE_ESP_ETH)
esp_eth_setup(&_esp_eth_dev); esp_eth_setup(&_esp_eth_dev);
if (_netif_add(&netif[0], &_esp_eth_dev, lwip_netdev_init, if (_netif_add(&netif[0], &_esp_eth_dev, lwip_netdev_init,
tcpip_input) == NULL) { tcpip_input) == NULL) {
DEBUG("Could not add esp_eth device\n"); DEBUG("Could not add esp_eth device\n");
return; return;
} }
#elif defined(MODULE_ESP_WIFI) #endif
#if IS_USED(MODULE_ESP_WIFI)
esp_wifi_setup(&_esp_wifi_dev); esp_wifi_setup(&_esp_wifi_dev);
if (_netif_add(&netif[0], &_esp_wifi_dev, lwip_netdev_init, if (_netif_add(&netif[ESP_WIFI_INDEX], &_esp_wifi_dev, lwip_netdev_init,
tcpip_input) == NULL) { tcpip_input) == NULL) {
DEBUG("Could not add esp_wifi device\n"); DEBUG("Could not add esp_wifi device\n");
return; return;
} }
#endif
#elif defined(MODULE_STM32_ETH) #elif defined(MODULE_STM32_ETH)
stm32_eth_netdev_setup(&stm32_eth); stm32_eth_netdev_setup(&stm32_eth);
if (_netif_add(&netif[0], &stm32_eth, lwip_netdev_init, if (_netif_add(&netif[0], &stm32_eth, lwip_netdev_init,