j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Link against newlib from esp-open-sdk's libcirom, replace FreeRTOS heap management.

Browse source 
Compiles and runs, expects xtensa lock.c patch in newlib (will still run
otherwise but malloc/free and other functions will be non-memory-safe...)
This commit is contained in:
Angus Gratton 2015-06-15 16:51:06 +10:00
parent 1b0124cf05
commit 49268a33e1
5 changed files with 89 additions and 453 deletions
Download patch file Download diff file Expand all files Collapse all files

65
FreeRTOS/Source/portable/esp8266/sdk_compat.c
View file

@ -1,5 +1,5 @@
/*
* Stub functions called by binary espressif libraries
* Wrappers for functions called by binary espressif libraries
*
* Part of esp-open-rtos
* Copyright (C) 2015 Superhouse Automation Pty Ltd
@ -9,69 +9,6 @@
#include <string.h>
#include "FreeRTOS.h"
/* SDK uses errno. errno was defined in libudhcp.a
but that library has been removed. */
int errno;
/* newlib uses __errno in some contexts */
int *__errno(void) {
return &errno;
}
/* libc memory management functions.
Many of these are linked from the RTOS SDK blob libraries.
In esp_iot_rtos_sdk these are aliased to exception-safe versions of
the FreeRTOS functions. I think the rationale is that they're
sometimes called in exception contexts (ESPTODO: Verify this).
For now these are exception-safe wrappers to the FreeRTOS versions.
*/
void *malloc(size_t nbytes) {
void *res;
portENTER_CRITICAL();
res = pvPortMalloc(nbytes);
portEXIT_CRITICAL();
return res;
}
void *calloc(size_t count, size_t size) {
void *res;
size_t nbytes = count * size;
portENTER_CRITICAL();
res = pvPortMalloc(nbytes);
portEXIT_CRITICAL();
if(res) {
memset(res, 0, nbytes);
}
return res;
}
void *zalloc(size_t nbytes) {
return calloc(1, nbytes);
}
void *realloc(void *old, size_t newsize) {
void *new;
portENTER_CRITICAL();
if(newsize == 0) {
vPortFree(old);
return 0;
}
/* realloc implementation borrowed from esp_iot_rtos_sdk, could be better I think */
new = pvPortMalloc(newsize);
if (new) {
memcpy(new, old, newsize);
vPortFree(old);
}
portEXIT_CRITICAL();
return new;
}
void free(void *ptr) {
portENTER_CRITICAL();
vPortFree(ptr);
portEXIT_CRITICAL();
}