diff options
| author | Pixel <pixel@nobis-crew.org> | 2011-01-28 21:04:21 -0800 |
|---|---|---|
| committer | Pixel <pixel@nobis-crew.org> | 2011-01-28 21:04:21 -0800 |
| commit | 7182d70210f4880e66ae9e5a5531bddd3a90737b (patch) | |
| tree | 695aac5ebea58f1e542cf7f6ac2fa8896ae282c5 | |
| parent | 499e349afa57536ce80497aa99f61c5492e3733e (diff) | |
Cleaning up a bit.
| -rw-r--r-- | os/Makefile | 28 | ||||
| -rw-r--r-- | os/src/sbrk.c | 4 |
2 files changed, 27 insertions, 5 deletions
diff --git a/os/Makefile b/os/Makefile index 909fd53..75bc575 100644 --- a/os/Makefile +++ b/os/Makefile @@ -7,8 +7,32 @@ include config.mk include $(ROOTDIR)/FreeRTOS/config.mk include $(ROOTDIR)/arch/config.mk -TARGET_SRCS = src/init.c src/sbrk.c src/sprintf.c src/malloc.c src/free.c src/fclose.c src/read.c src/lseek.c src/write.c src/close.c src/osdebug.c \ -src/printf.c src/fstat.c src/isatty.c src/fprintf.c src/fio.c src/fflush.c src/fopen.c src/open.c src/hash-djb2.c src/filesystem.c src/fwrite.c +TARGET_SRCS = \ +src/init.c \ +\ +src/filesystem.c \ +src/fio.c \ +src/hash-djb2.c \ +src/osdebug.c \ +\ +src/close.c \ +src/fstat.c \ +src/isatty.c \ +src/lseek.c \ +src/open.c \ +src/read.c \ +src/sbrk.c \ +src/write.c \ +\ +src/fclose.c \ +src/fflush.c \ +src/fopen.c \ +src/fprintf.c \ +src/free.c \ +src/fwrite.c \ +src/malloc.c \ +src/printf.c \ +src/sprintf.c \ include $(ROOTDIR)/target-rules.mk diff --git a/os/src/sbrk.c b/os/src/sbrk.c index ac8649c..53efe1e 100644 --- a/os/src/sbrk.c +++ b/os/src/sbrk.c @@ -23,8 +23,7 @@ __attribute__((constructor)) static void sbrk_init() { sbrk_sem = xSemaphoreCreateMutex(); } -void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr) -{ +void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr) { void *prev_heap_end, *next_heap_end, *ret; void *stack_min = (void *) &__stack_start; @@ -50,4 +49,3 @@ void *_sbrk_r(struct _reent *ptr, ptrdiff_t incr) return ret; } - |