Fix tx interrupt in init. Enable tx and rx interrupt in _enableirq function. Add...

[bertos.git] / cpu / cpu.h

diff --git a/cpu/cpu.h b/cpu/cpu.h
index 911c78c05b3e88c1c64b137a02dadb9e1462043e..03a0827df5cf9d7518c772e997edb3f60fedcc19 100644 (file)
--- a/cpu/cpu.h
+++ b/cpu/cpu.h
@@ -55,10 +55,10 @@
 /*\}*/
 
 /** Macro to include cpu-specific versions of the headers. */
-#define CPU_HEADER(module)          PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).h)
+#define CPU_HEADER(module)          PP_STRINGIZE(drv/PP_CAT3(module, _, CPU_ID).h)
 
 /** Macro to include cpu-specific versions of implementation files. */
-#define CPU_CSOURCE(module)         PP_STRINGIZE(PP_CAT3(module, _, CPU_ID).c)
+#define CPU_CSOURCE(module)         PP_STRINGIZE(drv/PP_CAT3(module, _, CPU_ID).c)
 
 
 #if CPU_I196
@@ -120,7 +120,7 @@
        /* Register counts include SREG too */
        #define CPU_REG_BITS           32
        #define CPU_REGS_CNT           16
-       #define CPU_SAVED_REGS_CNT     FIXME
+       #define CPU_SAVED_REGS_CNT     9
        #define CPU_STACK_GROWS_UPWARD 0
        #define CPU_SP_ON_EMPTY_SLOT   0
        #define CPU_BYTE_ORDER         (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
@@ -160,10 +160,6 @@
                #define BREAKPOINT  /* asm("bkpt 0") DOES NOT WORK */
 
        #else /* !__IAR_SYSTEMS_ICC__ */
-
-               #warning "IRQ_ macros need testing!"
-               #warning "Test now or die :-)"
-
                #define NOP         asm volatile ("mov r0,r0" ::)
 
                #define IRQ_DISABLE \
@@ -207,17 +203,33 @@
                        ); \
                } while (0)
 
-               #define IRQ_GETSTATE() \
+               #define CPU_READ_FLAGS() \
                ({ \
-                       uint32_t sreg; \
+                       cpuflags_t sreg; \
                        asm volatile ( \
                                "mrs %0, cpsr\n\t" \
                                : "=r" (sreg) \
                                : /* no inputs */ \
                        ); \
-                       !((sreg & 0xc0) == 0xc0); \
+                       sreg; \
                })
 
+               #define IRQ_GETSTATE() (!((CPU_READ_FLAGS() & 0xc0) == 0xc0))
+
+               /**
+                * Initialization value for registers in stack frame.
+                * The register index is not directly corrispondent to CPU
+                * register numbers, but is related to how are pushed to
+                * stack (\see asm_switch_context).
+                * Index (CPU_SAVED_REGS_CNT - 1) is the CPSR register,
+                * the initial value is set to:
+                * - All flags (N, Z, C, V) set to 0.
+                * - IRQ and FIQ enabled.
+                * - ARM state.
+                * - CPU in Supervisor Mode (SVC).
+                */
+               #define CPU_REG_INIT_VALUE(reg) (reg == (CPU_SAVED_REGS_CNT - 1) ? 0x13 : 0)
+
        #endif /* !__IAR_SYSTEMS_ICC_ */
 
 #elif CPU_PPC