diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-19 15:17:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-05-19 15:17:28 +0000 |
| commit | 33e9f0c4422c511ab5db2e9d6743c1d03c3ab38e (patch) | |
| tree | b765b95fcd05979fdf62f8fea9cea9a32899ad39 /nuttx/configs | |
| parent | 0fcd87da6c840554cacc94fe14b5963d59441ab7 (diff) | |
| download | px4-nuttx-33e9f0c4422c511ab5db2e9d6743c1d03c3ab38e.tar.gz px4-nuttx-33e9f0c4422c511ab5db2e9d6743c1d03c3ab38e.tar.bz2 px4-nuttx-33e9f0c4422c511ab5db2e9d6743c1d03c3ab38e.zip | |
Fix heap setup problem
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1793 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs')
| -rw-r--r-- | nuttx/configs/eagle100/ostest/defconfig | 2 | ||||
| -rw-r--r-- | nuttx/configs/eagle100/src/up_leds.c | 18 |
2 files changed, 14 insertions, 6 deletions
diff --git a/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig index c1a4a760a..238ffe240 100644 --- a/nuttx/configs/eagle100/ostest/defconfig +++ b/nuttx/configs/eagle100/ostest/defconfig @@ -73,7 +73,7 @@ CONFIG_ARCH_BOARD=eagle100 CONFIG_ARCH_BOARD_EAGLE100=y CONFIG_BOARD_LOOPSPERMSEC=4531 CONFIG_DRAM_SIZE=0x00010000 -CONFIG_DRAM_START=0x00000000 +CONFIG_DRAM_START=0x20000000 CONFIG_DRAM_END=(CONFIG_DRAM_START+CONFIG_DRAM_SIZE) CONFIG_ARCH_IRQPRIO=y CONFIG_DRAM_NUTTXENTRY=0x00002000 diff --git a/nuttx/configs/eagle100/src/up_leds.c b/nuttx/configs/eagle100/src/up_leds.c index 43c9e8e70..5a9d36382 100644 --- a/nuttx/configs/eagle100/src/up_leds.c +++ b/nuttx/configs/eagle100/src/up_leds.c @@ -64,6 +64,8 @@ * Public Functions ****************************************************************************/ +static boolean g_nest; + /**************************************************************************** * Name: up_ledinit ****************************************************************************/ @@ -78,6 +80,7 @@ void up_ledinit(void) /* Configure Port E, Bit 1 as an output, initial value=OFF */ lm3s_configgpio(GPIO_FUNC_OUTPUT | GPIO_VALUE_ZERO | GPIO_PORTE | 1); + g_nest = 0; } /**************************************************************************** @@ -92,12 +95,14 @@ void up_ledon(int led) case LED_HEAPALLOCATE: default: break; - case LED_IRQSENABLED: - case LED_STACKCREATED: + case LED_INIRQ: case LED_SIGNAL: case LED_ASSERTION: case LED_PANIC: + g_nest++; + case LED_IRQSENABLED: + case LED_STACKCREATED: modifyreg32(LM3S_GPIOE_DATA, 0, (1 << 1)); break; } @@ -113,16 +118,19 @@ void up_ledoff(int led) { case LED_IRQSENABLED: case LED_STACKCREATED: + case LED_STARTED: + case LED_HEAPALLOCATE: default: break; - case LED_STARTED: - case LED_HEAPALLOCATE: case LED_INIRQ: case LED_SIGNAL: case LED_ASSERTION: case LED_PANIC: - modifyreg32(LM3S_GPIOE_DATA, (1 << 1), 0); + if (--g_nest <= 0) + { + modifyreg32(LM3S_GPIOE_DATA, (1 << 1), 0); + } break; } } |