Merge branch 'bugfix/gptimer_alarm_config_in_sram_v5.1' into 'release/v5.1'

feat(gptimer): check the alarm config is not in flash (v5.1)

See merge request espressif/esp-idf!30135
release/v5.1
Jiang Jiang Jian 2024-04-12 09:08:41 +08:00
commit ac3087ea36
1 zmienionych plików z 3 dodań i 0 usunięć

Wyświetl plik

@ -262,6 +262,9 @@ esp_err_t gptimer_set_alarm_action(gptimer_handle_t timer, const gptimer_alarm_c
{
ESP_RETURN_ON_FALSE_ISR(timer, ESP_ERR_INVALID_ARG, TAG, "invalid argument");
if (config) {
#if CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM
ESP_RETURN_ON_FALSE_ISR(esp_ptr_internal(config), ESP_ERR_INVALID_ARG, TAG, "alarm config struct not in internal RAM");
#endif
// When auto_reload is enabled, alarm_count should not be equal to reload_count
bool valid_auto_reload = !config->flags.auto_reload_on_alarm || config->alarm_count != config->reload_count;
ESP_RETURN_ON_FALSE_ISR(valid_auto_reload, ESP_ERR_INVALID_ARG, TAG, "reload count can't equal to alarm count");