timer: Amend previous commit (and Subversion sucks)

[bertos.git] / bertos / kern / proc_p.h

diff --git a/bertos/kern/proc_p.h b/bertos/kern/proc_p.h
index 24c02fe3de612b385fa76bbdfc43bb407b0c50e0..fbac38fc565a59016267868d9a20f95a0c64fe9e 100644 (file)
--- 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,7 +45,11 @@
 
 #include <cpu/types.h>        /* for cpu_stack_t */
 
-#include <mware/list.h>
+#include <struct/list.h>
+
+#if CONFIG_KERN_PREEMPTIVE
+       #include <ucontext.h> // XXX
+#endif
 
 typedef struct Process
 {
@@ -61,6 +64,8 @@ typedef struct Process
 
 #if CONFIG_KERN_PREEMPTIVE
        int          forbid_cnt;  /**< Nesting count for proc_forbid()/proc_permit(). */
+       bool         leaving;     /**< XXX: maybe global? */
+       ucontext_t   context;
 #endif
 
 #if CONFIG_KERN_HEAP
@@ -117,6 +122,11 @@ extern REGISTER List     ProcReadyList;
 /** Schedule to another process *without* adding the current to the ready list. */
 void proc_schedule(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);
@@ -132,4 +142,3 @@ void proc_schedule(void);
 #endif /* CONFIG_KERN_MONITOR */
 
 #endif /* KERN_PROC_P_H */
-