proc: Use a global forbid count;

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

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index fbac38fc565a59016267868d9a20f95a0c64fe9e..0d6a94f153eed4102f2257defa18ed4f36eff9ce 100644 (file)
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -62,12 +62,6 @@ typedef struct Process
        sigmask_t    sig_recv;    /**< Received signals */
 #endif
 
-#if CONFIG_KERN_PREEMPTIVE
-       int          forbid_cnt;  /**< Nesting count for proc_forbid()/proc_permit(). */
-       bool         leaving;     /**< XXX: maybe global? */
-       ucontext_t   context;
-#endif
-
 #if CONFIG_KERN_HEAP
        uint16_t     flags;       /**< Flags */
 #endif
@@ -77,6 +71,10 @@ typedef struct Process
        size_t       stack_size;  /**< Size of process stack */
 #endif
 
+#if CONFIG_KERN_PREEMPTIVE
+       ucontext_t   context;
+#endif
+
 #if CONFIG_KERN_MONITOR
        struct ProcMonitor
        {
@@ -117,7 +115,10 @@ extern REGISTER List     ProcReadyList;
  * \note This macro is *NOT* protected against the scheduler.  Access to
  *       this list must be performed with interrupts disabled.
  */
-#define SCHED_ENQUEUE(proc)  ADDTAIL(&ProcReadyList, &(proc)->link)
+#define SCHED_ENQUEUE(proc)  do { \
+               LIST_ASSERT_VALID(&ProcReadyList); \
+               ADDTAIL(&ProcReadyList, &(proc)->link); \
+       } while (0)
 
 /** Schedule to another process *without* adding the current to the ready list. */
 void proc_schedule(void);