Restore correct MODE type.

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

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index 0ecfaa49297882abb228c93645512a5f233cf1cd..c96351566f156c71d93de7fe50c803403ebc2966 100644 (file)
--- a/bertos/cpu/frame.h
+++ b/bertos/cpu/frame.h
@@ -80,7 +80,7 @@
 
        #define CPU_SAVED_REGS_CNT     1
        #define CPU_STACK_GROWS_UPWARD 0
-       #define CPU_SP_ON_EMPTY_SLOT   0
+       #define CPU_SP_ON_EMPTY_SLOT   1
 
 #elif CPU_DSP56K
 
@@ -145,7 +145,7 @@
        #if !CPU_SP_ON_EMPTY_SLOT
                /* DSP56K and other weirdos */
                #define CPU_PUSH_WORD(sp, data) \
-                       do { *++(sp) = (cpustack_t)(data); } while (0)
+                       do { *++(sp) = (cpu_stack_t)(data); } while (0)
                #define CPU_POP_WORD(sp) \
                        (*(sp)--)
        #else
@@ -207,13 +207,13 @@
 
        #define CPU_PUSH_CALL_FRAME(sp, func) \
                do { \
-                       CPU_PUSH_WORD((sp), (cpustack_t)(func)); /* LR -> 8(SP) */ \
+                       CPU_PUSH_WORD((sp), (cpu_stack_t)(func)); /* LR -> 8(SP) */ \
                        CPU_PUSH_WORD((sp), 0);                  /* CR -> 4(SP) */ \
                } while (0)
 
 #else
        #define CPU_PUSH_CALL_FRAME(sp, func) \
-               CPU_PUSH_WORD((sp), (cpustack_t)(func))
+               CPU_PUSH_WORD((sp), (cpu_stack_t)(func))
 #endif
 
 /**
@@ -226,7 +226,7 @@
  * in hosted environments such as emulators.
  */
 #ifndef CPU_IDLE
-       #if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
+       #if defined(ARCH_QT) && (ARCH & ARCH_QT)
                /* This emulator hook should yield the CPU to the host.  */
                EXTERN_C_BEGIN
                void emul_idle(void);