espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 12:14:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(twai): only call esp_pm APIs when CONFIG_PM_ENABLE is enabled

Browse Source
This commit is contained in:
Chen Jichang
2025-05-16 14:04:58 +08:00
parent 57420057b6
commit 9e5ed3bdd2
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/driver/twai/twai.c
View File

@@ -100,8 +100,10 @@ typedef struct twai_obj_t {
SemaphoreHandle_t alert_semphr; SemaphoreHandle_t alert_semphr;
uint32_t alerts_enabled; uint32_t alerts_enabled;
uint32_t alerts_triggered; uint32_t alerts_triggered;
#ifdef CONFIG_PM_ENABLE
//Power Management Lock //Power Management Lock
esp_pm_lock_handle_t pm_lock; esp_pm_lock_handle_t pm_lock;
#endif
portMUX_TYPE spinlock; portMUX_TYPE spinlock;
} twai_obj_t; } twai_obj_t;

4
components/esp_driver_twai/esp_twai_onchip.c
View File

@@ -71,7 +71,9 @@ typedef struct {
uint32_t valid_fd_timing; uint32_t valid_fd_timing;
twai_event_callbacks_t cbs; twai_event_callbacks_t cbs;
void *user_data; void *user_data;
#ifdef CONFIG_PM_ENABLE
esp_pm_lock_handle_t pm_lock; esp_pm_lock_handle_t pm_lock;
#endif
_Atomic twai_error_state_t state; _Atomic twai_error_state_t state;
uint16_t tx_error_count; uint16_t tx_error_count;
@@ -285,9 +287,11 @@ static void _node_isr_main(void *arg)
static void _node_destroy(twai_onchip_ctx_t *twai_ctx) static void _node_destroy(twai_onchip_ctx_t *twai_ctx)
{ {
#ifdef CONFIG_PM_ENABLE
if (twai_ctx->pm_lock) { if (twai_ctx->pm_lock) {
esp_pm_lock_delete(twai_ctx->pm_lock); esp_pm_lock_delete(twai_ctx->pm_lock);
} }
#endif
if (twai_ctx->intr_hdl) { if (twai_ctx->intr_hdl) {
esp_intr_free(twai_ctx->intr_hdl); esp_intr_free(twai_ctx->intr_hdl);
} }