X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=495ca735e5d2cedc650eedb4a848fb53b622e1ee;hb=d10f125474900e83860a3031ca3a31141fdf27a9;hp=2fdc9a17532731910dfb7b9a2e3b618af53ac337;hpb=af9c555446161016fdd76c1cdff96ce76bb6cba2;p=bertos.git

diff --git a/kern/proc.c b/kern/proc.c
index 2fdc9a17..495ca735 100755
--- a/kern/proc.c
+++ b/kern/proc.c
@@ -3,7 +3,7 @@
  * <!--
  * Copyright 2001,2004 Develer S.r.l. (http://www.develer.com/)
  * Copyright 1999,2000,2001 Bernardo Innocenti <bernie@develer.com>
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Simple realtime multitasking scheduler.
@@ -17,6 +17,15 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
+ *#*
+ *#* Revision 1.27  2005/11/04 16:20:02  bernie
+ *#* Fix reference to README.devlib in header.
+ *#*
  *#* Revision 1.26  2005/04/11 19:10:28  bernie
  *#* Include top-level headers from cfg/ subdir.
  *#*
@@ -97,9 +106,9 @@
 
 #include "proc_p.h"
 #include "proc.h"
+//#include "hw.h"
+#include <mware/event.h>
 #include <cfg/cpu.h>
-#include "event.h"
-#include "hw.h"
 #include <cfg/debug.h>
 #include <cfg/arch_config.h>  /* ARCH_EMUL */
 #include <cfg/macros.h>  /* ABS() */
@@ -188,7 +197,7 @@ void proc_init(void)
  * \return Process structure of new created process
  *         if successful, NULL otherwise.
  */
-struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
+struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
 {
 	Process *proc;
 	size_t i;
@@ -199,9 +208,9 @@ struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void
 
 #if (ARCH & ARCH_EMUL)
 	/* Ignore stack provided by caller and use the large enough default instead. */
-	stack_base = (cpustack_t *)StackFreeList.head;
-	REMOVE((Node *)stack_base);
-	stacksize = DEF_STACKSIZE;
+	stack_base = (cpustack_t *)LIST_HEAD(&StackFreeList);
+	REMOVE(LIST_HEAD(&StackFreeList));
+	stacksize = CONFIG_KERN_DEFSTACKSIZE;
 #elif CONFIG_KERN_HEAP
 	/* Did the caller provide a stack for us? */
 	if (!stack_base)
@@ -302,12 +311,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
@@ -357,8 +368,13 @@ void proc_schedule(void)
  */
 void proc_exit(void)
 {
+#if CONFIG_KERN_MONITOR
+	monitor_remove(CurrentProcess);
+#endif
+
 #if CONFIG_KERN_HEAP
-	/* The following code is BROKEN.
+	/*
+	 * The following code is BROKEN.
 	 * We are freeing our own stack before entering proc_schedule()
 	 * BAJO: A correct fix would be to rearrange the scheduler with
 	 *  an additional parameter which frees the old stack/process
@@ -370,21 +386,18 @@ void proc_exit(void)
 #endif
 
 #if (ARCH & ARCH_EMUL)
-#error This is wrong
+#warning This is wrong
 	/* Reinsert process stack in free list */
 	ADDHEAD(&StackFreeList, (Node *)(CurrentProcess->stack
-		- (DEF_STACKSIZE / sizeof(cpustack_t))));
+		- (CONFIG_KERN_DEFSTACKSIZE / sizeof(cpustack_t))));
 
-	/* NOTE: At this point the first two words of what used
+	/*
+	 * NOTE: At this point the first two words of what used
 	 * to be our stack contain a list node. From now on, we
 	 * rely on the compiler not reading/writing the stack.
 	 */
 #endif /* ARCH_EMUL */
 
-#if CONFIG_KERN_MONITOR
-	monitor_remove(CurrentProcess);
-#endif
-
 	CurrentProcess = NULL;
 	proc_schedule();
 	/* not reached */