X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=a0e87be22ba6f870e0536db7e35edd997cea9a6f;hb=ba26d23f6c7f0561c4c2197285a1116f85d9d5b9;hp=54ba7be187014ac3527c169b8aea1ce735e1dce8;hpb=6eb6ebb5ae5953a27977f0ef66a36344462b949a;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 54ba7be1..a0e87be2 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -47,9 +47,17 @@
 
 #include <struct/list.h>
 
+#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 */
 
@@ -58,10 +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(). */
-#endif
-
 #if CONFIG_KERN_HEAP
 	uint16_t     flags;       /**< Flags */
 #endif
@@ -71,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
 	{
@@ -101,20 +109,37 @@ 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)
-
-/** Schedule to another process *without* adding the current to the ready list. */
-void proc_schedule(void);
+#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 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));
+void preempt_init(void);
+#endif
 
 #if CONFIG_KERN_MONITOR
 	/** Initialize the monitor */