Fix the ntc problems.

[bertos.git] / bertos / kern / proc_p.h

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 2c914d9e81698d2645507800c406a205407a412b..b148057c4a02fc256a5ade9505ef9986d246b34e 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -40,14 +40,17 @@
 #ifndef KERN_PROC_P_H
 #define KERN_PROC_P_H
 
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
+#include "cfg/cfg_monitor.h"
+
 #include <cfg/compiler.h>
 
 #include <cpu/types.h>        /* for cpu_stack_t */
 
 #include <struct/list.h>
 
-#if CONFIG_KERN_PREEMPTIVE
+#if CONFIG_KERN_PREEMPT
        #include <ucontext.h> // XXX
 #endif
 
@@ -58,7 +61,7 @@ typedef struct Process
 #else
        Node         link;        /**< Link Process into scheduler lists */
 #endif
-       cpustack_t  *stack;       /**< Per-process SP */
+       cpu_stack_t  *stack;       /**< Per-process SP */
        iptr_t       user_data;   /**< Custom data passed to the process */
 
 #if CONFIG_KERN_SIGNALS
@@ -71,11 +74,11 @@ typedef struct Process
 #endif
 
 #if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
-       cpustack_t  *stack_base;  /**< Base of process stack */
+       cpu_stack_t  *stack_base;  /**< Base of process stack */
        size_t       stack_size;  /**< Size of process stack */
 #endif
 
-#if CONFIG_KERN_PREEMPTIVE
+#if CONFIG_KERN_PREEMPT
        ucontext_t   context;
 #endif
 
@@ -104,37 +107,34 @@ extern REGISTER Process   *CurrentProcess;
 /**
  * Track ready processes.
  *
- * Access to this list must be protected with a proc_forbid() / proc_premit()
- * pair, or with SCHED_ATOMIC()
+ * Access to this list must be performed with interrupts disabled
  */
 extern REGISTER List     ProcReadyList;
 
 #if CONFIG_KERN_PRI
-       /**
-        * Enqueue a task in the ready list.
-        *
-        * Always use this macro to instert a process in the ready list, as its
-        * might vary to implement a different scheduling algorithms.
-        *
-        * \note This macro is *NOT* protected against the scheduler.  Access to
-        *       this list must be performed with interrupts disabled.
-        */
-       #define SCHED_ENQUEUE(proc)  do { \
-                       LIST_ASSERT_VALID(&ProcReadyList); \
-                       LIST_ENQUEUE(&ProcReadyList, &(proc)->link); \
-               } while (0)
-
-#else // !CONFIG_KERN_PRI
-
-       #define SCHED_ENQUEUE(proc)  do { \
-                       LIST_ASSERT_VALID(&ProcReadyList); \
-                       ADDTAIL(&ProcReadyList, &(proc)->link); \
-               } while (0)
-
-#endif // !CONFIG_KERN_PRI
-
-/** Schedule to another process *without* adding the current to the ready list. */
-void proc_schedule(void);
+       #define SCHED_ENQUEUE_INTERNAL(proc) LIST_ENQUEUE(&ProcReadyList, &(proc)->link)
+#else
+       #define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#endif
+
+/**
+ * Enqueue a process in the ready list.
+ *
+ * Always use this macro to instert a process in the ready list, as its
+ * might vary to implement a different scheduling algorithms.
+ *
+ * \note Access to the scheduler ready list must be performed with
+ *       interrupts disabled.
+ */
+#define SCHED_ENQUEUE(proc)  do { \
+               IRQ_ASSERT_DISABLED(); \
+               LIST_ASSERT_VALID(&ProcReadyList); \
+               SCHED_ENQUEUE_INTERNAL(proc); \
+       } while (0)
+
+
+/// Schedule another process *without* adding the current one to the ready list.
+void proc_switch(void);
 
 #if CONFIG_KERN_PREEMPT
 void proc_entry(void (*user_entry)(void));