mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

esp_adc: fix dead code reported by coverity

pull/9491/head
morris 2022-07-20 11:29:23 +08:00
rodzic 9d0c72aad0
commit 5dbae0c2cd
3 zmienionych plików z 16 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
components/esp_adc/adc_continuous.c
Wyświetl plik

@ -346,7 +346,7 @@ static IRAM_ATTR bool s_adc_dma_intr(adc_continuous_ctx_t *adc_digi_ctx)
//ringbuffer overflow //ringbuffer overflow
if (adc_digi_ctx->cbs.on_pool_ovf) { if (adc_digi_ctx->cbs.on_pool_ovf) {
adc_continuous_evt_data_t edata = {}; adc_continuous_evt_data_t edata = {};
if (adc_digi_ctx->cbs.on_conv_done(adc_digi_ctx, &edata, adc_digi_ctx->user_data)) { if (adc_digi_ctx->cbs.on_pool_ovf(adc_digi_ctx, &edata, adc_digi_ctx->user_data)) {
need_yield |= true; need_yield |= true;
} }
} }

18
components/esp_adc/adc_lock.c
Wyświetl plik

@ -21,27 +21,27 @@ static const char *TAG = "adc_lock";
static _lock_t adc1_lock; static _lock_t adc1_lock;
static _lock_t adc2_lock; static _lock_t adc2_lock;
esp_err_t adc_lock_acquire(adc_unit_t unit_mask) esp_err_t adc_lock_acquire(adc_unit_t adc_unit)
{ {
if (unit_mask & ADC_UNIT_1) { if (adc_unit == ADC_UNIT_1) {
_lock_acquire(&adc1_lock); _lock_acquire(&adc1_lock);
} }
if (unit_mask & ADC_UNIT_2) { if (adc_unit == ADC_UNIT_2) {
_lock_acquire(&adc2_lock); _lock_acquire(&adc2_lock);
} }
return ESP_OK; return ESP_OK;
} }
esp_err_t adc_lock_release(adc_unit_t unit_mask) esp_err_t adc_lock_release(adc_unit_t adc_unit)
{ {
if (unit_mask & ADC_UNIT_2) { if (adc_unit == ADC_UNIT_2) {
ESP_RETURN_ON_FALSE(((uint32_t *)adc2_lock != NULL), ESP_ERR_INVALID_STATE, TAG, "adc2 lock release without acquiring"); ESP_RETURN_ON_FALSE(((uint32_t *)adc2_lock != NULL), ESP_ERR_INVALID_STATE, TAG, "adc2 lock release without acquiring");
_lock_release(&adc2_lock); _lock_release(&adc2_lock);
} }
if (unit_mask & ADC_UNIT_1) { if (adc_unit == ADC_UNIT_1) {
ESP_RETURN_ON_FALSE(((uint32_t *)adc1_lock != NULL), ESP_ERR_INVALID_STATE, TAG, "adc1 lock release without acquiring"); ESP_RETURN_ON_FALSE(((uint32_t *)adc1_lock != NULL), ESP_ERR_INVALID_STATE, TAG, "adc1 lock release without acquiring");
_lock_release(&adc1_lock); _lock_release(&adc1_lock);
} }
@ -49,15 +49,15 @@ esp_err_t adc_lock_release(adc_unit_t unit_mask)
return ESP_OK; return ESP_OK;
} }
esp_err_t adc_lock_try_acquire(adc_unit_t unit_mask) esp_err_t adc_lock_try_acquire(adc_unit_t adc_unit)
{ {
if (unit_mask & ADC_UNIT_1) { if (adc_unit == ADC_UNIT_1) {
if (_lock_try_acquire(&adc1_lock) == -1) { if (_lock_try_acquire(&adc1_lock) == -1) {
return ESP_ERR_TIMEOUT; return ESP_ERR_TIMEOUT;
} }
} }
if (unit_mask & ADC_UNIT_2) { if (adc_unit == ADC_UNIT_2) {
if (_lock_try_acquire(&adc2_lock) == -1) { if (_lock_try_acquire(&adc2_lock) == -1) {
return ESP_ERR_TIMEOUT; return ESP_ERR_TIMEOUT;
} }

12
components/esp_adc/include/esp_private/adc_lock.h
Wyświetl plik

@ -20,25 +20,25 @@ extern "C" {
* *
* @note If any of the locks are taken, this API will wait until the lock is successfully acquired. * @note If any of the locks are taken, this API will wait until the lock is successfully acquired.
* *
* @param[in] unit_mask ADC unit mask * @param[in] adc_unit ADC unit ID
* *
* @return * @return
* - ESP_OK: On success * - ESP_OK: On success
*/ */
esp_err_t adc_lock_acquire(adc_unit_t unit_mask); esp_err_t adc_lock_acquire(adc_unit_t adc_unit);
/** /**
* @brief Release ADC lock by unit * @brief Release ADC lock by unit
* *
* The lock releasing sequence will be: ..., ADC2, ADC1 * The lock releasing sequence will be: ..., ADC2, ADC1
* *
* @param[in] unit_mask ADC unit mask * @param[in] adc_unit ADC unit ID
* *
* @return * @return
* - ESP_OK: On success * - ESP_OK: On success
* - ESP_ERR_INVALID_STATE: The lock(s) isn't acquired yet * - ESP_ERR_INVALID_STATE: The lock(s) isn't acquired yet
*/ */
esp_err_t adc_lock_release(adc_unit_t unit_mask); esp_err_t adc_lock_release(adc_unit_t adc_unit);
/** /**
* @brief Try to acquire ADC lock by unit * @brief Try to acquire ADC lock by unit
@ -47,13 +47,13 @@ esp_err_t adc_lock_release(adc_unit_t unit_mask);
* *
* @note If any of the locks are taken, this API will return immediately with an error `ESP_ERR_TIMEOUT` * @note If any of the locks are taken, this API will return immediately with an error `ESP_ERR_TIMEOUT`
* *
* @param[in] unit_mask ADC unit mask * @param[in] adc_unit ADC unit ID
* *
* @return * @return
* - ESP_OK: On success * - ESP_OK: On success
* - ESP_ERR_TIMEOUT: Lock(s) is taken already * - ESP_ERR_TIMEOUT: Lock(s) is taken already
*/ */
esp_err_t adc_lock_try_acquire(adc_unit_t unit_mask); esp_err_t adc_lock_try_acquire(adc_unit_t adc_unit);
#ifdef __cplusplus #ifdef __cplusplus
} }