Skip to content

Commit 2b12fb6

Browse files
committed
Merge branch 'docs/fix_section_visibility_esp32p4_v5.4' into 'release/v5.4'
Fix typo to make a section visible for non-esp32 SPIRAM supported targets (v5.4) See merge request espressif/esp-idf!34680
2 parents 7f42ed3 + 7c9bec2 commit 2b12fb6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docs/en/api-reference/system/mem_alloc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ DMA-Capable Memory
105105

106106
Use the ``MALLOC_CAP_DMA`` flag to allocate memory which is suitable for use with hardware DMA engines (for example SPI and I2S). This capability flag excludes any external PSRAM.
107107

108-
.. only SOC_SPIRAM_SUPPORTED and not esp32::
108+
.. only:: SOC_SPIRAM_SUPPORTED and not esp32
109109

110110
The EDMA hardware feature allows DMA buffers to be placed in external PSRAM, but there may be additional alignment constraints. Consult the {IDF_TARGET_NAME} Technical Reference Manual for details. To allocate a DMA-capable external memory buffer, use the ``MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA`` capabilities flags; the heap allocator will take care of alignment requirements imposed by the cache and DMA subsystems. If a peripheral has additional alignment requirements, you can use :cpp:func:`heap_caps_aligned_alloc` with the necessary alignment specified.
111111

docs/zh_CN/api-reference/system/mem_alloc.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ DMA 存储器
105105

106106
使用 ``MALLOC_CAP_DMA`` 标志分配适合与硬件 DMA 引擎(如 SPI 和 I2S)配合使用的内存,此属性标志不包括外部 PSRAM。
107107

108-
.. only SOC_SPIRAM_SUPPORTED and not esp32::
108+
.. only:: SOC_SPIRAM_SUPPORTED and not esp32
109109

110110
EDMA 硬件功能可以将 DMA buffer 放置在外部 PSRAM,但可能存在一定的对齐限制,详情请参阅 {IDF_TARGET_NAME} 技术参考手册。若要分配一个可用 DMA 的外部 buffer,请使用 ``MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA`` 属性标志,堆分配器将处理 cache 及 DMA 子系统的对齐要求。如果某个外设有额外的对齐要求,可以调用 :cpp:func:heap_caps_aligned_alloc 并指定必要的对齐方式。
111111

0 commit comments

Comments
 (0)