X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=kern%2Fproc.c;h=f8c7fb8df3330138729574a189c1401350c10be8;hb=8059d60b7013ce04f5b29d3377b8fa39c67bd1fa;hp=24f93d481a20a74870fc5e3163ba3946a701b023;hpb=b84e872f616fe496961b7b8a9eeb672cf7fb8025;p=bertos.git

diff --git a/kern/proc.c b/kern/proc.c
index 24f93d48..f8c7fb8d 100755
--- a/kern/proc.c
+++ b/kern/proc.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
@@ -17,6 +17,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.31  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.30  2006/03/27 04:49:23  bernie
+ *#* CPU_IDLE(): Fix for new emulator.
+ *#*
+ *#* Revision 1.29  2006/02/24 01:17:05  bernie
+ *#* Update for new emulator.
+ *#*
  *#* Revision 1.28  2006/02/21 16:06:55  bernie
  *#* Cleanup/update process scheduling.
  *#*
@@ -112,7 +121,7 @@
 
 #include <string.h> /* memset() */
 
-/*!
+/**
  * CPU dependent context switching routines.
  *
  * \note This function *MUST* preserve also the status of the interrupts.
@@ -145,7 +154,7 @@ uint16_t Quantum;
 extern List StackFreeList;
 #endif
 
-/*! The main process (the one that executes main()). */
+/** The main process (the one that executes main()). */
 struct Process MainProcess;
 
 
@@ -188,7 +197,7 @@ void proc_init(void)
 }
 
 
-/*!
+/**
  * Create a new process, starting at the provided entry point.
  *
  * \return Process structure of new created process
@@ -277,7 +286,7 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 	return proc;
 }
 
-/*! Rename a process */
+/** Rename a process */
 void proc_rename(struct Process *proc, const char *name)
 {
 #if CONFIG_KERN_MONITOR
@@ -288,7 +297,7 @@ void proc_rename(struct Process *proc, const char *name)
 }
 
 
-/*!
+/**
  * System scheduler: pass CPU control to the next process in
  * the ready queue.
  *
@@ -308,12 +317,14 @@ void proc_schedule(void)
 	/* Remember old process to save its context later */
 	old_process = CurrentProcess;
 
+#ifdef IRQ_RUNNING
 	/* Scheduling in interrupts is a nono. */
 	ASSERT(!IRQ_RUNNING());
+#endif
 
 	/* Poll on the ready queue for the first ready process */
 	IRQ_SAVE_DISABLE(flags);
-	while (!(CurrentProcess = (struct Process *)REMHEAD(&ProcReadyList)))
+	while (!(CurrentProcess = (struct Process *)list_remHead(&ProcReadyList)))
 	{
 		/*
 		 * Make sure we physically reenable interrupts here, no matter what
@@ -326,7 +337,7 @@ void proc_schedule(void)
 		 * reason to do this.
 		 */
 		IRQ_ENABLE;
-		SCHEDULER_IDLE;
+		CPU_IDLE;
 		IRQ_DISABLE;
 	}
 	IRQ_RESTORE(flags);
@@ -358,7 +369,7 @@ void proc_schedule(void)
 }
 
 
-/*!
+/**
  * Terminate the current process
  */
 void proc_exit(void)
@@ -399,7 +410,7 @@ void proc_exit(void)
 }
 
 
-/*!
+/**
  * Co-operative context switch
  */
 void proc_switch(void)
@@ -415,7 +426,7 @@ void proc_switch(void)
 }
 
 
-/*!
+/**
  * Get the pointer to the current process
  */
 struct Process *proc_current(void)
@@ -423,7 +434,7 @@ struct Process *proc_current(void)
 	return CurrentProcess;
 }
 
-/*!
+/**
  * Get the pointer to the user data of the current process
  */
 iptr_t proc_current_user_data(void)
@@ -434,7 +445,7 @@ iptr_t proc_current_user_data(void)
 
 #if CONFIG_KERN_PREEMPTIVE
 
-/*!
+/**
  * Disable preemptive task switching.
  *
  * The scheduler maintains a per-process nesting counter.  Task switching is
@@ -454,7 +465,7 @@ void proc_forbid(void)
 	++CurrentProcess->forbid_cnt;
 }
 
-/*!
+/**
  * Re-enable preemptive task switching.
  *
  * \sa proc_forbid()
@@ -472,7 +483,7 @@ void proc_permit(void)
 
 #include <drv/timer.h>
 
-/*!
+/**
  * Proc scheduling test subthread 1
  */
 static void NORETURN proc_test_thread1(void)
@@ -485,7 +496,7 @@ static void NORETURN proc_test_thread1(void)
 	}
 }
 
-/*!
+/**
  * Proc scheduling test subthread 2
  */
 static void NORETURN proc_test_thread2(void)
@@ -501,7 +512,7 @@ static void NORETURN proc_test_thread2(void)
 static cpustack_t proc_test_stack1[CONFIG_KERN_DEFSTACKSIZE/sizeof(cpustack_t)];
 static cpustack_t proc_test_stack2[CONFIG_KERN_DEFSTACKSIZE/sizeof(cpustack_t)];
 
-/*!
+/**
  * Proc scheduling test
  */
 void NORETURN proc_test(void)