* <!--
* 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.
/*#*
*#* $Log$
+ *#* 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.
+ *#*
+ *#* 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.
+ *#*
+ *#* Revision 1.25 2005/03/15 00:20:54 bernie
+ *#* proc_schedule(): New sanity check.
+ *#*
+ *#* Revision 1.24 2005/01/08 09:20:54 bernie
+ *#* Remove unused variable.
+ *#*
*#* Revision 1.23 2004/12/13 12:07:06 bernie
*#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
*#*
#include "proc_p.h"
#include "proc.h"
-#include "cpu.h"
-#include "event.h"
-#include "hw.h"
-#include <debug.h>
-#include <arch_config.h> /* ARCH_EMUL */
-#include <macros.h> /* ABS() */
+//#include "hw.h"
+#include <mware/event.h>
+#include <cfg/cpu.h>
+#include <cfg/debug.h>
+#include <cfg/arch_config.h> /* ARCH_EMUL */
+#include <cfg/macros.h> /* ABS() */
#include <string.h> /* memset() */
* \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;
- cpuflags_t flags;
size_t i;
size_t proc_size_words = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
#if CONFIG_KERN_HEAP
#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)
/* 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
* reason to do this.
*/
IRQ_ENABLE;
- SCHEDULER_IDLE;
+ CPU_IDLE;
IRQ_DISABLE;
}
IRQ_RESTORE(flags);
*/
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
#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 */