X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=0d6a94f153eed4102f2257defa18ed4f36eff9ce;hb=274910d36c7db1d556864384534f43c69d1bae19;hp=6a79eec30d6048194f359f40458e3d8943b39e2d;hpb=87302355709b6d5ac0592024b84207ba86baa82e;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 6a79eec3..0d6a94f1 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -45,7 +45,11 @@
 
 #include <cpu/types.h>        /* for cpu_stack_t */
 
-#include <mware/list.h>
+#include <struct/list.h>
+
+#if CONFIG_KERN_PREEMPTIVE
+	#include <ucontext.h> // XXX
+#endif
 
 typedef struct Process
 {
@@ -58,10 +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(). */
-#endif
-
 #if CONFIG_KERN_HEAP
 	uint16_t     flags;       /**< Flags */
 #endif
@@ -71,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
 	{
@@ -111,11 +115,19 @@ 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);
 
+#if CONFIG_KERN_PREEMPT
+void proc_entry(void (*user_entry)(void));
+void preempt_init(void);
+#endif
+
 #if CONFIG_KERN_MONITOR
 	/** Initialize the monitor */
 	void monitor_init(void);