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

fix(CI): fix CI to pass fast build app

Browse Source
This commit is contained in:
zwx
2024-03-26 19:22:47 +08:00
committed by BOT
parent d69c25b997
commit d2e0b9419f
6 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_coex/esp32c5/esp_coex_adapter.c
View File

@@ -9,7 +9,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <pthread.h>
#include "freertos/FreeRTOS.h" #include "freertos/FreeRTOS.h"
#include "freertos/task.h" #include "freertos/task.h"

5
components/esp_phy/esp32c5/include/phy_init_data.h
View File

@@ -6,6 +6,7 @@
#ifndef PHY_INIT_DATA_H #ifndef PHY_INIT_DATA_H
#define PHY_INIT_DATA_H /* don't use #pragma once here, we compile this file sometimes */ #define PHY_INIT_DATA_H /* don't use #pragma once here, we compile this file sometimes */
#include <stdint.h>
#include "esp_phy_init.h" #include "esp_phy_init.h"
#include "sdkconfig.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 #if CONFIG_ESP_PHY_MULTIPLE_INIT_DATA_BIN
/** /**
* @brief PHY init data control infomation structure * @brief PHY init data control information structure
*/ */
typedef struct { 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 multiple_bin_checksum[4]; /*!< 4-byte multiple bin checksum */
uint8_t check_algorithm; /*!< check algorithm */ uint8_t check_algorithm; /*!< check algorithm */
uint8_t version; /*!< PHY init data bin version */ uint8_t version; /*!< PHY init data bin version */

1
components/esp_phy/include/esp_phy_init.h
View File

@@ -8,6 +8,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "esp_err.h" #include "esp_err.h"
#include "sdkconfig.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

4
components/esp_phy/src/phy_init.c
View File

@@ -315,7 +315,7 @@ void esp_phy_disable(esp_phy_modem_t modem)
#endif #endif
} }
#if CONFIG_IDF_TARGET_ESP32 #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()); phy_update_wifi_mac_time(true, esp_timer_get_time());
#endif #endif
// Disable WiFi/BT common peripheral clock. Do not disable clock for hardware RNG // 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)) { 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; 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; return phy_init_data_type;

2
components/hal/include/hal/modem_clock_hal.h
View File

@@ -19,10 +19,12 @@
extern "C" { extern "C" {
#endif #endif
#if !CONFIG_IDF_TARGET_ESP32C5_MP_VERSION
typedef struct { typedef struct {
modem_syscon_dev_t *syscon_dev; modem_syscon_dev_t *syscon_dev;
modem_lpcon_dev_t *lpcon_dev; modem_lpcon_dev_t *lpcon_dev;
} modem_clock_hal_context_t; } modem_clock_hal_context_t;
#endif
#if !CONFIG_IDF_TARGET_ESP32H2 //TODO: PM-92 #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); void modem_clock_hal_set_clock_domain_icg_bitmap(modem_clock_hal_context_t *hal, modem_clock_domain_t domain, uint32_t bitmap);

1
tools/ci/check_public_headers_exceptions.txt
View File

@@ -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/esp32s3/include/phy_init_data.h
components/esp_phy/esp32c3/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/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/esp_phy/esp32c6/include/phy_init_data.h
components/spi_flash/include/spi_flash_chip_issi.h components/spi_flash/include/spi_flash_chip_issi.h