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

Merge branch 'bugfix/can_semaphore_take_in_critical' into 'master'

Browse Source 
can: Fix semaphore take in critical section

Closes IDFGH-2115

See merge request espressif/esp-idf!7083
This commit is contained in:
Mahavir Jain
2019-12-26 16:15:07 +08:00
parent c378bd210c 4c3d49e3f0
commit 9738bc58ed
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/driver/can.c
View File

@@ -958,15 +958,16 @@ esp_err_t can_read_alerts(uint32_t *alerts, TickType_t ticks_to_wait)
esp_err_t can_reconfigure_alerts(uint32_t alerts_enabled, uint32_t *current_alerts) esp_err_t can_reconfigure_alerts(uint32_t alerts_enabled, uint32_t *current_alerts)
{ {
CAN_CHECK(p_can_obj != NULL, ESP_ERR_INVALID_STATE); CAN_CHECK(p_can_obj != NULL, ESP_ERR_INVALID_STATE);
CAN_ENTER_CRITICAL(); CAN_ENTER_CRITICAL();
uint32_t cur_alerts; //Clear any unhandled alerts
can_read_alerts(&cur_alerts, 0); //Clear any unhandled alerts if (current_alerts != NULL) {
*current_alerts = p_can_obj->alerts_triggered;;
}
p_can_obj->alerts_triggered = 0;
p_can_obj->alerts_enabled = alerts_enabled; //Update enabled alerts p_can_obj->alerts_enabled = alerts_enabled; //Update enabled alerts
CAN_EXIT_CRITICAL(); CAN_EXIT_CRITICAL();
if (current_alerts != NULL) {
*current_alerts = cur_alerts;
}
return ESP_OK; return ESP_OK;
} }