Explicit dependancy between CONFIG_KERN_PREEMPT and CONFIG_KERN.

[bertos.git] / bertos / cfg / os.h

diff --git a/bertos/cfg/os.h b/bertos/cfg/os.h
index 7fe971294d17c3c4e35f830b1a7d668448ba9f3e..2e393599df04aa7a18dfb1b1a5604ca3c90c33fe 100644 (file)
--- a/bertos/cfg/os.h
+++ b/bertos/cfg/os.h
@@ -39,6 +39,8 @@
 #ifndef CFG_OS_H
 #define CFG_OS_H
 
+#include "cfg/cfg_proc.h"
+
 /*
  * OS autodetection (Some systems trigger multiple OS definitions)
  */
@@ -47,7 +49,7 @@
        #define OS_ID     win32
 
        // FIXME: Maybe disable Win32 exceptions?
-       typedef int cpuflags_t;
+       typedef int cpu_flags_t;
        #define IRQ_DISABLE                FIXME
        #define IRQ_ENABLE                 FIXME
        #define IRQ_SAVE_DISABLE(old_sigs) FIXME
@@ -66,7 +68,7 @@
         * The POSIX moral equivalent of disabling IRQs is disabling signals.
         */
        #include <signal.h>
-       typedef sigset_t cpuflags_t;
+       typedef sigset_t cpu_flags_t;
 
        #define SET_ALL_SIGNALS(sigs) \
        do { \
@@ -109,6 +111,40 @@
                sigismember(&sigs__, SIGALRM) ? false : true; \
         })
 
+       #if (CONFIG_KERN && CONFIG_KERN_PREEMPT)
+               #define DECLARE_ISR_CONTEXT_SWITCH(vect)        \
+                       void vect(UNUSED_ARG(int, arg));        \
+                       INLINE void __isr_##vect(void);         \
+                       void vect(UNUSED_ARG(int, arg))         \
+                       {                                       \
+                               __isr_##vect();                 \
+                               IRQ_PREEMPT_HANDLER();          \
+                       }                                       \
+                       INLINE void __isr_##vect(void)
+               /**
+                * With task priorities enabled each ISR is used a point to
+                * check if we need to perform a context switch.
+                *
+                * Instead, without priorities a context switch can occur only
+                * when the running task expires its time quantum. In this last
+                * case, the context switch can only occur in the timer ISR,
+                * that must be always declared with the
+                * DECLARE_ISR_CONTEXT_SWITCH() macro.
+                */
+               #if CONFIG_KERN_PRI
+                       #define DECLARE_ISR(vect) \
+                               DECLARE_ISR_CONTEXT_SWITCH(vect)
+               #endif /* CONFIG_KERN_PRI */
+       #endif
+       #ifndef DECLARE_ISR
+               #define DECLARE_ISR(vect) \
+                               void vect(UNUSED_ARG(int, arg))
+       #endif
+       #ifndef DECLARE_ISR_CONTEXT_SWITCH
+               #define DECLARE_ISR_CONTEXT_SWITCH(vect) \
+                               void vect(UNUSED_ARG(int, arg))
+       #endif
+
 #else
        #define OS_UNIX   0
        #define OS_POSIX  0
@@ -127,7 +163,7 @@
 #endif
 
 
-#include <cfg/cfg_arch.h> /* For ARCH_QT */
+#include "cfg/cfg_arch.h" /* For ARCH_QT */
 
 /*
  * We want Qt and other frameworks to look like OSes because you would