From 074369fbb54ab4b40a2dde32dfb5bb4bbffa459e Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Thu, 5 Sep 2019 13:29:05 +0200 Subject: [PATCH] pkg/lwip: changes for ESP8266 esp_wifi --- pkg/lwip/contrib/lwip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/lwip/contrib/lwip.c b/pkg/lwip/contrib/lwip.c index 5394f46041..49953a1eaa 100644 --- a/pkg/lwip/contrib/lwip.c +++ b/pkg/lwip/contrib/lwip.c @@ -38,7 +38,7 @@ #include "socket_zep_params.h" #endif -#if defined(MODULE_ESP_WIFI) && defined(CPU_ESP32) +#ifdef MODULE_ESP_WIFI #include "esp-wifi/esp_wifi_netdev.h" #endif @@ -63,7 +63,7 @@ #define LWIP_NETIF_NUMOF ARRAY_SIZE(socket_zep_params) #endif -#if defined(MODULE_ESP_WIFI) && defined(CPU_ESP32) /* is mutual exclusive with above ifdef */ +#ifdef MODULE_ESP_WIFI /* is mutual exclusive with above ifdef */ #define LWIP_NETIF_NUMOF (1) #endif @@ -87,14 +87,14 @@ static mrf24j40_t mrf24j40_devs[LWIP_NETIF_NUMOF]; static socket_zep_t socket_zep_devs[LWIP_NETIF_NUMOF]; #endif -#if defined(MODULE_ESP_WIFI) && defined(CPU_ESP32) +#ifdef MODULE_ESP_WIFI extern esp_wifi_netdev_t _esp_wifi_dev; extern void esp_wifi_setup (esp_wifi_netdev_t* dev); #endif void lwip_bootstrap(void) { - /* TODO: do for every eligable netdev */ + /* TODO: do for every eligible netdev */ #ifdef LWIP_NETIF_NUMOF #ifdef MODULE_NETDEV_TAP for (unsigned i = 0; i < LWIP_NETIF_NUMOF; i++) { @@ -132,7 +132,7 @@ void lwip_bootstrap(void) return; } } -#elif defined(MODULE_ESP_WIFI) && defined(CPU_ESP32) +#elif defined(MODULE_ESP_WIFI) esp_wifi_setup(&_esp_wifi_dev); if (netif_add(&netif[0], &_esp_wifi_dev, lwip_netdev_init, tcpip_input) == NULL) {