Revert "espressif: port_malloc() shoud not use SPIRAM when dma_capable=true"

bill88t · bill88t · commit 8af7f377078a · 2025-07-11T21:18:21.000+03:00
This reverts commit f999afd.
diff --git a/ports/espressif/supervisor/port.c b/ports/espressif/supervisor/port.c
@@ -308,18 +308,18 @@ void port_heap_init(void) {
 }
 
 void *port_malloc(size_t size, bool dma_capable) {
+    size_t caps = MALLOC_CAP_8BIT;
     if (dma_capable) {
-        // SPIRAM is not DMA-capable, so don't bother to ask for it.
-        return heap_caps_malloc(size, MALLOC_CAP_8BIT | MALLOC_CAP_DMA);
+        caps |= MALLOC_CAP_DMA;
     }
 
     void *ptr = NULL;
-    // Try SPIRAM first if available.
+    // Try SPIRAM first when available.
     #ifdef CONFIG_SPIRAM
-    ptr = heap_caps_malloc(size, MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
+    ptr = heap_caps_malloc(size, caps | MALLOC_CAP_SPIRAM);
     #endif
     if (ptr == NULL) {
-        ptr = heap_caps_malloc(size, MALLOC_CAP_8BIT);
+        ptr = heap_caps_malloc(size, caps);
     }
     return ptr;
 }

Original file line number	Diff line number	Diff line change
`@@ -308,18 +308,18 @@ void port_heap_init(void) {`
`308`	`308`	`}`
`309`	`309`
`310`	`310`	`void *port_malloc(size_t size, bool dma_capable) {`
	`311`	`+ size_t caps = MALLOC_CAP_8BIT;`
`311`	`312`	`if (dma_capable) {`
`312`		`- // SPIRAM is not DMA-capable, so don't bother to ask for it.`
`313`		`- return heap_caps_malloc(size, MALLOC_CAP_8BIT \| MALLOC_CAP_DMA);`
	`313`	`+ caps \|= MALLOC_CAP_DMA;`
`314`	`314`	`}`
`315`	`315`
`316`	`316`	`void *ptr = NULL;`
`317`		`- // Try SPIRAM first if available.`
	`317`	`+ // Try SPIRAM first when available.`
`318`	`318`	`#ifdef CONFIG_SPIRAM`
`319`		`- ptr = heap_caps_malloc(size, MALLOC_CAP_8BIT \| MALLOC_CAP_SPIRAM);`
	`319`	`+ ptr = heap_caps_malloc(size, caps \| MALLOC_CAP_SPIRAM);`
`320`	`320`	`#endif`
`321`	`321`	`if (ptr == NULL) {`
`322`		`- ptr = heap_caps_malloc(size, MALLOC_CAP_8BIT);`
	`322`	`+ ptr = heap_caps_malloc(size, caps);`
`323`	`323`	`}`
`324`	`324`	`return ptr;`
`325`	`325`	`}`