summaryrefslogtreecommitdiff
path: root/os
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-28 20:14:34 +0100
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-28 20:14:34 +0100
commitabc1e9ef644658f44700761a263f5bb5aad22bbd (patch)
tree61fe15622ac2e851722646bbd2f17b4afa577ce1 /os
parent9e05eaaf91c2596521e29b90ffa9adf3114c3b93 (diff)
Forgot a few things for malloc.
Diffstat (limited to 'os')
-rw-r--r--os/src/malloc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/os/src/malloc.c b/os/src/malloc.c
index a24a87f..281a75b 100644
--- a/os/src/malloc.c
+++ b/os/src/malloc.c
@@ -1,6 +1,7 @@
#include <reent.h>
#include <malloc.h>
-#include <osdebug.h>
+#include <FreeRTOS.h>
+#include <semphr.h>
static xSemaphoreHandle malloc_sem = NULL;
@@ -16,4 +17,5 @@ void * malloc(size_t size) {
ptr =_malloc_r(_impure_ptr, size);
if (malloc_sem)
xSemaphoreGive(malloc_sem);
+ return ptr;
}