blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

fix(network/examples): Fix build rules to test builds on for all targets

Browse Source 
Uses wifi defines only if wifi is enabled for this target
This commit is contained in:
David Cermak 2025-01-23 12:02:19 +01:00
parent 649f9a72ae
commit d244c98858
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
components/esp_netif/lwip/esp_netif_br_glue.c
View File

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -97,11 +97,14 @@ static void port_action_start(void *handler_args, esp_event_base_t base, int32_t
{ {
esp_netif_br_glue_t *netif_glue = handler_args; esp_netif_br_glue_t *netif_glue = handler_args;
#if CONFIG_ESP_WIFI_ENABLED
if (base == WIFI_EVENT) { if (base == WIFI_EVENT) {
ESP_LOGD(TAG, "wifi_action_start: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data); ESP_LOGD(TAG, "wifi_action_start: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data);
start_br_if_stopped(netif_glue); start_br_if_stopped(netif_glue);
esp_netif_bridge_add_port(netif_glue->base.netif, netif_glue->wifi_esp_netif); esp_netif_bridge_add_port(netif_glue->base.netif, netif_glue->wifi_esp_netif);
} else if (base == ETH_EVENT) { } else
#endif /* CONFIG_ESP_WIFI_ENABLED */
if (base == ETH_EVENT) {
esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data; esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data;
ESP_LOGD(TAG, "eth_action_start: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); ESP_LOGD(TAG, "eth_action_start: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data);
for (int i = 0; i < netif_glue->port_cnt; i++) { for (int i = 0; i < netif_glue->port_cnt; i++) {
@ -119,10 +122,13 @@ static void port_action_stop(void *handler_args, esp_event_base_t base, int32_t
// if one of the bridge's ports is stopped, we need to stop the bridge too, since port's lwip_netif is removed and so it would become // if one of the bridge's ports is stopped, we need to stop the bridge too, since port's lwip_netif is removed and so it would become
// an invalid reference in the bridge's internal structure (there is no way how to remove single port from bridge in current LwIP) // an invalid reference in the bridge's internal structure (there is no way how to remove single port from bridge in current LwIP)
#if CONFIG_ESP_WIFI_ENABLED
if (base == WIFI_EVENT) { if (base == WIFI_EVENT) {
ESP_LOGD(TAG, "wifi_action_stop: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data); ESP_LOGD(TAG, "wifi_action_stop: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data);
stop_br_if_started(netif_glue); stop_br_if_started(netif_glue);
} else if (base == ETH_EVENT) { } else
#endif /* CONFIG_ESP_WIFI_ENABLED */
if (base == ETH_EVENT) {
esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data; esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data;
ESP_LOGD(TAG, "eth_action_stop: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); ESP_LOGD(TAG, "eth_action_stop: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data);
for (int i = 0; i < netif_glue->port_cnt; i++) { for (int i = 0; i < netif_glue->port_cnt; i++) {
@ -142,11 +148,13 @@ static void port_action_connected(void *handler_args, esp_event_base_t base, int
ESP_LOGD(TAG, "action_connected, no action bridge is up"); ESP_LOGD(TAG, "action_connected, no action bridge is up");
return; return;
} }
#if CONFIG_ESP_WIFI_ENABLED
if (base == WIFI_EVENT) { if (base == WIFI_EVENT) {
ESP_LOGD(TAG, "wifi_action_connected: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data); ESP_LOGD(TAG, "wifi_action_connected: %p, %p, %" PRId32 ", %p", netif_glue, base, event_id, event_data);
esp_netif_action_connected(netif_glue->base.netif, 0, 0, NULL); esp_netif_action_connected(netif_glue->base.netif, 0, 0, NULL);
} else if (base == ETH_EVENT) { } else
#endif /* CONFIG_ESP_WIFI_ENABLED */
if (base == ETH_EVENT) {
esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data; esp_eth_handle_t eth_handle = *(esp_eth_handle_t *)event_data;
ESP_LOGD(TAG, "eth_action_connected: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data); ESP_LOGD(TAG, "eth_action_connected: %p, %p, %" PRId32 ", %p, %p", netif_glue, base, event_id, event_data, *(esp_eth_handle_t *)event_data);
for (int i = 0; i < netif_glue->port_cnt; i++) { for (int i = 0; i < netif_glue->port_cnt; i++) {
@ -253,6 +261,7 @@ fail:
return ret; return ret;
} }
#if CONFIG_ESP_WIFI_ENABLED
static esp_err_t esp_netif_br_glue_clear_instance_handlers_wifi(esp_netif_br_glue_handle_t esp_netif_br_glue) static esp_err_t esp_netif_br_glue_clear_instance_handlers_wifi(esp_netif_br_glue_handle_t esp_netif_br_glue)
{ {
ESP_RETURN_ON_FALSE(esp_netif_br_glue, ESP_ERR_INVALID_ARG, TAG, "esp_netif_br_glue handle can't be null"); ESP_RETURN_ON_FALSE(esp_netif_br_glue, ESP_ERR_INVALID_ARG, TAG, "esp_netif_br_glue handle can't be null");
@ -313,6 +322,7 @@ fail:
esp_netif_br_glue_clear_instance_handlers_wifi(esp_netif_br_glue); esp_netif_br_glue_clear_instance_handlers_wifi(esp_netif_br_glue);
return ret; return ret;
} }
#endif /* CONFIG_ESP_WIFI_ENABLED */
esp_err_t esp_netif_br_glue_add_port(esp_netif_br_glue_handle_t netif_br_glue, esp_netif_t *esp_netif_port) esp_err_t esp_netif_br_glue_add_port(esp_netif_br_glue_handle_t netif_br_glue, esp_netif_t *esp_netif_port)
{ {
@ -334,6 +344,7 @@ esp_err_t esp_netif_br_glue_add_port(esp_netif_br_glue_handle_t netif_br_glue, e
esp_err_t esp_netif_br_glue_add_wifi_port(esp_netif_br_glue_handle_t netif_br_glue, esp_netif_t *esp_netif_port) esp_err_t esp_netif_br_glue_add_wifi_port(esp_netif_br_glue_handle_t netif_br_glue, esp_netif_t *esp_netif_port)
{ {
#if CONFIG_ESP_WIFI_ENABLED
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
ESP_GOTO_ON_FALSE(netif_br_glue->wifi_esp_netif == NULL, ESP_ERR_INVALID_STATE, fail_ret, TAG, "WiFi interface already registered"); ESP_GOTO_ON_FALSE(netif_br_glue->wifi_esp_netif == NULL, ESP_ERR_INVALID_STATE, fail_ret, TAG, "WiFi interface already registered");
const char *if_desc = esp_netif_get_desc(esp_netif_port); const char *if_desc = esp_netif_get_desc(esp_netif_port);
@ -348,6 +359,9 @@ fail:
netif_br_glue->wifi_ctx_handlers = NULL; netif_br_glue->wifi_ctx_handlers = NULL;
fail_ret: fail_ret:
return ret; return ret;
#else
return ESP_ERR_NOT_SUPPORTED;
#endif /* CONFIG_ESP_WIFI_ENABLED */
} }
esp_netif_br_glue_handle_t esp_netif_br_glue_new(void) esp_netif_br_glue_handle_t esp_netif_br_glue_new(void)
@ -372,9 +386,11 @@ esp_err_t esp_netif_br_glue_del(esp_netif_br_glue_handle_t netif_br_glue)
{ {
stop_br_if_started(netif_br_glue); stop_br_if_started(netif_br_glue);
esp_netif_br_glue_clear_instance_handlers(netif_br_glue); esp_netif_br_glue_clear_instance_handlers(netif_br_glue);
#if CONFIG_ESP_WIFI_ENABLED
if (netif_br_glue->wifi_esp_netif != NULL) { if (netif_br_glue->wifi_esp_netif != NULL) {
esp_netif_br_glue_clear_instance_handlers_wifi(netif_br_glue); esp_netif_br_glue_clear_instance_handlers_wifi(netif_br_glue);
} }
#endif /* CONFIG_ESP_WIFI_ENABLED */
free(netif_br_glue->ports_esp_netifs); free(netif_br_glue->ports_esp_netifs);
free(netif_br_glue); free(netif_br_glue);
netif_br_glue = NULL; netif_br_glue = NULL;

6
examples/network/bridge/sdkconfig.ci Normal file
View File

@ -0,0 +1,6 @@
# This is the default CI config for building the example for all supported targets
# Note that it enables SPI Ethernet, so it uses eth-eth bridge (to support targets that don't have Wi-Fi)
CONFIG_ESP_NETIF_TCPIP_LWIP=y
CONFIG_ESP_NETIF_BRIDGE_EN=y
CONFIG_EXAMPLE_USE_SPI_ETHERNET=y
CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=1