wifi: fix internal malloc wrappers reference

sylvioalves · sylvioalves · commit f3453bdeced2 · 2025-07-11T07:53:02.000-03:00
Wi-Fi adapter internal wrappers must allocate buffers from the main heap
(internal RAM) and never from SPIRAM.

This change updates all adapter files to make consistent approach.

Signed-off-by: Sylvio Alves &lt;sylvio.alves@espressif.com&gt;
diff --git a/zephyr/esp32/src/coex/esp_coex_adapter.c b/zephyr/esp32/src/coex/esp_coex_adapter.c
@@ -126,7 +126,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
 
 void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
 {
-	return wifi_malloc(size);
+	return k_malloc(size);
 }
 
 static int32_t IRAM_ATTR esp_coex_internal_semphr_take_from_isr_wrapper(void *semphr, void *hptw)
diff --git a/zephyr/esp32/src/wifi/esp_wifi_adapter.c b/zephyr/esp32/src/wifi/esp_wifi_adapter.c
@@ -355,12 +355,12 @@ static void *IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
 
 static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
 {
-	return wifi_calloc(n, size);
+	return k_calloc(n, size);
 }
 
 static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)
 {
-	return wifi_calloc(1, size);
+	return k_calloc(1, size);
 }
 
 uint32_t uxQueueMessagesWaiting(void *queue)
diff --git a/zephyr/esp32c2/src/coex/esp_coex_adapter.c b/zephyr/esp32c2/src/coex/esp_coex_adapter.c
@@ -122,7 +122,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
 
 void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
 {
-	return wifi_malloc(size);
+	return k_malloc(size);
 }
 
 uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)
diff --git a/zephyr/esp32c2/src/wifi/esp_wifi_adapter.c b/zephyr/esp32c2/src/wifi/esp_wifi_adapter.c
@@ -374,12 +374,12 @@ static void *IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
 
 static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
 {
-	return wifi_calloc(n, size);
+	return k_calloc(n, size);
 }
 
 static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)
 {
-	return wifi_calloc(1, size);
+	return k_calloc(1, size);
 }
 
 uint32_t uxQueueMessagesWaiting(void *queue)
diff --git a/zephyr/esp32c3/src/coex/esp_coex_adapter.c b/zephyr/esp32c3/src/coex/esp_coex_adapter.c
@@ -127,7 +127,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
 
 void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
 {
-	return wifi_malloc(size);
+	return k_malloc(size);
 }
 
 uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)
diff --git a/zephyr/esp32c3/src/wifi/esp_wifi_adapter.c b/zephyr/esp32c3/src/wifi/esp_wifi_adapter.c
@@ -374,12 +374,12 @@ static void *IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
 
 static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
 {
-	return wifi_calloc(n, size);
+	return k_calloc(n, size);
 }
 
 static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)
 {
-	return wifi_calloc(1, size);
+	return k_calloc(1, size);
 }
 
 uint32_t uxQueueMessagesWaiting(void *queue)
diff --git a/zephyr/esp32c6/src/coex/esp_coex_adapter.c b/zephyr/esp32c6/src/coex/esp_coex_adapter.c
@@ -127,7 +127,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
 
 void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
 {
-	return wifi_malloc(size);
+	return k_malloc(size);
 }
 
 uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)
diff --git a/zephyr/esp32c6/src/wifi/esp_wifi_adapter.c b/zephyr/esp32c6/src/wifi/esp_wifi_adapter.c
@@ -378,12 +378,12 @@ static void *IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
 
 static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
 {
-	return wifi_calloc(n, size);
+	return k_calloc(n, size);
 }
 
 static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)
 {
-	return wifi_calloc(1, size);
+	return k_calloc(1, size);
 }
 
 uint32_t uxQueueMessagesWaiting(void *queue)
diff --git a/zephyr/esp32s2/src/coex/esp_coex_adapter.c b/zephyr/esp32s2/src/coex/esp_coex_adapter.c
@@ -168,7 +168,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b
 
 void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)
 {
-	return wifi_malloc(size);
+	return k_malloc(size);
 }
 
 uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)
diff --git a/zephyr/esp32s2/src/wifi/esp_wifi_adapter.c b/zephyr/esp32s2/src/wifi/esp_wifi_adapter.c
@@ -356,12 +356,12 @@ static void *IRAM_ATTR realloc_internal_wrapper(void *ptr, size_t size)
 
 static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)
 {
-	return wifi_calloc(n, size);
+	return k_calloc(n, size);
 }
 
 static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)
 {
-	return wifi_calloc(1, size);
+	return k_calloc(1, size);
 }
 
 uint32_t uxQueueMessagesWaiting(void *queue)

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b`
`126`	`126`
`127`	`127`	`void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)`
`128`	`128`	`{`
`129`		`- return wifi_malloc(size);`
	`129`	`+ return k_malloc(size);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`static int32_t IRAM_ATTR esp_coex_internal_semphr_take_from_isr_wrapper(void semphr, void hptw)`
Original file line number	Diff line number	Diff line change
`@@ -355,12 +355,12 @@ static void IRAM_ATTR realloc_internal_wrapper(void ptr, size_t size)`
`355`	`355`
`356`	`356`	`static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)`
`357`	`357`	`{`
`358`		`- return wifi_calloc(n, size);`
	`358`	`+ return k_calloc(n, size);`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)`
`362`	`362`	`{`
`363`		`- return wifi_calloc(1, size);`
	`363`	`+ return k_calloc(1, size);`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`uint32_t uxQueueMessagesWaiting(void *queue)`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b`
`122`	`122`
`123`	`123`	`void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)`
`124`	`124`	`{`
`125`		`- return wifi_malloc(size);`
	`125`	`+ return k_malloc(size);`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)`
Original file line number	Diff line number	Diff line change
`@@ -374,12 +374,12 @@ static void IRAM_ATTR realloc_internal_wrapper(void ptr, size_t size)`
`374`	`374`
`375`	`375`	`static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)`
`376`	`376`	`{`
`377`		`- return wifi_calloc(n, size);`
	`377`	`+ return k_calloc(n, size);`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)`
`381`	`381`	`{`
`382`		`- return wifi_calloc(1, size);`
	`382`	`+ return k_calloc(1, size);`
`383`	`383`	`}`
`384`	`384`
`385`	`385`	`uint32_t uxQueueMessagesWaiting(void *queue)`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b`
`127`	`127`
`128`	`128`	`void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)`
`129`	`129`	`{`
`130`		`- return wifi_malloc(size);`
	`130`	`+ return k_malloc(size);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)`
Original file line number	Diff line number	Diff line change
`@@ -378,12 +378,12 @@ static void IRAM_ATTR realloc_internal_wrapper(void ptr, size_t size)`
`378`	`378`
`379`	`379`	`static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)`
`380`	`380`	`{`
`381`		`- return wifi_calloc(n, size);`
	`381`	`+ return k_calloc(n, size);`
`382`	`382`	`}`
`383`	`383`
`384`	`384`	`static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)`
`385`	`385`	`{`
`386`		`- return wifi_calloc(1, size);`
	`386`	`+ return k_calloc(1, size);`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`uint32_t uxQueueMessagesWaiting(void *queue)`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ void IRAM_ATTR esp_coex_common_timer_arm_us_wrapper(void *ptimer, uint32_t us, b`
`168`	`168`
`169`	`169`	`void *IRAM_ATTR esp_coex_common_malloc_internal_wrapper(size_t size)`
`170`	`170`	`{`
`171`		`- return wifi_malloc(size);`
	`171`	`+ return k_malloc(size);`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`uint32_t esp_coex_common_clk_slowclk_cal_get_wrapper(void)`
Original file line number	Diff line number	Diff line change
`@@ -356,12 +356,12 @@ static void IRAM_ATTR realloc_internal_wrapper(void ptr, size_t size)`
`356`	`356`
`357`	`357`	`static void *IRAM_ATTR calloc_internal_wrapper(size_t n, size_t size)`
`358`	`358`	`{`
`359`		`- return wifi_calloc(n, size);`
	`359`	`+ return k_calloc(n, size);`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`static void *IRAM_ATTR zalloc_internal_wrapper(size_t size)`
`363`	`363`	`{`
`364`		`- return wifi_calloc(1, size);`
	`364`	`+ return k_calloc(1, size);`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`uint32_t uxQueueMessagesWaiting(void *queue)`