Fix ETH in 4.0

Author: me-no-dev

libraries/SD/src/sd_diskio.cpp

@@ -14,7 +14,6 @@
 #include "sd_diskio.h"
 #include "esp_system.h"
 extern "C" {
-    #include "ffconf.h"
     #include "ff.h"
     #include "diskio.h"
 #ifdef ESP_IDF_VERSION_MAJOR

libraries/WiFi/src/ETH.cpp

@@ -125,9 +125,13 @@ static void _eth_phy_power_enable(bool enable)
 ETHClass::ETHClass()
     :initialized(false)
     ,staticIP(false)
+#if ESP_IDF_VERSION_MAJOR > 3
     ,eth_handle(NULL)
+#endif
     ,started(false)
+#if ESP_IDF_VERSION_MAJOR > 3
     ,eth_link(ETH_LINK_DOWN)
+#endif
 {
 }
 
@@ -348,13 +352,8 @@ IPAddress ETHClass::gatewayIP()
 
 IPAddress ETHClass::dnsIP(uint8_t dns_no)
 {
-#ifdef ESP_IDF_VERSION_MAJOR
     const ip_addr_t * dns_ip = dns_getserver(dns_no);
     return IPAddress(dns_ip->u_addr.ip4.addr);
-#else
-    ip_addr_t dns_ip = dns_getserver(dns_no);
-    return IPAddress(dns_ip.u_addr.ip4.addr);
-#endif
 }
 
 IPAddress ETHClass::broadcastIP()

libraries/WiFi/src/ETH.h

@@ -45,7 +45,7 @@
 #define ETH_PHY_MDIO 18
 #endif
 
-#ifndef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR < 4
 #ifndef ETH_CLK_MODE
 #define ETH_CLK_MODE ETH_CLOCK_GPIO0_IN
 #endif
@@ -57,7 +57,7 @@ class ETHClass {
     private:
         bool initialized;
         bool staticIP;
-#ifdef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR > 3
         esp_eth_handle_t eth_handle;
 
     protected:
@@ -72,7 +72,7 @@ class ETHClass {
         ETHClass();
         ~ETHClass();
 
-#ifdef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR > 3
         bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO, eth_phy_type_t type=ETH_PHY_TYPE);
 #else
         bool begin(uint8_t phy_addr=ETH_PHY_ADDR, int power=ETH_PHY_POWER, int mdc=ETH_PHY_MDC, int mdio=ETH_PHY_MDIO, eth_phy_type_t type=ETH_PHY_TYPE, eth_clock_mode_t clk_mode=ETH_CLK_MODE);