changes: change esp_dma_calloc to esp_dma_capable_calloc to fix build warrning

Author: muhaidong

src/esp_sip.c

@@ -77,7 +77,11 @@ esp_err_t esp_sip_write_mem(uint32_t addr, const uint8_t *buf, uint32_t len)
 
     if (sip->rawbuf == NULL) {
         size_t actual_size = 0;
-        err = esp_dma_calloc(1, SIP_BOOT_BUF_SIZE, 0, (void*)&sip->rawbuf, &actual_size);
+        esp_dma_mem_info_t dma_mem_info = {
+            .extra_heap_caps = MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL,
+            .dma_alignment_bytes = 4, //legacy API behaviour is only check max dma buffer alignment
+        };
+        err = esp_dma_capable_malloc(SIP_BOOT_BUF_SIZE, &dma_mem_info, (void*)&sip->rawbuf, &actual_size);
     }
 
     chdr = (struct sip_hdr *)sip->rawbuf;

src/ext_sdio_adapter.c

@@ -222,7 +222,11 @@ esp_err_t esp_extconn_sdio_read_reg_window(unsigned int reg_addr, uint8_t *value
     ESP_RETURN_ON_FALSE(reg_addr <= 0x7f, ESP_ERR_INVALID_ARG, TAG, "Invalid parameters");
 
     size_t actual_size = 0;
-    esp_dma_calloc(1, sizeof(uint32_t), 0, (void*)&p_tbuf, &actual_size);
+    esp_dma_mem_info_t dma_mem_info = {
+        .extra_heap_caps = MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL,
+        .dma_alignment_bytes = 4, //legacy API behaviour is only check max dma buffer alignment
+    };
+    esp_dma_capable_malloc(sizeof(uint32_t), &dma_mem_info, (void*)&p_tbuf, &actual_size);
     ESP_RETURN_ON_FALSE(p_tbuf != NULL, ESP_ERR_NO_MEM, TAG, "Fatal: Sufficient memory");
 
     p_tbuf[0] = (reg_addr & 0x7f);
@@ -255,7 +259,11 @@ static int esp_extconn_sdio_write_reg_window(unsigned int reg_addr, uint8_t *val
     ESP_RETURN_ON_FALSE(reg_addr <= 0x7f, ESP_ERR_INVALID_ARG, TAG, "Invalid parameters");
 
     size_t actual_size = 0;
-    esp_dma_calloc(1, sizeof(uint32_t), 0, (void*)&p_tbuf, &actual_size);
+    esp_dma_mem_info_t dma_mem_info = {
+        .extra_heap_caps = MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL,
+        .dma_alignment_bytes = 4, //legacy API behaviour is only check max dma buffer alignment
+    };
+    esp_dma_capable_malloc(sizeof(uint32_t), &dma_mem_info, (void*)&p_tbuf, &actual_size);
     ESP_RETURN_ON_FALSE(p_tbuf != NULL, ESP_ERR_NO_MEM, TAG, "Fatal: Sufficient memory");
 
     memcpy(p_tbuf, value, 4);
@@ -272,7 +280,11 @@ static esp_err_t esp_extconn_sdio_init_slave_link(void)
 {
     uint32_t *t_buf = NULL;
     size_t actual_size = 0;
-    esp_dma_calloc(1, sizeof(uint32_t), 0, (void*)&t_buf, &actual_size);
+    esp_dma_mem_info_t dma_mem_info = {
+        .extra_heap_caps = MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL,
+        .dma_alignment_bytes = 4, //legacy API behaviour is only check max dma buffer alignment
+    };
+    esp_dma_capable_malloc(sizeof(uint32_t), &dma_mem_info, (void*)&t_buf, &actual_size);
     ESP_RETURN_ON_FALSE(t_buf != NULL, ESP_ERR_NO_MEM, TAG, "Fatal: Sufficient memory");
 
     // set stitch en
@@ -303,7 +315,7 @@ static esp_err_t esp_extconn_sdio_init_slave_link(void)
 
     // Enable target interrupt
     uint32_t *val = 0;
-    esp_dma_calloc(1, sizeof(uint32_t), 0, (void*)&val, &actual_size);
+    esp_dma_capable_malloc(sizeof(uint32_t), &dma_mem_info, (void*)&val, &actual_size);
     ESP_RETURN_ON_FALSE(val != NULL, ESP_ERR_NO_MEM, TAG, "Fatal: Sufficient memory");
 
     extconn_sdio_read_bytes(host->card, 1, ESP_SDIO_FUNC1_INT_ENA, (uint8_t *)val, sizeof(uint32_t));

src/trans_bt.c

@@ -68,7 +68,11 @@ static void bt_tx_task(void *arg)
 
         if (buf.data && buf.len) {
             size_t actual_size = 0;
-            ESP_ERROR_CHECK(esp_dma_calloc(1, sizeof(sbp_hdr_t) + buf.len, 0, (void*)&hdr, &actual_size));
+            esp_dma_mem_info_t dma_mem_info = {
+                .extra_heap_caps = MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL,
+                .dma_alignment_bytes = 4, //legacy API behaviour is only check max dma buffer alignment
+            };
+            ESP_ERROR_CHECK(esp_dma_capable_malloc(sizeof(sbp_hdr_t) + buf.len, &dma_mem_info, (void*)&hdr, &actual_size));
 
             hdr->len = sizeof(sbp_hdr_t) + buf.len;
             hdr->type = 0;

src/trans_recv.c

@@ -174,7 +174,11 @@ esp_err_t esp_extconn_trans_recv_init(esp_extconn_config_t *config)
 {
     sdio_mutex = xSemaphoreCreateMutex();
     size_t actual_size = 0;
-    ESP_ERROR_CHECK(esp_dma_calloc(1, RECV_BUF_LEN, 0, (void*)&recv_buf, &actual_size));
+    esp_dma_mem_info_t dma_mem_info = {
+        .extra_heap_caps = MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL,
+        .dma_alignment_bytes = 4, //legacy API behaviour is only check max dma buffer alignment
+    };
+    ESP_ERROR_CHECK(esp_dma_capable_malloc(RECV_BUF_LEN, &dma_mem_info, (void*)&recv_buf, &actual_size));
 
     ESP_RETURN_ON_FALSE(recv_buf, ESP_ERR_NO_MEM, TAG, "buffer malloc failed");
 

src/trans_wifi.c

@@ -143,7 +143,11 @@ static void wifi_send_task(void *args)
     uint8_t *send_buf = NULL; //calloc(1, WIFI_SEND_BUFFER_LEN);
 
     size_t actual_size = 0;
-    ESP_ERROR_CHECK(esp_dma_calloc(1, WIFI_SEND_BUFFER_LEN, 0, (void*)&send_buf, &actual_size));
+    esp_dma_mem_info_t dma_mem_info = {
+        .extra_heap_caps = MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL,
+        .dma_alignment_bytes = 4, //legacy API behaviour is only check max dma buffer alignment
+    };
+    ESP_ERROR_CHECK(esp_dma_capable_malloc(WIFI_SEND_BUFFER_LEN, &dma_mem_info, (void*)&send_buf, &actual_size));
 
     ESP_LOGI(TAG, "WiFi Send START");