X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc_p.h;h=b148057c4a02fc256a5ade9505ef9986d246b34e;hb=953b0acec9337364b471b72a4cc742d69c368533;hp=77fca314f0719f8ae9548d39cd899a04afc14545;hpb=11da44352fcd4d33b173c976db45293ac1a87cca;p=bertos.git

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 77fca314..b148057c 100644
--- a/bertos/kern/proc_p.h
+++ b/bertos/kern/proc_p.h
@@ -27,31 +27,41 @@
  * the GNU General Public License.
  *
  * Copyright 2001, 2004 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2000, 2001 Bernardo Innocenti <bernie@develer.com>
+ * Copyright 1999, 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
  *
  * -->
  *
  * \brief Internal scheduler structures and definitions for processes.
  *
  * \version $Id$
- *
- * \author Bernardo Innocenti <bernie@develer.com>
+ * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
 #ifndef KERN_PROC_P_H
 #define KERN_PROC_P_H
 
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
+#include "cfg/cfg_monitor.h"
+
 #include <cfg/compiler.h>
 
 #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,23 +69,24 @@ 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 */
-	cpustack_t  *stack_base;  /**< Base of process stack */
+#endif
+
+#if CONFIG_KERN_HEAP | CONFIG_KERN_MONITOR | (ARCH & ARCH_EMUL)
+	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
 	{
 		Node        link;
 		const char *name;
-		cpustack_t *stack_base;
-		size_t      stack_size;
 	} monitor;
 #endif
 
@@ -93,29 +104,55 @@ typedef struct Process
 /** Track running processes. */
 extern REGISTER Process	*CurrentProcess;
 
-/** Track ready processes. */
+/**
+ * Track ready processes.
+ *
+ * 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 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)
 
-/** Enqueue a task in the ready list. */
-#define SCHED_ENQUEUE(proc)  ADDTAIL(&ProcReadyList, &(proc)->link)
 
-/** 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 */
 	void monitor_init(void);
 
 	/** Register a process into the monitor */
-	void monitor_add(Process *proc, const char *name, cpustack_t *stack, size_t stacksize);
+	void monitor_add(Process *proc, const char *name);
 
 	/** Unregister a process from the monitor */
 	void monitor_remove(Process *proc);
 
 	/** Rename a process */
-	void monitor_rename(Process *proc, const char* name);
+	void monitor_rename(Process *proc, const char *name);
 #endif /* CONFIG_KERN_MONITOR */
 
 #endif /* KERN_PROC_P_H */
-