diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-14 14:42:52 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-14 14:42:52 +0000 |
| commit | 0d36830a37fcdb64c2b2d00990e084e7f8d63456 (patch) | |
| tree | 78cc505c6874907ce2a37ab2b94d15c848c0ce50 /nuttx/arch/mips/src | |
| parent | 5be9588ed42d1a4ed297bdc76d9e05e582e78969 (diff) | |
| download | px4-nuttx-0d36830a37fcdb64c2b2d00990e084e7f8d63456.tar.gz px4-nuttx-0d36830a37fcdb64c2b2d00990e084e7f8d63456.tar.bz2 px4-nuttx-0d36830a37fcdb64c2b2d00990e084e7f8d63456.zip | |
Rename g_heapbase to g_idle_topstack; Fix kernel build heap allocation which cannot use g_heapbase
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5739 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/mips/src')
| -rw-r--r-- | nuttx/arch/mips/src/common/up_allocateheap.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/common/up_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/mips32/up_dumpstate.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/pic32mx/pic32mx-head.S | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/arch/mips/src/common/up_allocateheap.c b/nuttx/arch/mips/src/common/up_allocateheap.c index b8c449ff1..f6dc51511 100644 --- a/nuttx/arch/mips/src/common/up_allocateheap.c +++ b/nuttx/arch/mips/src/common/up_allocateheap.c @@ -82,6 +82,6 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) { up_ledon(LED_HEAPALLOCATE); - *heap_start = (FAR void*)g_heapbase; - *heap_size = CONFIG_DRAM_END - g_heapbase; + *heap_start = (FAR void*)g_idle_topstack; + *heap_size = CONFIG_DRAM_END - g_idle_topstack; } diff --git a/nuttx/arch/mips/src/common/up_internal.h b/nuttx/arch/mips/src/common/up_internal.h index 927538dea..1950a74e6 100644 --- a/nuttx/arch/mips/src/common/up_internal.h +++ b/nuttx/arch/mips/src/common/up_internal.h @@ -138,7 +138,7 @@ extern volatile uint32_t *current_regs; * of the heap is CONFIG_DRAM_END */ -extern uint32_t g_heapbase; +extern uint32_t g_idle_topstack; /* Address of the saved user stack pointer */ diff --git a/nuttx/arch/mips/src/mips32/up_dumpstate.c b/nuttx/arch/mips/src/mips32/up_dumpstate.c index 064aa0681..bdd21726b 100644 --- a/nuttx/arch/mips/src/mips32/up_dumpstate.c +++ b/nuttx/arch/mips/src/mips32/up_dumpstate.c @@ -167,7 +167,7 @@ void up_dumpstate(void) if (rtcb->pid == 0) { - ustackbase = g_heapbase - 4; + ustackbase = g_idle_topstack - 4; ustacksize = CONFIG_IDLETHREAD_STACKSIZE; } else diff --git a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S index 2e1a34080..471effc3f 100644 --- a/nuttx/arch/mips/src/pic32mx/pic32mx-head.S +++ b/nuttx/arch/mips/src/pic32mx/pic32mx-head.S @@ -122,7 +122,7 @@ .global g_nestlevel #endif #endif - .global g_heapbase + .global g_idle_topstack /* Imported symbols */ @@ -698,13 +698,13 @@ g_nestlevel: #endif #endif -/* This global variable is unsigned int g_heapbase and is exported here only +/* This global variable is unsigned int g_idle_topstack and is exported here only * because of its coupling to idle thread stack. */ .sdata - .type g_heapbase, object -g_heapbase: + .type g_idle_topstack, object +g_idle_topstack: .long PIC32MX_HEAP_BASE - .size g_heapbase, .-g_heapbase + .size g_idle_topstack, .-g_idle_topstack |