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

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index d6979410..a0e87be2 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -34,7 +34,6 @@
  * \brief Internal scheduler structures and definitions for processes.
  *
  * \version $Id$
- *
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
@@ -46,11 +45,19 @@
 
 #include <cpu/types.h>        /* for cpu_stack_t */
 
-#include <mware/list.h>
+#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 */
 
@@ -59,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
@@ -72,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
 	{
@@ -94,19 +101,45 @@ typedef struct Process
 /** Track running processes. */
 extern REGISTER Process	*CurrentProcess;
 
-/** Track ready processes. */
-extern REGISTER List     ProcReadyList;
-
-
 /**
- * Enqueue a task in the ready list.
+ * Track ready processes.
  *
- * \note This is *NOT* protected against 
+ * Access to this list must be protected with a proc_forbid() / proc_premit()
+ * pair, or with SCHED_ATOMIC()
  */
-#define SCHED_ENQUEUE(proc)  ADDTAIL(&ProcReadyList, &(proc)->link)
+extern REGISTER List     ProcReadyList;
 
-/** 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 */
@@ -123,4 +156,3 @@ void proc_schedule(void);
 #endif /* CONFIG_KERN_MONITOR */
 
 #endif /* KERN_PROC_P_H */
-