X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=f31fc621ff8461416e725722bc531afa221a7f29;hb=37b6a6530f8d53eda2825b7c34dc8e8895b9fa17;hp=fbac38fc565a59016267868d9a20f95a0c64fe9e;hpb=57da5b0bdc06a8a69c740616f145cb9fe28f8c9f;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index fbac38fc..f31fc621 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -47,13 +47,17 @@
 
 #include <struct/list.h>
 
-#if CONFIG_KERN_PREEMPTIVE
+#if CONFIG_KERN_PREEMPT
 	#include <ucontext.h> // XXX
 #endif
 
 typedef struct Process
 {
+#if CONFIG_KERN_PRI
+	PriNode      link;        /**< Link Process into scheduler lists */
+#else
 	Node         link;        /**< Link Process into scheduler lists */
+#endif
 	cpustack_t  *stack;       /**< Per-process SP */
 	iptr_t       user_data;   /**< Custom data passed to the process */
 
@@ -62,12 +66,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 +75,10 @@ typedef struct Process
 	size_t       stack_size;  /**< Size of process stack */
 #endif
 
+#if CONFIG_KERN_PREEMPT
+	ucontext_t   context;
+#endif
+
 #if CONFIG_KERN_MONITOR
 	struct ProcMonitor
 	{
@@ -107,17 +109,29 @@ extern REGISTER Process	*CurrentProcess;
  */
 extern REGISTER List     ProcReadyList;
 
-
-/**
- * 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)  ADDTAIL(&ProcReadyList, &(proc)->link)
+#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);