Skip to content

Commit 901124b

Browse files
build and link hello-world for esp32s2beta
* Original commit: espressif/esp-idf@84b2f9f
1 parent f6ff165 commit 901124b

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

components/mdns/mdns.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3098,7 +3098,9 @@ static void _mdns_handle_system_event(esp_event_base_t event_base,
30983098
default:
30993099
break;
31003100
}
3101-
} else if (event_base == ETH_EVENT) {
3101+
}
3102+
#if CONFIG_IDF_TARGET_ESP32
3103+
else if (event_base == ETH_EVENT) {
31023104
switch (event_id) {
31033105
case ETHERNET_EVENT_CONNECTED:
31043106
if (!tcpip_adapter_dhcpc_get_status(TCPIP_ADAPTER_IF_ETH, &dcst)) {
@@ -3114,15 +3116,19 @@ static void _mdns_handle_system_event(esp_event_base_t event_base,
31143116
default:
31153117
break;
31163118
}
3117-
} else if (event_base == IP_EVENT) {
3119+
}
3120+
#endif
3121+
else if (event_base == IP_EVENT) {
31183122
switch (event_id) {
31193123
case IP_EVENT_STA_GOT_IP:
31203124
_mdns_enable_pcb(TCPIP_ADAPTER_IF_STA, MDNS_IP_PROTOCOL_V4);
31213125
_mdns_announce_pcb(TCPIP_ADAPTER_IF_STA, MDNS_IP_PROTOCOL_V6, NULL, 0, true);
31223126
break;
3127+
#if CONFIG_IDF_TARGET_ESP32
31233128
case IP_EVENT_ETH_GOT_IP:
31243129
_mdns_enable_pcb(TCPIP_ADAPTER_IF_ETH, MDNS_IP_PROTOCOL_V4);
31253130
break;
3131+
#endif
31263132
case IP_EVENT_GOT_IP6:
31273133
_mdns_enable_pcb(interface, MDNS_IP_PROTOCOL_V6);
31283134
_mdns_announce_pcb(interface, MDNS_IP_PROTOCOL_V4, NULL, 0, true);
@@ -4189,17 +4195,17 @@ esp_err_t mdns_init(void)
41894195
err = ESP_ERR_NO_MEM;
41904196
goto free_lock;
41914197
}
4192-
41934198
if ((err = esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL)) != ESP_OK) {
41944199
goto free_event_handlers;
41954200
}
41964201
if ((err = esp_event_handler_register(IP_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL)) != ESP_OK) {
41974202
goto free_event_handlers;
41984203
}
4204+
#if CONFIG_IDF_TARGET_ESP32
41994205
if ((err = esp_event_handler_register(ETH_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL)) != ESP_OK) {
42004206
goto free_event_handlers;
42014207
}
4202-
4208+
#endif
42034209
uint8_t i;
42044210
ip6_addr_t tmp_addr6;
42054211
tcpip_adapter_ip_info_t if_ip_info;
@@ -4229,7 +4235,9 @@ esp_err_t mdns_init(void)
42294235
free_event_handlers:
42304236
esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler);
42314237
esp_event_handler_unregister(IP_EVENT, ESP_EVENT_ANY_ID, &event_handler);
4238+
#if CONFIG_IDF_TARGET_ESP32
42324239
esp_event_handler_unregister(ETH_EVENT, ESP_EVENT_ANY_ID, &event_handler);
4240+
#endif
42334241
vQueueDelete(_mdns_server->action_queue);
42344242
free_lock:
42354243
vSemaphoreDelete(_mdns_server->lock);
@@ -4277,7 +4285,9 @@ void mdns_free(void)
42774285
vSemaphoreDelete(_mdns_server->lock);
42784286
esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler);
42794287
esp_event_handler_unregister(IP_EVENT, ESP_EVENT_ANY_ID, &event_handler);
4288+
#if CONFIG_IDF_TARGET_ESP32
42804289
esp_event_handler_unregister(ETH_EVENT, ESP_EVENT_ANY_ID, &event_handler);
4290+
#endif
42814291
free(_mdns_server);
42824292
_mdns_server = NULL;
42834293
}

components/mdns/private_include/mdns_networking.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
* MDNS Server Networking -- private include
6-
*
6+
*
77
*/
88
#include "mdns.h"
99
#include "mdns_private.h"
@@ -21,7 +21,9 @@
2121
#include "esp_system.h"
2222
#include "esp_timer.h"
2323
#include "esp_event.h"
24+
#if CONFIG_IDF_TARGET_ESP32
2425
#include "esp_eth.h"
26+
#endif
2527

2628

2729
/**

0 commit comments

Comments
 (0)