diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 13:19:59 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-09-11 13:19:59 +0000 |
| commit | 26ef7179b0f6c3be8c76eefdca033392209ee42d (patch) | |
| tree | 06ea25a4404d94f98a2c42a56c34a9dfeb7a3aac /nuttx/arch | |
| parent | ff113b400adf80f5bf6f07233a2355e48b00676d (diff) | |
| download | px4-nuttx-26ef7179b0f6c3be8c76eefdca033392209ee42d.tar.gz px4-nuttx-26ef7179b0f6c3be8c76eefdca033392209ee42d.tar.bz2 px4-nuttx-26ef7179b0f6c3be8c76eefdca033392209ee42d.zip | |
AVR corrections from Richard Cochran; uIP webserver enhancements from Kate
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5126 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch')
| -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 |
3 files changed, 4 insertions, 3 deletions
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" /**************************************************************************** |