Changeset 1003

Timestamp:

11/18/08 10:39:36 (7 weeks ago)

Author:

liamMT

Message:

- redefine standard malloc and free instead of creating separate functions for them
- stub out RTOS c++ stuff

Location:

firmware/branches/cpp

Files:

• core/makingthings/rtos_.cpp (added)
• core/makingthings/rtos_.h (added)
• core/startup/extras.c (modified) (2 diffs)
• projects/heavy/Makefile (modified) (1 diff)

firmware/branches/cpp/core/startup/extras.c

@@ -2 +2 @@
 
 #include <reent.h>
+#include <stdlib.h>
+
+#include "projdefs.h"
+#include "portable.h"
 
 void *_sbrk_r (struct _reent *r, ptrdiff_t t )
@@ -56 +60 @@
 }
 
+void* malloc( size_t size )
+{
+  return pvPortMalloc( size );
+}
 
+void free( void* memory )
+{
+  vPortFree( memory );
+}
+
+

firmware/branches/cpp/projects/heavy/Makefile

@@ -85 +85 @@
   ../../core/makingthings/tcpserver.cpp \
   ../../core/makingthings/osc_cpp.cpp \
+  ../../core/makingthings/rtos_.cpp \
   ../../libraries/appled/appled_.cpp \
   make_.cpp \