diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-10-31 15:56:47 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-10-31 15:56:47 +0000 |
commit | d340df87111d2c9ba81ec5c9773d481896717c51 (patch) | |
tree | cc108921483fee650812c9e74b6cceccce7b7abd /nuttx/arch/avr | |
parent | 5592312904f37b7b08aa9e7be0bf19be4fc93d07 (diff) | |
download | px4-nuttx-d340df87111d2c9ba81ec5c9773d481896717c51.tar.gz px4-nuttx-d340df87111d2c9ba81ec5c9773d481896717c51.tar.bz2 px4-nuttx-d340df87111d2c9ba81ec5c9773d481896717c51.zip |
Fix heap allocation and RTC not-busy wait
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3065 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/avr')
-rw-r--r-- | nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c | 2 | ||||
-rw-r--r-- | nuttx/arch/avr/src/common/up_allocateheap.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c b/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c index 7630f03d0..f8738d39e 100644 --- a/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c +++ b/nuttx/arch/avr/src/at32uc3/at32uc3_timerisr.c @@ -119,7 +119,7 @@ static void rtc_waitnotbusy(void) { - while ((getreg32(AVR32_RTC_CTRL) & RTC_CTRL_BUSY) == 0); + while ((getreg32(AVR32_RTC_CTRL) & RTC_CTRL_BUSY) != 0); } /**************************************************************************** diff --git a/nuttx/arch/avr/src/common/up_allocateheap.c b/nuttx/arch/avr/src/common/up_allocateheap.c index 62be64338..675352d5e 100644 --- a/nuttx/arch/avr/src/common/up_allocateheap.c +++ b/nuttx/arch/avr/src/common/up_allocateheap.c @@ -68,10 +68,9 @@ * Name: up_allocate_heap * * Description: - * The heap may be statically allocated by - * defining CONFIG_HEAP_BASE and CONFIG_HEAP_SIZE. If these - * are not defined, then this function will be called to - * dynamically set aside the heap region. + * The heap may be statically allocated by defining CONFIG_HEAP_BASE and + * CONFIG_HEAP_SIZE. If these are not defined, then this function will be + * called to dynamically set aside the heap region. * ****************************************************************************/ |