diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-09-11 13:19:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-09-11 13:19:59 +0000 |
| commit | de7764b1d4d19619ea042dd297f6e76c6300db7b (patch) | |
| tree | 06ea25a4404d94f98a2c42a56c34a9dfeb7a3aac /nuttx | |
| parent | c7a25442309055fd1032f2027923e0fe01551bb5 (diff) | |
| download | px4-firmware-de7764b1d4d19619ea042dd297f6e76c6300db7b.tar.gz px4-firmware-de7764b1d4d19619ea042dd297f6e76c6300db7b.tar.bz2 px4-firmware-de7764b1d4d19619ea042dd297f6e76c6300db7b.zip | |
AVR corrections from Richard Cochran; uIP webserver enhancements from Kate
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5126 7fd9a85b-ad96-42d3-883c-3090e2eb8679
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/Makefile | 3 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/avr32_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/avr32/up_copystate.c | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 26e362129..f1780c323 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3307,4 +3307,6 @@ (Noted by Ronen Vainish). * fs/mmap/fs_rammap.c: Fix logic error and errno check (contributed by Kate). + * arch/avr/src: Fixes from AVR32 build errors that have crept in + over the time; incorporated Kconfig for AVR3 (Richard Cochran). diff --git a/nuttx/arch/avr/src/Makefile b/nuttx/arch/avr/src/Makefile index 7034ef8f4..b72a6c8a8 100644 --- a/nuttx/arch/avr/src/Makefile +++ b/nuttx/arch/avr/src/Makefile @@ -40,8 +40,7 @@ ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src ifeq ($(CONFIG_ARCH_AVR32),y) ARCH_SUBDIR = avr32 -endif -ifeq ($(CONFIG_ARCH_AVR),y) +else ifeq ($(CONFIG_ARCH_AVR),y) ARCH_SUBDIR = avr endif diff --git a/nuttx/arch/avr/src/avr32/avr32_internal.h b/nuttx/arch/avr/src/avr32/avr32_internal.h index 56065edce..332b0918e 100644 --- a/nuttx/arch/avr/src/avr32/avr32_internal.h +++ b/nuttx/arch/avr/src/avr32/avr32_internal.h @@ -69,7 +69,7 @@ * structure. If is non-NULL only during interrupt processing. */ -extern volatile uint32_ *current_regs; +extern volatile uint32_t *current_regs; /* This is the beginning of heap as provided from up_head.S. This is the first * address in DRAM after the loaded program+bss+idle stack. The end of the diff --git a/nuttx/arch/avr/src/avr32/up_copystate.c b/nuttx/arch/avr/src/avr32/up_copystate.c index e3e4da054..67640f8cc 100644 --- a/nuttx/arch/avr/src/avr32/up_copystate.c +++ b/nuttx/arch/avr/src/avr32/up_copystate.c @@ -41,6 +41,8 @@ #include <stdint.h> +#include <arch/avr32/irq.h> + #include "up_internal.h" /**************************************************************************** |