Fix ETH link status, missing duplex mode, IDF version check (espressif#7593)

ppescher · SuGlider · web-flow · commit 72e79f0527a6 · 2022-12-19T12:46:02.000+02:00
Co-authored-by: Rodrigo Garcia &lt;rodrigo.garcia@espressif.com&gt;
diff --git a/libraries/Ethernet/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp
@@ -220,9 +220,6 @@ ETHClass::ETHClass()
      ,eth_handle(NULL)
 #endif
      ,started(false)
-#if ESP_IDF_VERSION_MAJOR > 3
-     ,eth_link(ETH_LINK_DOWN)
-#endif
 {
 }
 
@@ -534,25 +531,27 @@ bool ETHClass::setHostname(const char * hostname)
 
 bool ETHClass::fullDuplex()
 {
-#ifdef ESP_IDF_VERSION_MAJOR
-    return true;//todo: do not see an API for this
+#if ESP_IDF_VERSION_MAJOR > 3
+    eth_duplex_t link_duplex;
+    esp_eth_ioctl(eth_handle, ETH_CMD_G_DUPLEX_MODE, &link_duplex);
+    return (link_duplex == ETH_DUPLEX_FULL);
 #else
     return eth_config.phy_get_duplex_mode();
 #endif
 }
 
 bool ETHClass::linkUp()
 {
-#ifdef ESP_IDF_VERSION_MAJOR
-    return eth_link == ETH_LINK_UP;
+#if ESP_IDF_VERSION_MAJOR > 3
+    return WiFiGenericClass::getStatusBits() & ETH_CONNECTED_BIT;
 #else
     return eth_config.phy_check_link();
 #endif
 }
 
 uint8_t ETHClass::linkSpeed()
 {
-#ifdef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR > 3
     eth_speed_t link_speed;
     esp_eth_ioctl(eth_handle, ETH_CMD_G_SPEED, &link_speed);
     return (link_speed == ETH_SPEED_10M)?10:100;
diff --git a/libraries/Ethernet/src/ETH.h b/libraries/Ethernet/src/ETH.h
@@ -65,7 +65,6 @@ class ETHClass {
 
     protected:
         bool started;
-        eth_link_t eth_link;
         static void eth_event_handler(void *arg, esp_event_base_t event_base, int32_t event_id, void *event_data);
 #else
         bool started;

Original file line number	Diff line number	Diff line change
`@@ -220,9 +220,6 @@ ETHClass::ETHClass()`
`220`	`220`	`,eth_handle(NULL)`
`221`	`221`	`#endif`
`222`	`222`	`,started(false)`
`223`		`-#if ESP_IDF_VERSION_MAJOR > 3`
`224`		`- ,eth_link(ETH_LINK_DOWN)`
`225`		`-#endif`
`226`	`223`	`{`
`227`	`224`	`}`
`228`	`225`
`@@ -534,25 +531,27 @@ bool ETHClass::setHostname(const char * hostname)`
`534`	`531`
`535`	`532`	`bool ETHClass::fullDuplex()`
`536`	`533`	`{`
`537`		`-#ifdef ESP_IDF_VERSION_MAJOR`
`538`		`- return true;//todo: do not see an API for this`
	`534`	`+#if ESP_IDF_VERSION_MAJOR > 3`
	`535`	`+ eth_duplex_t link_duplex;`
	`536`	`+ esp_eth_ioctl(eth_handle, ETH_CMD_G_DUPLEX_MODE, &link_duplex);`
	`537`	`+ return (link_duplex == ETH_DUPLEX_FULL);`
`539`	`538`	`#else`
`540`	`539`	`return eth_config.phy_get_duplex_mode();`
`541`	`540`	`#endif`
`542`	`541`	`}`
`543`	`542`
`544`	`543`	`bool ETHClass::linkUp()`
`545`	`544`	`{`
`546`		`-#ifdef ESP_IDF_VERSION_MAJOR`
`547`		`- return eth_link == ETH_LINK_UP;`
	`545`	`+#if ESP_IDF_VERSION_MAJOR > 3`
	`546`	`+ return WiFiGenericClass::getStatusBits() & ETH_CONNECTED_BIT;`
`548`	`547`	`#else`
`549`	`548`	`return eth_config.phy_check_link();`
`550`	`549`	`#endif`
`551`	`550`	`}`
`552`	`551`
`553`	`552`	`uint8_t ETHClass::linkSpeed()`
`554`	`553`	`{`
`555`		`-#ifdef ESP_IDF_VERSION_MAJOR`
	`554`	`+#if ESP_IDF_VERSION_MAJOR > 3`
`556`	`555`	`eth_speed_t link_speed;`
`557`	`556`	`esp_eth_ioctl(eth_handle, ETH_CMD_G_SPEED, &link_speed);`
`558`	`557`	`return (link_speed == ETH_SPEED_10M)?10:100;`