feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(esp_eth): fix variable declarations inside switch for clang

Browse Source
This commit is contained in:
Ivan Grokhotkov
2024-07-12 12:14:32 +02:00
parent 5448703663
commit 728136a91d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/esp_eth/src/mac/esp_eth_mac_esp.c
View File

@@ -260,8 +260,7 @@ esp_err_t emac_esp_custom_ioctl(esp_eth_mac_t *mac, int cmd, void *data)
{ {
emac_esp32_t *emac = __containerof(mac, emac_esp32_t, parent); emac_esp32_t *emac = __containerof(mac, emac_esp32_t, parent);
switch (cmd) switch (cmd) {
{
case ETH_MAC_ESP_CMD_PTP_ENABLE: case ETH_MAC_ESP_CMD_PTP_ENABLE:
return ESP_ERR_NOT_SUPPORTED; return ESP_ERR_NOT_SUPPORTED;
case ETH_MAC_ESP_CMD_SET_TDES0_CFG_BITS: case ETH_MAC_ESP_CMD_SET_TDES0_CFG_BITS:
@@ -583,7 +582,7 @@ static esp_err_t emac_esp_config_data_interface(const eth_esp32_emac_config_t *e
{ {
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
switch (esp32_emac_config->interface) { switch (esp32_emac_config->interface) {
case EMAC_DATA_INTERFACE_MII: case EMAC_DATA_INTERFACE_MII: {
/* MII interface GPIO initialization */ /* MII interface GPIO initialization */
#if SOC_EMAC_MII_USE_GPIO_MATRIX #if SOC_EMAC_MII_USE_GPIO_MATRIX
ESP_GOTO_ON_ERROR(emac_esp_gpio_matrix_init_mii(&esp32_emac_config->emac_dataif_gpio.mii), err, TAG, "failed to initialize EMAC MII GPIO Matrix"); ESP_GOTO_ON_ERROR(emac_esp_gpio_matrix_init_mii(&esp32_emac_config->emac_dataif_gpio.mii), err, TAG, "failed to initialize EMAC MII GPIO Matrix");
@@ -599,7 +598,8 @@ static esp_err_t emac_esp_config_data_interface(const eth_esp32_emac_config_t *e
emac_hal_clock_enable_mii(&emac->hal); emac_hal_clock_enable_mii(&emac->hal);
} }
break; break;
case EMAC_DATA_INTERFACE_RMII: }
case EMAC_DATA_INTERFACE_RMII: {
/* RMII interface GPIO initialization */ /* RMII interface GPIO initialization */
const eth_mac_rmii_gpio_config_t *rmii_data_gpio = NULL; const eth_mac_rmii_gpio_config_t *rmii_data_gpio = NULL;
#if SOC_EMAC_USE_MULTI_IO_MUX #if SOC_EMAC_USE_MULTI_IO_MUX
@@ -640,6 +640,7 @@ static esp_err_t emac_esp_config_data_interface(const eth_esp32_emac_config_t *e
ESP_GOTO_ON_FALSE(false, ESP_ERR_INVALID_ARG, err, TAG, "invalid EMAC clock mode"); ESP_GOTO_ON_FALSE(false, ESP_ERR_INVALID_ARG, err, TAG, "invalid EMAC clock mode");
} }
break; break;
}
default: default:
ESP_GOTO_ON_FALSE(false, ESP_ERR_INVALID_ARG, err, TAG, "invalid EMAC Data Interface:%i", esp32_emac_config->interface); ESP_GOTO_ON_FALSE(false, ESP_ERR_INVALID_ARG, err, TAG, "invalid EMAC Data Interface:%i", esp32_emac_config->interface);
} }