esp_event, mdns: fixes for CONFIG_ETH_ENABLED=n

* Original commit: espressif/esp-idf@569ad7545c
This commit is contained in:
Ivan Grokhotkov
2019-10-03 10:52:53 +02:00
committed by suren-gabrielyan-espressif
parent d52dddfea5
commit 248b11bb0a
2 changed files with 6 additions and 6 deletions

View File

@ -3099,7 +3099,7 @@ static void _mdns_handle_system_event(esp_event_base_t event_base,
break;
}
}
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_ETH_ENABLED
else if (event_base == ETH_EVENT) {
switch (event_id) {
case ETHERNET_EVENT_CONNECTED:
@ -3124,7 +3124,7 @@ static void _mdns_handle_system_event(esp_event_base_t event_base,
_mdns_enable_pcb(TCPIP_ADAPTER_IF_STA, MDNS_IP_PROTOCOL_V4);
_mdns_announce_pcb(TCPIP_ADAPTER_IF_STA, MDNS_IP_PROTOCOL_V6, NULL, 0, true);
break;
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_ETH_ENABLED
case IP_EVENT_ETH_GOT_IP:
_mdns_enable_pcb(TCPIP_ADAPTER_IF_ETH, MDNS_IP_PROTOCOL_V4);
break;
@ -4201,7 +4201,7 @@ esp_err_t mdns_init(void)
if ((err = esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL)) != ESP_OK) {
goto free_event_handlers;
}
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_ETH_ENABLED
if ((err = esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL)) != ESP_OK) {
goto free_event_handlers;
}
@ -4235,7 +4235,7 @@ free_all_and_disable_pcbs:
free_event_handlers:
esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler);
esp_event_handler_unregister(IP_EVENT, ESP_EVENT_ANY_ID, &event_handler);
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_ETH_ENABLED
esp_event_handler_unregister(ETH_EVENT, ESP_EVENT_ANY_ID, &event_handler);
#endif
vQueueDelete(_mdns_server->action_queue);
@ -4285,7 +4285,7 @@ void mdns_free(void)
vSemaphoreDelete(_mdns_server->lock);
esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler);
esp_event_handler_unregister(IP_EVENT, ESP_EVENT_ANY_ID, &event_handler);
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_ETH_ENABLED
esp_event_handler_unregister(ETH_EVENT, ESP_EVENT_ANY_ID, &event_handler);
#endif
free(_mdns_server);

View File

@ -21,7 +21,7 @@
#include "esp_system.h"
#include "esp_timer.h"
#include "esp_event.h"
#if CONFIG_IDF_TARGET_ESP32
#if CONFIG_ETH_ENABLED
#include "esp_eth.h"
#endif