adopt to renaming from active_thread to sched_active_thread

Author: thomaseichinger

stm32f103rey6/cpu.c

@@ -128,9 +128,9 @@ void ctx_switch(void)
     asm("mov r12, sp");
     asm("stmfd r12!, {r4-r11}");
 
-    /* save user mode stack pointer in *active_thread */
-    asm("ldr     r1, =active_thread"); /* r1 = &active_thread */
-    asm("ldr     r1, [r1]"); /* r1 = *r1 = active_thread */
+    /* save user mode stack pointer in *sched_active_thread */
+    asm("ldr     r1, =sched_active_thread"); /* r1 = &sched_active_thread */
+    asm("ldr     r1, [r1]"); /* r1 = *r1 = sched_active_thread */
     asm("str     r12, [r1]"); /* store stack pointer in tasks pdc*/
 
     sched_task_return();
@@ -145,8 +145,8 @@ void sched_task_return(void)
     mode.b.nPRIV = 0; // privilege
     __set_CONTROL(mode.w);
     /* load pdc->stackpointer in r0 */
-    asm("ldr     r0, =active_thread"); /* r0 = &active_thread */
-    asm("ldr     r0, [r0]"); /* r0 = *r0 = active_thread */
+    asm("ldr     r0, =sched_active_thread"); /* r0 = &sched_active_thread */
+    asm("ldr     r0, [r0]"); /* r0 = *r0 = sched_active_thread */
     asm("ldr     sp, [r0]"); /* sp = r0  restore stack pointer*/
     asm("pop		{r4}"); /* skip exception return */
     asm("pop		{r4-r11}");

stm32f103rey6/include/cpu.h

@@ -73,7 +73,7 @@ __attribute__((always_inline)) __INLINE void save_context(void)
     asm("stmdb  r0!,{lr}"           );      // exception return value
 //  asm("vstmdb sp!, {s16-s31}"     );      // FIXME save fpu registers if needed
     /* load address of currend pdc */
-    asm("ldr    r1, =active_thread" );      /* load address of currend tcb */
+    asm("ldr    r1, =sched_active_thread" );/* load address of currend tcb */
     /* deref pdc */
     asm("ldr    r1, [r1]"           );      /* deref pdc */
     /* write r0 to pdc->sp means current threads stack pointer */
@@ -82,7 +82,7 @@ __attribute__((always_inline)) __INLINE void save_context(void)
 
 __attribute__((always_inline)) __INLINE void restore_context(void)
 {
-    asm("ldr    r0, =active_thread" );      /* load address of currend tcb */
+    asm("ldr    r0, =sched_active_thread" );/* load address of currend tcb */
     asm("ldr    r0, [r0]"           );      /* deref tcb */
     asm("ldr    r1, [r0]"           );      /* load tcb->sp to register 1 */
     asm("ldmia  r1!, {r0}"          );      /* restore exception retrun value from stack */

stm32f103rey6/syscalls.c

@@ -314,7 +314,7 @@ void _exit(int n)
 /*---------------------------------------------------------------------------*/
 int _getpid(void)
 {
-    return active_thread->pid;
+    return sched_active_thread->pid;
 }
 /*---------------------------------------------------------------------------*/
 int _kill_r(struct _reent *r, int pid, int sig)