|
|
@@ -228,7 +228,10 @@ TEST_CASE("esp32 ethernet icmp test", "[ethernet][test_env=UT_T2_Ethernet]")
|
|
|
TEST_ASSERT(eth_event_group != NULL);
|
|
|
test_case_uses_tcpip();
|
|
|
TEST_ESP_OK(esp_event_loop_create_default());
|
|
|
- TEST_ESP_OK(tcpip_adapter_set_default_eth_handlers());
|
|
|
+ esp_netif_config_t cfg = ESP_NETIF_DEFAULT_ETH();
|
|
|
+ esp_netif_t* eth_netif = esp_netif_new(&cfg);
|
|
|
+ TEST_ESP_OK(esp_eth_set_default_handlers(eth_netif));
|
|
|
+
|
|
|
TEST_ESP_OK(esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, ð_event_handler, eth_event_group));
|
|
|
TEST_ESP_OK(esp_event_handler_register(IP_EVENT, IP_EVENT_ETH_GOT_IP, &got_ip_event_handler, eth_event_group));
|
|
|
eth_mac_config_t mac_config = ETH_MAC_DEFAULT_CONFIG();
|
|
|
@@ -238,6 +241,7 @@ TEST_CASE("esp32 ethernet icmp test", "[ethernet][test_env=UT_T2_Ethernet]")
|
|
|
esp_eth_config_t eth_config = ETH_DEFAULT_CONFIG(mac, phy);
|
|
|
esp_eth_handle_t eth_handle = NULL;
|
|
|
TEST_ESP_OK(esp_eth_driver_install(ð_config, ð_handle));
|
|
|
+ TEST_ESP_OK(esp_netif_attach(eth_netif, eth_handle));
|
|
|
/* wait for IP lease */
|
|
|
bits = xEventGroupWaitBits(eth_event_group, ETH_GOT_IP_BIT, true, true, pdMS_TO_TICKS(ETH_GET_IP_TIMEOUT_MS));
|
|
|
TEST_ASSERT((bits & ETH_GOT_IP_BIT) == ETH_GOT_IP_BIT);
|
|
|
@@ -293,9 +297,10 @@ TEST_CASE("esp32 ethernet icmp test", "[ethernet][test_env=UT_T2_Ethernet]")
|
|
|
TEST_ESP_OK(phy->del(phy));
|
|
|
TEST_ESP_OK(mac->del(mac));
|
|
|
TEST_ESP_OK(esp_event_handler_unregister(IP_EVENT, IP_EVENT_ETH_GOT_IP, got_ip_event_handler));
|
|
|
- TEST_ESP_OK(tcpip_adapter_clear_default_eth_handlers());
|
|
|
+ TEST_ESP_OK(esp_eth_clear_default_handlers(eth_netif));
|
|
|
TEST_ESP_OK(esp_event_loop_delete_default());
|
|
|
vEventGroupDelete(eth_event_group);
|
|
|
+ esp_netif_destroy(eth_netif);
|
|
|
}
|
|
|
|
|
|
#if CONFIG_ETH_USE_SPI_ETHERNET
|