Files
guru/dev-embedded/esp-idf/files/esp-idf-5.3-fix-cpp-build-eth.patch
2024-07-30 14:57:14 +02:00

126 lines
6.9 KiB
Diff

diff --git a/components/esp_eth/include/esp_eth_mac_esp.h b/components/esp_eth/include/esp_eth_mac_esp.h
index 8c4909b8c5..39db373798 100644
--- a/components/esp_eth/include/esp_eth_mac_esp.h
+++ b/components/esp_eth/include/esp_eth_mac_esp.h
@@ -217,64 +217,64 @@ typedef enum {
#error "Unsupported RMII clock mode"
#endif // CONFIG_ETH_RMII_CLK_INPUT
-#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
- { \
- .smi_gpio = \
- { \
- .mdc_num = 23, \
- .mdio_num = 18 \
- }, \
- .interface = EMAC_DATA_INTERFACE_RMII, \
- .clock_config = \
- { \
- .rmii = \
- { \
- .clock_mode = DEFAULT_RMII_CLK_MODE, \
- .clock_gpio = DEFAULT_RMII_CLK_GPIO \
- } \
- }, \
- .dma_burst_len = ETH_DMA_BURST_LEN_32, \
- .intr_priority = 0, \
+#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
+ { \
+ .smi_gpio = \
+ { \
+ .mdc_num = 23, \
+ .mdio_num = 18 \
+ }, \
+ .interface = EMAC_DATA_INTERFACE_RMII, \
+ .clock_config = \
+ { \
+ .rmii = \
+ { \
+ .clock_mode = DEFAULT_RMII_CLK_MODE, \
+ .clock_gpio = (emac_rmii_clock_gpio_t) DEFAULT_RMII_CLK_GPIO \
+ } \
+ }, \
+ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
+ .intr_priority = 0, \
}
#elif CONFIG_IDF_TARGET_ESP32P4
-#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
- { \
- .smi_gpio = \
- { \
- .mdc_num = 31, \
- .mdio_num = 27 \
- }, \
- .interface = EMAC_DATA_INTERFACE_RMII, \
- .clock_config = \
- { \
- .rmii = \
- { \
- .clock_mode = EMAC_CLK_EXT_IN, \
- .clock_gpio = 50 \
- } \
- }, \
- .clock_config_out_in = \
- { \
- .rmii = \
- { \
- .clock_mode = EMAC_CLK_EXT_IN, \
- .clock_gpio = -1 \
- } \
- }, \
- .dma_burst_len = ETH_DMA_BURST_LEN_32, \
- .intr_priority = 0, \
- .emac_dataif_gpio = \
- { \
- .rmii = \
- { \
- .tx_en_num = 49, \
- .txd0_num = 34, \
- .txd1_num = 35, \
- .crs_dv_num = 28, \
- .rxd0_num = 29, \
- .rxd1_num = 30 \
- } \
- }, \
+#define ETH_ESP32_EMAC_DEFAULT_CONFIG() \
+ { \
+ .smi_gpio = \
+ { \
+ .mdc_num = 31, \
+ .mdio_num = 27 \
+ }, \
+ .interface = EMAC_DATA_INTERFACE_RMII, \
+ .clock_config = \
+ { \
+ .rmii = \
+ { \
+ .clock_mode = EMAC_CLK_EXT_IN, \
+ .clock_gpio = (emac_rmii_clock_gpio_t) 50 \
+ } \
+ }, \
+ .clock_config_out_in = \
+ { \
+ .rmii = \
+ { \
+ .clock_mode = EMAC_CLK_EXT_IN, \
+ .clock_gpio = (emac_rmii_clock_gpio_t) -1 \
+ } \
+ }, \
+ .dma_burst_len = ETH_DMA_BURST_LEN_32, \
+ .intr_priority = 0, \
+ .emac_dataif_gpio = \
+ { \
+ .rmii = \
+ { \
+ .tx_en_num = 49, \
+ .txd0_num = 34, \
+ .txd1_num = 35, \
+ .crs_dv_num = 28, \
+ .rxd0_num = 29, \
+ .rxd1_num = 30 \
+ } \
+ }, \
}
#endif // CONFIG_IDF_TARGET_ESP32P4