RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

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

Browse Source
This commit is contained in:
Oliver Hahm 2013-03-13 16:49:23 +01:00
parent bd5b46628f
commit 7cef6c4655
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.include
View File

@ -4,8 +4,8 @@ CFLAGS += -DBOARD=$(BB)
export CFLAGS
# mandatory include!
include $(RIOTBASE)/Makefile.modules
include $(RIOTBOARD)/$(BOARD)/Makefile.include
include $(RIOTBASE)/Makefile.modules
# your binaries to link
BASELIBS += $(RIOTBOARD)/$(BOARD)/bin/$(BOARD)_base.a
@ -36,7 +36,7 @@ clean:
rm -f $(PROJBINDIR)/*
flash: all
$(FLASH) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
$(FLASHER) $(PORT) $(PROJBINDIR)/$(PROJECT).hex
term:
$(TERM) $(PORT)

2
cpu/arm_common/Makefile
View File

@ -3,5 +3,3 @@ INCLUDES = -Iinclude -I../$(CPU)/include -I../../sys/lib -I../../drivers/include
include $(RIOTBASE)/Makefile.base

4
cpu/arm_common/arm_cpu.c
View File

@ -33,10 +33,10 @@ void thread_yield() {
// Processor specific routine - here for ARM7
// 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;
stk = (unsigned int *) stack_start;
stk = (unsigned int *) stack_start + stack_size;
stk--;
*stk = 0x77777777;

4
cpu/msp430-common/cpu.c
View File

@ -97,10 +97,10 @@ void cpu_switch_context_exit(void){
//----------------------------------------------------------------------------
// 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;
stk = (unsigned short *) stack_start;
stk = (unsigned short *) stack_start + stack_size;
*stk = (unsigned short) sched_task_exit;
--stk;