Merge pull request #12903 from wosym/lwip_stm32_ipv4

Add IPv4 support for LWIP-stm32
This commit is contained in:
Gunar Schorcht 2019-12-16 11:45:24 +01:00 committed by GitHub
commit 3257c8e9f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -110,7 +110,7 @@ extern void esp_eth_setup (esp_eth_netdev_t* dev);
#ifdef MODULE_ESP_WIFI #ifdef MODULE_ESP_WIFI
extern esp_wifi_netdev_t _esp_wifi_dev; 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 #endif
#ifdef MODULE_STM32_ETH #ifdef MODULE_STM32_ETH
@ -174,19 +174,35 @@ void lwip_bootstrap(void)
} }
#endif /* MODULE_LWIP_IPV4 */ #endif /* MODULE_LWIP_IPV4 */
#elif defined(MODULE_ESP_WIFI) #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); esp_wifi_setup(&_esp_wifi_dev);
if (netif_add(&netif[0], &_esp_wifi_dev, lwip_netdev_init, if (netif_add(&netif[0], &_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 /* MODULE_LWIP_IPV4 */
#elif defined(MODULE_STM32_ETH) #elif defined(MODULE_STM32_ETH)
stm32_eth_netdev_setup(&stm32_eth); stm32_eth_netdev_setup(&stm32_eth);
#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, if (netif_add(&netif[0], &stm32_eth, lwip_netdev_init,
tcpip_input) == NULL) { tcpip_input) == NULL) {
DEBUG("Could not add stm32_eth device\n"); DEBUG("Could not add stm32_eth device\n");
return; return;
} }
#endif /* MODULE_LWIP_IPV4 */
#endif #endif
if (netif[0].state != NULL) { if (netif[0].state != NULL) {
/* state is set to a netdev_t in the netif_add() functions above */ /* state is set to a netdev_t in the netif_add() functions above */