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

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 2c914d9e..d99d5fc1 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -47,7 +47,7 @@
 
 #include <struct/list.h>
 
-#if CONFIG_KERN_PREEMPTIVE
+#if CONFIG_KERN_PREEMPT
 	#include <ucontext.h> // XXX
 #endif
 
@@ -58,7 +58,7 @@ typedef struct Process
 #else
 	Node         link;        /**< Link Process into scheduler lists */
 #endif
-	cpustack_t  *stack;       /**< Per-process SP */
+	cpu_stack_t  *stack;       /**< Per-process SP */
 	iptr_t       user_data;   /**< Custom data passed to the process */
 
 #if CONFIG_KERN_SIGNALS
@@ -71,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
 
@@ -104,37 +104,34 @@ 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
-	/**
-	 * 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 to another process *without* adding the current to the ready list. */
-void proc_schedule(void);
+	#define SCHED_ENQUEUE_INTERNAL(proc) LIST_ENQUEUE(&ProcReadyList, &(proc)->link)
+#else
+	#define SCHED_ENQUEUE_INTERNAL(proc) ADDTAIL(&ProcReadyList, &(proc)->link)
+#endif
+
+/**
+ * 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 Access to the scheduler ready list must be performed with
+ *       interrupts disabled.
+ */
+#define SCHED_ENQUEUE(proc)  do { \
+		IRQ_ASSERT_DISABLED(); \
+		LIST_ASSERT_VALID(&ProcReadyList); \
+		SCHED_ENQUEUE_INTERNAL(proc); \
+	} while (0)
+
+
+/// 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));