alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

change(adc): refactor DMA memory allocation

Browse Source
This commit is contained in:
morris 2024-06-17 11:11:06 +08:00
parent b4b1906d2c
commit ea9630d977
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/esp_adc/adc_continuous.c
View File

@ -37,7 +37,6 @@
#include "adc_continuous_internal.h" #include "adc_continuous_internal.h"
#include "esp_private/adc_dma.h" #include "esp_private/adc_dma.h"
#include "adc_dma_internal.h" #include "adc_dma_internal.h"
#include "esp_dma_utils.h"
#if SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE #if SOC_CACHE_INTERNAL_MEM_VIA_L1CACHE
#include "esp_cache.h" #include "esp_cache.h"
#include "esp_private/esp_cache_private.h" #include "esp_private/esp_cache_private.h"
@ -192,11 +191,7 @@ esp_err_t adc_continuous_new_handle(const adc_continuous_handle_cfg_t *hdl_confi
} }
//malloc internal buffer used by DMA //malloc internal buffer used by DMA
esp_dma_mem_info_t dma_mem_info = { adc_ctx->rx_dma_buf = heap_caps_calloc(INTERNAL_BUF_NUM, hdl_config->conv_frame_size, MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA | MALLOC_CAP_8BIT);
.extra_heap_caps = (MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA),
.dma_alignment_bytes = 4,
};
esp_dma_capable_calloc(1, hdl_config->conv_frame_size * INTERNAL_BUF_NUM, &dma_mem_info, (void **)&adc_ctx->rx_dma_buf, NULL);
if (!adc_ctx->rx_dma_buf) { if (!adc_ctx->rx_dma_buf) {
ret = ESP_ERR_NO_MEM; ret = ESP_ERR_NO_MEM;
goto cleanup; goto cleanup;
@ -205,7 +200,7 @@ esp_err_t adc_continuous_new_handle(const adc_continuous_handle_cfg_t *hdl_confi
//malloc dma descriptor //malloc dma descriptor
uint32_t dma_desc_num_per_frame = (hdl_config->conv_frame_size + DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED - 1) / DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED; uint32_t dma_desc_num_per_frame = (hdl_config->conv_frame_size + DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED - 1) / DMA_DESCRIPTOR_BUFFER_MAX_SIZE_4B_ALIGNED;
uint32_t dma_desc_max_num = dma_desc_num_per_frame * INTERNAL_BUF_NUM; uint32_t dma_desc_max_num = dma_desc_num_per_frame * INTERNAL_BUF_NUM;
esp_dma_capable_calloc(1, (sizeof(dma_descriptor_t)) * dma_desc_max_num, &dma_mem_info, (void **)&adc_ctx->hal.rx_desc, &adc_ctx->adc_desc_size); adc_ctx->hal.rx_desc = heap_caps_aligned_calloc(ADC_DMA_DESC_ALIGN, dma_desc_max_num, sizeof(dma_descriptor_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_DMA | MALLOC_CAP_8BIT);
if (!adc_ctx->hal.rx_desc) { if (!adc_ctx->hal.rx_desc) {
ret = ESP_ERR_NO_MEM; ret = ESP_ERR_NO_MEM;
goto cleanup; goto cleanup;
@ -550,12 +545,12 @@ esp_err_t adc_continuous_flush_pool(adc_continuous_handle_t handle)
return ESP_OK; return ESP_OK;
} }
esp_err_t adc_continuous_io_to_channel(int io_num, adc_unit_t * const unit_id, adc_channel_t * const channel) esp_err_t adc_continuous_io_to_channel(int io_num, adc_unit_t *const unit_id, adc_channel_t *const channel)
{ {
return adc_io_to_channel(io_num, unit_id, channel); return adc_io_to_channel(io_num, unit_id, channel);
} }
esp_err_t adc_continuous_channel_to_io(adc_unit_t unit_id, adc_channel_t channel, int * const io_num) esp_err_t adc_continuous_channel_to_io(adc_unit_t unit_id, adc_channel_t channel, int *const io_num)
{ {
return adc_channel_to_io(unit_id, channel, io_num); return adc_channel_to_io(unit_id, channel, io_num);
} }

2
components/esp_adc/adc_dma_internal.h
View File

@ -32,6 +32,8 @@ typedef struct {
intr_handle_t dma_intr_hdl; intr_handle_t dma_intr_hdl;
} adc_dma_t; } adc_dma_t;
#define ADC_DMA_DESC_ALIGN 4
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif