Skip to content
Snippets Groups Projects
Commit 7cef6c46 authored by Oleg Hahm's avatar Oleg Hahm
Browse files

* adapted thread_stack_init() for ARM and msp430 to the new prototype introduced by bd5b4662

parent bd5b4662
No related branches found
No related tags found
No related merge requests found
...@@ -4,8 +4,8 @@ CFLAGS += -DBOARD=$(BB) ...@@ -4,8 +4,8 @@ CFLAGS += -DBOARD=$(BB)
export CFLAGS export CFLAGS
# mandatory include! # mandatory include!
include $(RIOTBASE)/Makefile.modules
include $(RIOTBOARD)/$(BOARD)/Makefile.include include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTBASE)/Makefile.modules
# your binaries to link # your binaries to link
BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a
...@@ -36,7 +36,7 @@ clean: ...@@ -36,7 +36,7 @@ clean:
rm -f $(PROJBINDIR)/* rm -f $(PROJBINDIR)/*
flash: all flash: all
$(FLASH) $(PORT) $(PROJBINDIR)/$(PROJECT).hex $(FLASHER) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
term: term:
$(TERM) $(PORT) $(TERM) $(PORT)
......
...@@ -3,5 +3,3 @@ INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include ...@@ -3,5 +3,3 @@ INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include
include $(RIOTBASE)/Makefile.base include $(RIOTBASE)/Makefile.base
...@@ -33,10 +33,10 @@ void thread_yield() { ...@@ -33,10 +33,10 @@ void thread_yield() {
// Processor specific routine - here for ARM7 // Processor specific routine - here for ARM7
// sizeof(void*) = sizeof(int) // sizeof(void*) = sizeof(int)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
char * thread_stack_init(void * task_func, void * stack_start) char * thread_stack_init(void * task_func, void * stack_start, int stack_size)
{ {
unsigned int * stk; unsigned int * stk;
stk = (unsigned int *) stack_start; stk = (unsigned int *) stack_start + stack_size;
stk--; stk--;
*stk = 0x77777777; *stk = 0x77777777;
......
...@@ -97,10 +97,10 @@ void cpu_switch_context_exit(void){ ...@@ -97,10 +97,10 @@ void cpu_switch_context_exit(void){
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// Processor specific routine - here for MSP // Processor specific routine - here for MSP
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
char *thread_stack_init(void *task_func, void *stack_start) char *thread_stack_init(void *task_func, void *stack_start, int stack_size)
{ {
unsigned short * stk; unsigned short * stk;
stk = (unsigned short *) stack_start; stk = (unsigned short *) stack_start + stack_size;
*stk = (unsigned short) sched_task_exit; *stk = (unsigned short) sched_task_exit;
--stk; --stk;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment