Merge branch 'feature/add_cap_to_heap' into 'master'

Add access align capacity to heap API

See merge request sdk/ESP8266_RTOS_SDK!171
This commit is contained in:
Wu Jian Gang
2018-05-24 14:11:13 +08:00
12 changed files with 62 additions and 13 deletions

View File

@ -28,6 +28,10 @@ extern "C" {
#define OSI_QUEUE_SEND_BACK 1
#define OSI_QUEUE_SEND_OVERWRITE 2
#define OSI_MALLOC_CAP_32BIT (1 << 1)
#define OSI_MALLOC_CAP_8BIT (1 << 2)
#define OSI_MALLOC_CAP_DMA (1 << 3)
typedef struct {
uint32_t (*enter_critical)(void);
void (*exit_critical)(uint32_t tmp);
@ -74,7 +78,10 @@ typedef struct {
bool (*timer_stop)(void *timer, uint32_t ticks);
bool (*timer_delete)(void *timer, uint32_t ticks);
void *(*malloc)(uint32_t size);
void *(*malloc)(uint32_t size, uint32_t cap);
void *(*zalloc)(uint32_t size, uint32_t cap);
void *(*realloc)(void *ptr, uint32_t size, uint32_t cap);
void *(*calloc)(uint32_t cnt, uint32_t size, uint32_t cap);
void (*free)(void *p);
uint32_t (*get_free_heap_size)(void);

View File

@ -131,8 +131,17 @@ extern wifi_osi_funcs_t s_wifi_osi_funcs;
#define wifi_timer_delete(t, tk) \
s_wifi_osi_funcs.timer_delete(t, tk)
#define wifi_malloc(s) \
s_wifi_osi_funcs.malloc(s)
#define wifi_malloc(s, c) \
s_wifi_osi_funcs.malloc(s, c)
#define wifi_zalloc(s, c) \
s_wifi_osi_funcs.zalloc(s, c)
#define wifi_calloc(cnt, s, c) \
s_wifi_osi_funcs.calloc(cnt, s, c)
#define wifi_realloc(ptr, s, c) \
s_wifi_osi_funcs.realloc(ptr, s, c)
#define wifi_free(p) \
s_wifi_osi_funcs.free(p)