feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(esp_driver_uart): always use heap_caps_malloc to malloc memory base on flags

Browse Source
This commit is contained in:
Song Ruo Jing
2023-11-22 19:19:42 +08:00
parent 6ad80f0332
commit ef281dff5a
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp_driver_uart/src/uart.c
View File

@@ -11,7 +11,6 @@
#include "esp_log.h"
#include "esp_err.h"
#include "esp_check.h"
#include "malloc.h"
#include "freertos/FreeRTOS.h"
#include "freertos/queue.h"
#include "freertos/semphr.h"
@@ -525,7 +524,7 @@ esp_err_t uart_pattern_queue_reset(uart_port_t uart_num, int queue_length)
ESP_RETURN_ON_FALSE((uart_num < UART_NUM_MAX), ESP_FAIL, UART_TAG, "uart_num error");
ESP_RETURN_ON_FALSE((p_uart_obj[uart_num]), ESP_ERR_INVALID_STATE, UART_TAG, "uart driver error");
int *pdata = (int *) malloc(queue_length * sizeof(int));
int *pdata = (int *)heap_caps_malloc(queue_length * sizeof(int), UART_MALLOC_CAPS);
if (pdata == NULL) {
return ESP_ERR_NO_MEM;
}

2
components/esp_driver_uart/test_apps/uart/main/CMakeLists.txt
View File

@@ -2,6 +2,6 @@
# the component can be registered as WHOLE_ARCHIVE
idf_component_register(
SRCS "test_app_main.c" "test_uart.c"
REQUIRES esp_driver_uart unity
REQUIRES esp_driver_uart unity esp_psram
WHOLE_ARCHIVE
)

15
components/esp_driver_uart/test_apps/uart/pytest_uart.py
View File

@@ -5,6 +5,7 @@ import pytest
@pytest.mark.supported_targets
@pytest.mark.temp_skip_ci(targets=['esp32s3'], reason='skip due to duplication with test_uart_single_dev_psram')
@pytest.mark.generic
@pytest.mark.parametrize(
'config',
@@ -16,3 +17,17 @@ import pytest
)
def test_uart_single_dev(case_tester) -> None: # type: ignore
case_tester.run_all_normal_cases(reset=True)
@pytest.mark.esp32s3
@pytest.mark.octal_psram
@pytest.mark.parametrize(
'config',
[
'iram_safe',
'release',
],
indirect=True,
)
def test_uart_single_dev_psram(case_tester) -> None: # type: ignore
case_tester.run_all_normal_cases(reset=True)

4
components/esp_driver_uart/test_apps/uart/sdkconfig.defaults.esp32s3 Normal file
View File

@@ -0,0 +1,4 @@
CONFIG_SPIRAM=y
CONFIG_SPIRAM_MODE_OCT=y
CONFIG_SPIRAM_SPEED_80M=y
CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0