Minor fix.

[bertos.git] / bertos / cpu / frame.h

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index f7eac47e41cd0b8c187685d4f59618fcb0518fec..63d341cf1db379d159d3f4b0d99e162ece2a9e5f 100644 (file)
--- a/bertos/cpu/frame.h
+++ b/bertos/cpu/frame.h
@@ -164,7 +164,7 @@
 #elif CPU_CM3
 
        #if CONFIG_KERN_PREEMPT
-               INLINE void asm_switch_context(cpu_stack_t **new_sp, cpu_stack_t **old_sp)
+               INLINE void cm3_preempt_switch_context(cpu_stack_t **new_sp, cpu_stack_t **old_sp)
                {
                        register cpu_stack_t **__new_sp asm ("r0") = new_sp;
                        register cpu_stack_t **__old_sp asm ("r1") = old_sp;
@@ -172,38 +172,27 @@
                        asm volatile ("svc #0"
                                : : "r"(__new_sp), "r"(__old_sp) : "memory", "cc");
                }
-               #define asm_switch_context asm_switch_context
-
-               #define CPU_PUSH_CALL_FRAME(sp, func) \
-                       do { \
-                               CPU_PUSH_WORD((sp), 0x01000000);                /* xPSR    */   \
-                               CPU_PUSH_WORD((sp), (cpu_stack_t)(func));       /* pc      */   \
-                               CPU_PUSH_WORD((sp), 0);                         /* lr      */   \
-                               CPU_PUSH_WORD((sp), 0);                         /* ip      */   \
-                               CPU_PUSH_WORD((sp), 0);                         /* r3      */   \
-                               CPU_PUSH_WORD((sp), 0);                         /* r2      */   \
-                               CPU_PUSH_WORD((sp), 0);                         /* r1      */   \
-                               CPU_PUSH_WORD((sp), 0);                         /* r0      */   \
-                               CPU_PUSH_WORD((sp), 0xfffffffd);                /* lr_exc  */   \
-                       } while (0);
+               #define asm_switch_context cm3_preempt_switch_context
 
                #define CPU_CREATE_NEW_STACK(stack) \
                        do { \
                                size_t i; \
                                /* Initialize process stack frame */ \
-                               CPU_PUSH_CALL_FRAME(stack, proc_entry); \
+                               CPU_PUSH_WORD((stack), 0x01000000);             /* xPSR    */   \
+                               CPU_PUSH_WORD((stack), (cpu_stack_t)proc_entry);        /* pc      */   \
+                               CPU_PUSH_WORD((stack), 0);                              /* lr      */   \
+                               CPU_PUSH_WORD((stack), 0);                              /* ip      */   \
+                               CPU_PUSH_WORD((stack), 0);                              /* r3      */   \
+                               CPU_PUSH_WORD((stack), 0);                              /* r2      */   \
+                               CPU_PUSH_WORD((stack), 0);                              /* r1      */   \
+                               CPU_PUSH_WORD((stack), 0);                              /* r0      */   \
+                               CPU_PUSH_WORD((stack), 0xfffffffd);             /* lr_exc  */   \
                                /* Push a clean set of CPU registers for asm_switch_context() */ \
                                for (i = 0; i < CPU_SAVED_REGS_CNT; i++) \
                                        CPU_PUSH_WORD(stack, CPU_REG_INIT_VALUE(i)); \
                                CPU_PUSH_WORD(stack, IRQ_PRIO_DISABLED); \
                        } while (0)
 
-       #else /* !CONFIG_KERN_PREEMPT */
-               #define CPU_PUSH_CALL_FRAME(sp, func) \
-                       do { \
-                               CPU_PUSH_WORD((sp), 0x01000000);                /* xPSR    */   \
-                               CPU_PUSH_WORD((sp), (cpu_stack_t)(func));       /* pc      */   \
-                       } while (0);
        #endif /* CONFIG_KERN_PREEMPT */
 
 #elif CPU_AVR
@@ -251,7 +240,9 @@
                        CPU_PUSH_WORD((sp), 0);                  /* CR -> 4(SP) */ \
                } while (0)
 
-#else
+#endif
+
+#ifndef CPU_PUSH_CALL_FRAME
        #define CPU_PUSH_CALL_FRAME(sp, func) \
                CPU_PUSH_WORD((sp), (cpu_stack_t)(func))
 #endif