diff --git a/components/esp_coex/esp32c5/esp_coex_adapter.c b/components/esp_coex/esp32c5/esp_coex_adapter.c index 1c41974a90..a3a27d288d 100644 --- a/components/esp_coex/esp32c5/esp_coex_adapter.c +++ b/components/esp_coex/esp32c5/esp_coex_adapter.c @@ -9,7 +9,6 @@ #include #include #include -#include #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/components/esp_phy/esp32c5/include/phy_init_data.h b/components/esp_phy/esp32c5/include/phy_init_data.h index 87734819db..2dac61b92b 100644 --- a/components/esp_phy/esp32c5/include/phy_init_data.h +++ b/components/esp_phy/esp32c5/include/phy_init_data.h @@ -6,6 +6,7 @@ #ifndef PHY_INIT_DATA_H #define PHY_INIT_DATA_H /* don't use #pragma once here, we compile this file sometimes */ +#include #include "esp_phy_init.h" #include "sdkconfig.h" @@ -299,10 +300,10 @@ static const char __attribute__((section(".rodata"))) phy_init_magic_post[] = PH #if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN /** - * @brief PHY init data control infomation structure + * @brief PHY init data control information structure */ typedef struct { - uint8_t control_info_checksum[4]; /*!< 4-byte control infomation checksum */ + uint8_t control_info_checksum[4]; /*!< 4-byte control information checksum */ uint8_t multiple_bin_checksum[4]; /*!< 4-byte multiple bin checksum */ uint8_t check_algorithm; /*!< check algorithm */ uint8_t version; /*!< PHY init data bin version */ diff --git a/components/esp_phy/include/esp_phy_init.h b/components/esp_phy/include/esp_phy_init.h index 8e0a6cf8f7..95756568b4 100644 --- a/components/esp_phy/include/esp_phy_init.h +++ b/components/esp_phy/include/esp_phy_init.h @@ -8,6 +8,7 @@ #include #include #include "esp_err.h" +#include "sdkconfig.h" #ifdef __cplusplus extern "C" { diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c index 3bfbb4f47a..685f04f039 100644 --- a/components/esp_phy/src/phy_init.c +++ b/components/esp_phy/src/phy_init.c @@ -315,7 +315,7 @@ void esp_phy_disable(esp_phy_modem_t modem) #endif } #if CONFIG_IDF_TARGET_ESP32 - // Update WiFi MAC time before disalbe WiFi/BT common peripheral clock + // Update WiFi MAC time before disable WiFi/BT common peripheral clock phy_update_wifi_mac_time(true, esp_timer_get_time()); #endif // Disable WiFi/BT common peripheral clock. Do not disable clock for hardware RNG @@ -912,7 +912,7 @@ static uint8_t phy_find_bin_type_according_country(const char* country) if (i == sizeof(s_country_code_map_type_table)/sizeof(phy_country_to_bin_type_t)) { phy_init_data_type = ESP_PHY_INIT_DATA_TYPE_DEFAULT; - ESP_LOGW(TAG, "Use the default certification code beacuse %c%c doesn't have a certificate", country[0], country[1]); + ESP_LOGW(TAG, "Use the default certification code because %c%c doesn't have a certificate", country[0], country[1]); } return phy_init_data_type; diff --git a/components/hal/include/hal/modem_clock_hal.h b/components/hal/include/hal/modem_clock_hal.h index 713e458ca6..e5c23df268 100644 --- a/components/hal/include/hal/modem_clock_hal.h +++ b/components/hal/include/hal/modem_clock_hal.h @@ -19,10 +19,12 @@ extern "C" { #endif +#if !CONFIG_IDF_TARGET_ESP32C5_MP_VERSION typedef struct { modem_syscon_dev_t *syscon_dev; modem_lpcon_dev_t *lpcon_dev; } modem_clock_hal_context_t; +#endif #if !CONFIG_IDF_TARGET_ESP32H2 //TODO: PM-92 void modem_clock_hal_set_clock_domain_icg_bitmap(modem_clock_hal_context_t *hal, modem_clock_domain_t domain, uint32_t bitmap); diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index 36924700a8..72e9476416 100644 --- a/tools/ci/check_public_headers_exceptions.txt +++ b/tools/ci/check_public_headers_exceptions.txt @@ -31,6 +31,7 @@ components/esp_phy/esp32s2/include/phy_init_data.h components/esp_phy/esp32s3/include/phy_init_data.h components/esp_phy/esp32c3/include/phy_init_data.h components/esp_phy/esp32c2/include/phy_init_data.h +components/esp_phy/esp32c5/include/phy_init_data.h components/esp_phy/esp32c6/include/phy_init_data.h components/spi_flash/include/spi_flash_chip_issi.h