zephyr: port: Heap adapter

* fix typo in SPIRAM config
* make SMH allocators inline

Signed-off-by: Marek Matej <[email protected]>

Author: Marek Matej

zephyr/port/include/esp_heap_adapter.h

@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <string.h>
 #include <zephyr/multi_heap/shared_multi_heap.h>
 
 /* Select heap to be used for WiFi adapter and WPA supplicant */
@@ -20,40 +21,51 @@
 #define os_wpa_calloc_func(_nmemb, _size) k_calloc(_nmemb, _size)
 #define os_wpa_free_func(_mem)            k_free(_mem)
 
-#elif defined(CONFIG_ESP_WIFI_WIFI_SPIRAM)
-
-#define esp_wifi_malloc_func(_size)                                                               \
-		shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size)
-#define esp_wifi_calloc_func(_nmemb, _size)                                                       \
-	{                                                                                         \
-		void *p;                                                                          \
-		p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _nmemb * _size);   \
-		if (p) {                                                                          \
-			memset(p, 0, _nmemb * _size);                                             \
-		}                                                                                 \
-		return p;                                                                         \
+#elif defined(CONFIG_ESP_WIFI_HEAP_SPIRAM)
+
+static inline void* esp_wifi_malloc_func(size_t _size)
+{
+	return shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);
+}
+
+static inline void* esp_wifi_calloc_func(size_t _nmemb, size_t _size)
+{
+	void *p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _nmemb * _size);
+	if (p) {
+		memset(p, 0, _nmemb * _size);
 	}
-#define esp_wifi_free_func(_mem) shared_multi_heap_free(_mem)
-
-#define os_wpa_malloc_func(_size) shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size)
-#define os_wpa_realloc_func(_ptr, _size)                                                          \
-	{	void *p;                                                                          \
-		if (_ptr) {                                                                       \
-			shared_multi_heap_free(_ptr);                                             \
-		}                                                                                 \
-		p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);            \
-		return p;                                                                         \
+	return p;
+}
+
+static inline void esp_wifi_free_func(void *_mem)
+{
+	shared_multi_heap_free(_mem);
+}
+
+static inline void* os_wpa_malloc_func(size_t _size)
+{
+	return shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);
+}
+
+static inline void* os_wpa_realloc_func(void *_ptr, size_t _size)
+{
+	if (_ptr) {
+		shared_multi_heap_free(_ptr);
 	}
-#define os_wpa_calloc_func(_nmemb, _size)                                                         \
-	{                                                                                         \
-		void *p;                                                                          \
-		p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _nmemb * _size);   \
-		if (p) {                                                                          \
-			memset(p, 0, _nmemb * _size);                                             \
-		}                                                                                 \
-		return p;                                                                         \
+	return shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);
+}
+static inline void* os_wpa_calloc_func(size_t _nmemb, size_t _size)
+{
+	void *p = shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _nmemb * _size);
+	if (p) {
+		memset(p, 0, _nmemb * _size);
 	}
-#define os_wpa_free_func(_mem) shared_multi_heap_free(_mem)
+	return p;
+}
+static inline void os_wpa_free_func(void *_mem)
+{
+	shared_multi_heap_free(_mem);
+}
 
 #else
 
@@ -74,6 +86,17 @@
 #define esp_bt_malloc_func(_size) k_malloc(_size)
 #define esp_bt_free_func(_mem)    k_free(_mem)
 
+#elif defined(CONFIG_ESP_BT_HEAP_SPIRAM)
+
+static inline void* esp_bt_malloc_func(size_t _size)
+{
+	return shared_multi_heap_aligned_alloc(SMH_REG_ATTR_EXTERNAL, 16, _size);
+}
+static inline void esp_bt_free_func(_mem)
+{
+	shared_multi_heap_free(_mem);
+}
+
 #else
 
 #define esp_bt_malloc_func(_size) malloc(_size)