diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2011-01-24 10:35:19 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2011-01-24 10:35:19 +0100 |
| commit | 965df7faefabdd5f571b5eb46d45470223c91e12 (patch) | |
| tree | b7502742236c8e65279a4a472c8e82b5e5b289c0 | |
| parent | e46ea682c1aa214ccb59c9871914993c9375e5c2 (diff) | |
Adding sbrk, and fixing a couple of other makefile problems.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/config.mk | 2 | ||||
| -rw-r--r-- | os/Makefile | 3 | ||||
| -rw-r--r-- | os/src/sbrk.c | 47 | ||||
| -rw-r--r-- | target-rules.mk | 2 |
5 files changed, 51 insertions, 5 deletions
@@ -1,5 +1,5 @@ TARGET = demo.bin -LIBS = -LFreeRTOS -Larch -Los -lFreeRTOS -larch -los +LIBS = FreeRTOS/libFreeRTOS.a arch/libarch.a -lc os/libos.a export ROOTDIR = $(CURDIR) diff --git a/arch/config.mk b/arch/config.mk index a475d59..f182a95 100644 --- a/arch/config.mk +++ b/arch/config.mk @@ -1,5 +1,3 @@ -include $(ROOTDIR)/common.mk - ifeq ($(CPU),arm) ifeq ($(CPU_FLAVOR),lpc1768) TARGET_INCLUDES += $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/CoreSupport $(ROOTDIR)/arch/arm/lpc17xx/Drivers/include diff --git a/os/Makefile b/os/Makefile index 6f6ce2e..070566d 100644 --- a/os/Makefile +++ b/os/Makefile @@ -4,8 +4,9 @@ all: $(TARGET_LIB) include $(ROOTDIR)/common.mk include config.mk +include $(ROOTDIR)/FreeRTOS/config.mk -TARGET_SRCS = src/init.c +TARGET_SRCS = src/init.c src/sbrk.c include $(ROOTDIR)/target-rules.mk diff --git a/os/src/sbrk.c b/os/src/sbrk.c new file mode 100644 index 0000000..3c674ba --- /dev/null +++ b/os/src/sbrk.c @@ -0,0 +1,47 @@ +#include <reent.h> +#include <errno.h> +#include <stdlib.h> + +#include "FreeRTOS.h" +#include "task.h" +#include "mpu_wrappers.h" + +// Mostly stolen from mbed-freertos + +extern unsigned int __cs3_heap_start, __cs3_heap_end; + +/* Low-level bulk RAM allocator -- used by Newlib's Malloc */ +void *heap_end = NULL; +PRIVILEGED_FUNCTION void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr) +{ + void *prev_heap_end, *next_heap_end, *ret; + + taskENTER_CRITICAL(); + { + /* Initialize on first call */ + if (heap_end == NULL) + { + heap_end = (void *)&__cs3_heap_start; + } + + prev_heap_end = heap_end; + + /* Align to always be on 8-byte boundaries */ + next_heap_end = (void *)((((unsigned int)heap_end + incr) + 7) & ~7); + + /* Check if this allocation would exceed the end of the ram - would probably get into the stack first however */ + if (next_heap_end > (void *)&__cs3_heap_end) + { + ptr->_errno = ENOMEM; + ret = NULL; + } + else + { + heap_end = next_heap_end; + ret = (void *)prev_heap_end; + } + } + taskEXIT_CRITICAL(); + return ret; +} + diff --git a/target-rules.mk b/target-rules.mk index acb398c..5b976bc 100644 --- a/target-rules.mk +++ b/target-rules.mk @@ -20,7 +20,7 @@ $(TARGET_ELF): $(TARGET_OBJS) $(TARGET_BIN): $(TARGET_ELF) $(E) [TB] Creating $@ - $(Q)$(TARGET_OBJDUMP) $< -O binary $@ + $(Q)$(TARGET_OBJCOPY) $< -O binary $@ $(TARGET_LIB): $(TARGET_OBJS) $(E) [TLIB] Creating $@ |