diff options
Diffstat (limited to 'nuttx/arch/avr/src')
| -rwxr-xr-x | nuttx/arch/avr/src/at90usb/at90usb_head.S | 10 | ||||
| -rwxr-xr-x | nuttx/arch/avr/src/atmega/atmega_head.S | 10 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr/avr_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr/up_dumpstate.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/avr32_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/up_dumpstate.c | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/up_nommuhead.S | 10 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/common/up_allocateheap.c | 4 |
8 files changed, 21 insertions, 21 deletions
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_head.S b/nuttx/arch/avr/src/at90usb/at90usb_head.S index be747632b..1e705ba71 100755 --- a/nuttx/arch/avr/src/at90usb/at90usb_head.S +++ b/nuttx/arch/avr/src/at90usb/at90usb_head.S @@ -266,14 +266,14 @@ __do_clear_bss: * Heap Base ****************************************************************************/ - /* This global variable is unsigned long g_heapbase and is exported from + /* This global variable is unsigned long g_idle_topstack and is exported from * here only because of its coupling to other uses of _enoinit in this file */ .data - .globl g_heapbase - .type g_heapbase, object -g_heapbase: + .globl g_idle_topstack + .type g_idle_topstack, object +g_idle_topstack: .word _enoinit+CONFIG_IDLETHREAD_STACKSIZE - .size g_heapbase, .-g_heapbase + .size g_idle_topstack, .-g_idle_topstack .end diff --git a/nuttx/arch/avr/src/atmega/atmega_head.S b/nuttx/arch/avr/src/atmega/atmega_head.S index 95de2f100..89c3cd1f9 100755 --- a/nuttx/arch/avr/src/atmega/atmega_head.S +++ b/nuttx/arch/avr/src/atmega/atmega_head.S @@ -260,14 +260,14 @@ __do_clear_bss: * Heap Base ****************************************************************************/ - /* This global variable is unsigned long g_heapbase and is exported from + /* This global variable is unsigned long g_idle_topstack and is exported from * here only because of its coupling to other uses of _enoinit in this file */ .data - .globl g_heapbase - .type g_heapbase, object -g_heapbase: + .globl g_idle_topstack + .type g_idle_topstack, object +g_idle_topstack: .word _enoinit+CONFIG_IDLETHREAD_STACKSIZE - .size g_heapbase, .-g_heapbase + .size g_idle_topstack, .-g_idle_topstack .end diff --git a/nuttx/arch/avr/src/avr/avr_internal.h b/nuttx/arch/avr/src/avr/avr_internal.h index 031000cd1..2c78791e4 100644 --- a/nuttx/arch/avr/src/avr/avr_internal.h +++ b/nuttx/arch/avr/src/avr/avr_internal.h @@ -81,7 +81,7 @@ extern volatile uint8_t *current_regs; * heap is CONFIG_DRAM_END */ -extern uint16_t g_heapbase; +extern uint16_t g_idle_topstack; #endif /* __ASSEMBLY__ */ diff --git a/nuttx/arch/avr/src/avr/up_dumpstate.c b/nuttx/arch/avr/src/avr/up_dumpstate.c index 62e80255f..6ba50d238 100644 --- a/nuttx/arch/avr/src/avr/up_dumpstate.c +++ b/nuttx/arch/avr/src/avr/up_dumpstate.c @@ -181,7 +181,7 @@ void up_dumpstate(void) if (rtcb->pid == 0) { - ustackbase = g_heapbase - 1; + ustackbase = g_idle_topstack - 1; ustacksize = CONFIG_IDLETHREAD_STACKSIZE; } else diff --git a/nuttx/arch/avr/src/avr32/avr32_internal.h b/nuttx/arch/avr/src/avr32/avr32_internal.h index 3d45f6c54..bcac8074a 100644 --- a/nuttx/arch/avr/src/avr32/avr32_internal.h +++ b/nuttx/arch/avr/src/avr32/avr32_internal.h @@ -79,7 +79,7 @@ extern volatile uint32_t *current_regs; * heap is CONFIG_DRAM_END */ -extern uint32_t g_heapbase; +extern uint32_t g_idle_topstack; #endif /* __ASSEMBLY__ */ diff --git a/nuttx/arch/avr/src/avr32/up_dumpstate.c b/nuttx/arch/avr/src/avr32/up_dumpstate.c index 32db56f0d..90cb22837 100644 --- a/nuttx/arch/avr/src/avr32/up_dumpstate.c +++ b/nuttx/arch/avr/src/avr32/up_dumpstate.c @@ -158,7 +158,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/avr/src/avr32/up_nommuhead.S b/nuttx/arch/avr/src/avr32/up_nommuhead.S index 316e68aaf..149b1f26f 100644 --- a/nuttx/arch/avr/src/avr32/up_nommuhead.S +++ b/nuttx/arch/avr/src/avr32/up_nommuhead.S @@ -141,17 +141,17 @@ __start: .word up_lowinit .size __start, .-__start - /* This global variable is unsigned long g_heapbase and is + /* This global variable is unsigned long g_idle_topstack and is * exported from here only because of its coupling to other * uses of _ebss in this file */ .data .align 4 - .globl g_heapbase - .type g_heapbase, object -g_heapbase: + .globl g_idle_topstack + .type g_idle_topstack, object +g_idle_topstack: .long _ebss+CONFIG_IDLETHREAD_STACKSIZE - .size g_heapbase, .-g_heapbase + .size g_idle_topstack, .-g_idle_topstack .end diff --git a/nuttx/arch/avr/src/common/up_allocateheap.c b/nuttx/arch/avr/src/common/up_allocateheap.c index 3a67ff6a7..3893e3a2d 100644 --- a/nuttx/arch/avr/src/common/up_allocateheap.c +++ b/nuttx/arch/avr/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; } |