From 5c42f680ed5601e8eae3c96ba0fef1f5f97a2384 Mon Sep 17 00:00:00 2001 From: Wouter Symons Date: Mon, 9 Dec 2019 10:30:09 +0100 Subject: [PATCH 1/2] pkg/lwip: add IPv4 support for LWIP-stm32 --- pkg/lwip/contrib/lwip.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkg/lwip/contrib/lwip.c b/pkg/lwip/contrib/lwip.c index ae142d4192..619013f2c3 100644 --- a/pkg/lwip/contrib/lwip.c +++ b/pkg/lwip/contrib/lwip.c @@ -146,19 +146,35 @@ void lwip_bootstrap(void) } } #elif defined(MODULE_ESP_WIFI) +#ifdef MODULE_LWIP_IPV4 + if (netif_add(&netif[0], IP4_ADDR_ANY, IP4_ADDR_ANY, IP4_ADDR_ANY, + &_esp_wifi_dev, lwip_netdev_init, tcpip_input) == NULL) { + DEBUG("Could not add esp_wifi device\n"); + return; + } +#else /* MODULE_LWIP_IPV4 */ esp_wifi_setup(&_esp_wifi_dev); if (netif_add(&netif[0], &_esp_wifi_dev, lwip_netdev_init, tcpip_input) == NULL) { DEBUG("Could not add esp_wifi device\n"); return; } +#endif /* MODULE_LWIP_IPV4 */ #elif defined(MODULE_STM32_ETH) stm32_eth_netdev_setup(&stm32_eth); - if (netif_add(&netif[0], &stm32_eth, lwip_netdev_init, - tcpip_input) == NULL) { +#ifdef MODULE_LWIP_IPV4 + if (netif_add(&netif[0], IP4_ADDR_ANY, IP4_ADDR_ANY, IP4_ADDR_ANY, + &stm32_eth, lwip_netdev_init, tcpip_input) == NULL) { DEBUG("Could not add stm32_eth device\n"); return; } +#else /* MODULE_LWIP_IPV4 */ + if (netif_add(&netif[0], &stm32_eth, lwip_netdev_init, + tcpip_input) == NULL) { + DEBUG("Could not add stm32_eth device\n"); + return; + } +#endif /* MODULE_LWIP_IPV4 */ #endif if (netif[0].state != NULL) { /* state is set to a netdev_t in the netif_add() functions above */ From a3145a0ad02e1de4eae169ad4c0b7129311ffc60 Mon Sep 17 00:00:00 2001 From: Wouter Symons Date: Mon, 9 Dec 2019 14:48:02 +0100 Subject: [PATCH 2/2] pkg/lwip: correct coding style --- pkg/lwip/contrib/lwip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/lwip/contrib/lwip.c b/pkg/lwip/contrib/lwip.c index 619013f2c3..247ce10dab 100644 --- a/pkg/lwip/contrib/lwip.c +++ b/pkg/lwip/contrib/lwip.c @@ -97,7 +97,7 @@ static socket_zep_t socket_zep_devs[LWIP_NETIF_NUMOF]; #ifdef MODULE_ESP_WIFI extern esp_wifi_netdev_t _esp_wifi_dev; -extern void esp_wifi_setup (esp_wifi_netdev_t* dev); +extern void esp_wifi_setup(esp_wifi_netdev_t *dev); #endif #ifdef MODULE_STM32_ETH