restructured and fixed arm architecutre files

RIOT-OS · Jul 24, 2013 · 6297516 · 6297516
1 parent f12d562
commit 6297516
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/Makefile.modules b/Makefile.modules
@@ -2,24 +2,6 @@ export MAKEBASE =$(RIOTBASE)
 export BINDIR =$(RIOTBASE)/bin/
 UNDEF += $(BINDIR)startup.o
 
-### Minimal setup
-ifeq ($(CPU),lpc2387)
-  USEMODULE += arm_common
-  UNDEF += $(BINDIR)syscalls.o
-  export INCLUDES += -I$(RIOTBASE)/cpu/arm_common/include
-endif
-ifeq ($(CPU),lpc214x)
-  USEMODULE += arm_common
-  UNDEF += $(BINDIR)syscalls.o
-endif
-ifeq ($(CPU),native)
-  export INCLUDES += -I$(RIOTBASE)/cpu/native/include
-endif
-ifeq ($(CPU),stm32f407vgt6)
-	USEMODULE += stm32f4xxstdperi
-	UNDEF += $(BINDIR)syscalls.o
-endif
-
 USEMODULE += cpu core sys
 ED = $(USEMODULE:%=-DMODULE_%)
 EXTDEFINES = $(shell echo $(ED)|tr 'a-z' 'A-Z')

diff --git a/cpu/Makefile.include b/cpu/Makefile.include
@@ -1,13 +1,13 @@
 ### Minimal setup
 ifeq ($(CPU),lpc2387)
   export USEMODULE += arm_common lpc_common
-  export UNDEF += $(BINDIR)syscalls.o
+  export UNDEF += $(BINDIR)syscalls.o $(BINDIR)lpc_syscalls.o
   export INCLUDES += -I$(RIOTCPU)/arm_common/include
   export INCLUDES += -I$(RIOTCPU)/lpc_common/include
 endif
 ifeq ($(CPU),lpc214x)
   export USEMODULE += arm_common lpc_common
-  export UNDEF += $(BINDIR)syscalls.o
+  export UNDEF += $(BINDIR)syscalls.o $(BINDIR)lpc_syscalls.o
   export INCLUDES += -I$(RIOTCPU)/arm_common/include
   export INCLUDES += -I$(RIOTCPU)/lpc_common/include
 endif

diff --git a/cpu/arm_common/arm_cpu.c b/cpu/arm_common/arm_cpu.c
@@ -41,6 +41,7 @@ void thread_yield(void)
 char *thread_stack_init(void *task_func, void *stack_start, int stack_size)
 {
     unsigned int *stk;
+    int i;
     stk = (unsigned int *)(stack_start + stack_size);
     stk--;
 
@@ -55,7 +56,7 @@ char *thread_stack_init(void *task_func, void *stack_start, int stack_size)
     *stk = (unsigned int)(stack_start + stack_size) - 4;
 
     /* build base stack */
-    for (int i = REGISTER_CNT; i >= 0 ; i--) {
+    for (i = REGISTER_CNT; i >= 0 ; i--) {
         stk--;
         *stk = i;
     }

diff --git a/cpu/lpc_common/lpc_cpu.c b/cpu/lpc_common/lpc_cpu.c
@@ -9,9 +9,12 @@
  *
  */
 
+#include "cpu.h"
+#include "irq.h"
+
 __attribute__((naked,noreturn)) void arm_reset(void)
 {
-    dINT();
+    disableIRQ();
     WDTC = 0x00FFF;
     WDMOD = 0x03;
     WDFEED= 0xAA;

diff --git a/cpu/lpc_common/lpc_syscalls.c b/cpu/lpc_common/lpc_syscalls.c
@@ -10,6 +10,10 @@
  */
 
 #include <errno.h>
+#include <stdint.h>
+#include <sys/unistd.h>
+#include <stdio.h>
+#include "irq.h"
 
 /**
  * @name Heaps (defined in linker script)