X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=inline;f=bertos%2Fkern%2Fproc_p.h;h=9d61b53123b369010532a3ad1765d6d5f239d103;hb=e62ca0b357f09804d7d894949df44224c9d74bb7;hp=0d6a94f153eed4102f2257defa18ed4f36eff9ce;hpb=40c25a4b1d0f1c23478c2d681b74662de968f671;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 0d6a94f1..9d61b531 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -47,14 +47,18 @@
 
 #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 */
-	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
@@ -67,11 +71,11 @@ typedef struct Process
 #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_PREEMPTIVE
+#if CONFIG_KERN_PREEMPT
 	ucontext_t   context;
 #endif
 
@@ -105,23 +109,32 @@ 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)  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_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));