network: Fix compilation without ethernet support.

Author: rtrbt

libraries/Network/src/NetworkEvents.cpp

@@ -358,13 +358,15 @@ int NetworkEvents::waitStatusBits(int bits, uint32_t timeout_ms) {
  */
 const char *NetworkEvents::eventName(arduino_event_id_t id) {
   switch (id) {
+#if CONFIG_ETH_ENABLED
     case ARDUINO_EVENT_ETH_START:        return "ETH_START";
     case ARDUINO_EVENT_ETH_STOP:         return "ETH_STOP";
     case ARDUINO_EVENT_ETH_CONNECTED:    return "ETH_CONNECTED";
     case ARDUINO_EVENT_ETH_DISCONNECTED: return "ETH_DISCONNECTED";
     case ARDUINO_EVENT_ETH_GOT_IP:       return "ETH_GOT_IP";
     case ARDUINO_EVENT_ETH_LOST_IP:      return "ETH_LOST_IP";
     case ARDUINO_EVENT_ETH_GOT_IP6:      return "ETH_GOT_IP6";
+#endif
     case ARDUINO_EVENT_PPP_START:        return "PPP_START";
     case ARDUINO_EVENT_PPP_STOP:         return "PPP_STOP";
     case ARDUINO_EVENT_PPP_CONNECTED:    return "PPP_CONNECTED";

libraries/Network/src/NetworkEvents.h

@@ -42,13 +42,15 @@ ESP_EVENT_DECLARE_BASE(ARDUINO_EVENTS);
 
 typedef enum {
   ARDUINO_EVENT_NONE = 0,
+#if CONFIG_ETH_ENABLED
   ARDUINO_EVENT_ETH_START,
   ARDUINO_EVENT_ETH_STOP,
   ARDUINO_EVENT_ETH_CONNECTED,
   ARDUINO_EVENT_ETH_DISCONNECTED,
   ARDUINO_EVENT_ETH_GOT_IP,
   ARDUINO_EVENT_ETH_LOST_IP,
   ARDUINO_EVENT_ETH_GOT_IP6,
+#endif
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
   ARDUINO_EVENT_WIFI_OFF = 100,
   ARDUINO_EVENT_WIFI_READY,
@@ -246,7 +248,9 @@ class NetworkEvents {
   int clearStatusBits(int bits);
 
   friend class ESP_NetworkInterface;
+#if CONFIG_ETH_ENABLED
   friend class ETHClass;
+#endif
   friend class PPPClass;
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED
   friend class STAClass;

libraries/Network/src/NetworkInterface.cpp

@@ -49,10 +49,18 @@ extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) {
 static void _ip_event_cb(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data) {
   if (event_base == IP_EVENT) {
     NetworkInterface *netif = NULL;
-    if (event_id == IP_EVENT_STA_GOT_IP || event_id == IP_EVENT_ETH_GOT_IP || event_id == IP_EVENT_PPP_GOT_IP) {
+    if (event_id == IP_EVENT_STA_GOT_IP
+#if CONFIG_ETH_ENABLED
+      || event_id == IP_EVENT_ETH_GOT_IP
+#endif
+      || event_id == IP_EVENT_PPP_GOT_IP) {
       ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data;
       netif = getNetifByEspNetif(event->esp_netif);
-    } else if (event_id == IP_EVENT_STA_LOST_IP || event_id == IP_EVENT_PPP_LOST_IP || event_id == IP_EVENT_ETH_LOST_IP) {
+    } else if (event_id == IP_EVENT_STA_LOST_IP || event_id == IP_EVENT_PPP_LOST_IP
+#if CONFIG_ETH_ENABLED
+      || event_id == IP_EVENT_ETH_LOST_IP
+#endif
+) {
       ip_event_got_ip_t *event = (ip_event_got_ip_t *)event_data;
       netif = getNetifByEspNetif(event->esp_netif);
     } else if (event_id == IP_EVENT_GOT_IP6) {
@@ -88,9 +96,12 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
 #endif
       if (_interface_id == ESP_NETIF_ID_PPP) {
       arduino_event.event_id = ARDUINO_EVENT_PPP_GOT_IP;
+#if CONFIG_ETH_ENABLED
     } else if (_interface_id >= ESP_NETIF_ID_ETH && _interface_id < ESP_NETIF_ID_MAX) {
       arduino_event.event_id = ARDUINO_EVENT_ETH_GOT_IP;
+#endif
     }
+
   } else if (event_id == _lost_ip_event_id) {
     clearStatusBits(ESP_NETIF_HAS_IP_BIT);
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_VERBOSE
@@ -103,8 +114,10 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
 #endif
       if (_interface_id == ESP_NETIF_ID_PPP) {
       arduino_event.event_id = ARDUINO_EVENT_PPP_LOST_IP;
+#if CONFIG_ETH_ENABLED
     } else if (_interface_id >= ESP_NETIF_ID_ETH && _interface_id < ESP_NETIF_ID_MAX) {
       arduino_event.event_id = ARDUINO_EVENT_ETH_LOST_IP;
+#endif
     }
 #if CONFIG_LWIP_IPV6
   } else if (event_id == IP_EVENT_GOT_IP6) {
@@ -132,8 +145,10 @@ void NetworkInterface::_onIpEvent(int32_t event_id, void *event_data) {
 #endif
       if (_interface_id == ESP_NETIF_ID_PPP) {
       arduino_event.event_id = ARDUINO_EVENT_PPP_GOT_IP6;
+#if CONFIG_ETH_ENABLED
     } else if (_interface_id >= ESP_NETIF_ID_ETH && _interface_id < ESP_NETIF_ID_MAX) {
       arduino_event.event_id = ARDUINO_EVENT_ETH_GOT_IP6;
+#endif
     }
 #endif /* CONFIG_LWIP_IPV6 */
 #if SOC_WIFI_SUPPORTED || CONFIG_ESP_WIFI_REMOTE_ENABLED