UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Remove _liba_heap_start, simply use _heap_start

Browse Source 
Change-Id: I395762275f3aa1832210dfc3faae9c0eefb91d9e
This commit is contained in:
Romain Goyet
2016-09-21 13:50:58 +02:00
parent 47db327752
commit e3c6264068
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ion/src/device/Makefile
View File

@@ -3,7 +3,6 @@ objs += $(addprefix ion/src/device/, \
battery.o\
device.o\
display.o\
heap.o\
keyboard.o\
led.o\
power.o\

4
ion/src/device/boot/memory_map.awk
View File

@@ -2,8 +2,8 @@
/data_section_end_ram/ { data_end = $1 }
/bss_section_start_ram/ { bss_start = $1 }
/bss_section_end_ram/ { bss_end = $1 }
/liba_heap_start/ { heap_start = $1 }
/liba_heap_end/ { heap_end = $1 }
/heap_start/ { heap_start = $1 }
/heap_end/ { heap_end = $1 }
/framebuffer_start/ { framebuffer_start = $1 }
/framebuffer_end/ { framebuffer_end = $1 }
/stack_start/ { stack_start = $1 }

5
ion/src/device/heap.c
View File

@@ -1,5 +0,0 @@
extern char _heap_start;
extern char _heap_end;
char * _liba_heap_start = &_heap_start;
char * _liba_heap_end = &_heap_end;

8
liba/src/malloc.c
View File

@@ -2,8 +2,8 @@
#include <string.h>
#include <private/memconfig.h>
extern char * _liba_heap_start;
extern char * _liba_heap_end;
extern char _heap_start;
extern char _heap_end;
heap_config_t HeapConfig = {
.nHeap = 0
@@ -17,8 +17,8 @@ void * memsys5Realloc(void *pPrior, int nBytes);
int memsys5Roundup(int n);
static void configure_heap() {
HeapConfig.nHeap = (_liba_heap_end - _liba_heap_start);
HeapConfig.pHeap = _liba_heap_start;
HeapConfig.nHeap = (&_heap_end - &_heap_start);
HeapConfig.pHeap = &_heap_start;
HeapConfig.mnReq = 1;
HeapConfig.bMemstat = 0;
HeapConfig.xLog = 0;