X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=d99d5fc187d6090eea283304d43c3a49e881d1e5;hb=19decd4a0bdfff674f1e4f5caea1e6b6844e5e48;hp=a0191d8301eaf44b4a1689d729f523a1150de725;hpb=9607fc3f839ba8914bf9847d7998a14c986881ab;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index a0191d83..d99d5fc1 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,12 +45,20 @@
 
 #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 */
-	cpustack_t  *stack;       /**< Per-process SP */
+#endif
+	cpu_stack_t  *stack;       /**< Per-process SP */
 	iptr_t       user_data;   /**< Custom data passed to the process */
 
 #if CONFIG_KERN_SIGNALS
@@ -59,19 +66,19 @@ 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
 
 #if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
-	cpustack_t  *stack_base;  /**< Base of process stack */
+	cpu_stack_t  *stack_base;  /**< Base of process stack */
 	size_t       stack_size;  /**< Size of process stack */
 #endif
 
+#if CONFIG_KERN_PREEMPT
+	ucontext_t   context;
+#endif
+
 #if CONFIG_KERN_MONITOR
 	struct ProcMonitor
 	{
@@ -97,26 +104,39 @@ extern REGISTER Process	*CurrentProcess;
 /**
  * Track ready processes.
  *
- * Access to this list must be protected with a proc_forbid() / proc_premit()
- * pair, or with SCHED_ATOMIC()
+ * Access to this list must be performed with interrupts disabled
  */
 extern REGISTER List     ProcReadyList;
 
+#if CONFIG_KERN_PRI
+	#define SCHED_ENQUEUE_INTERNAL(proc) LIST_ENQUEUE(&ProcReadyList, &(proc)->link)
+#else
+	#define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#endif
 
 /**
- * Enqueue a task in the ready list.
+ * Enqueue a process 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 protected with a proc_forbid() / proc_premit()
- *       pair, or with SCHED_ATOMIC()
+ * \note Access to the scheduler ready list must be performed with
+ *       interrupts disabled.
  */
-#define SCHED_ENQUEUE(proc)  ADDTAIL(&ProcReadyList, &(proc)->link)
+#define SCHED_ENQUEUE(proc)  do { \
+		IRQ_ASSERT_DISABLED(); \
+		LIST_ASSERT_VALID(&ProcReadyList); \
+		SCHED_ENQUEUE_INTERNAL(proc); \
+	} while (0)
+
 
-/** Schedule to another process *without* adding the current to the ready list. */
-void proc_schedule(void);
+/// 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 */
@@ -133,4 +153,3 @@ void proc_schedule(void);
 #endif /* CONFIG_KERN_MONITOR */
 
 #endif /* KERN_PROC_P_H */
-