* the GNU General Public License.
*
* Copyright 2001, 2004, 2008 Develer S.r.l. (http://www.develer.com/)
- * Copyright 1999, 2000, 2001 Bernie Innocenti <bernie@codewiz.org>
+ * Copyright 1999, 2000, 2001, 2008 Bernie Innocenti <bernie@codewiz.org>
* -->
*
- * \brief Simple realtime multitasking scheduler.
- * Context switching is only done cooperatively.
+ * \brief Simple cooperative multitasking scheduler.
*
* \version $Id: proc.c 1616 2008-08-10 19:41:26Z bernie $
* \author Bernie Innocenti <bernie@codewiz.org>
* Saving and restoring the context on the stack is done by a CPU-dependent
* support routine which usually needs to be written in assembly.
*/
-EXTERN_C void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp);
+EXTERN_C void asm_switch_context(cpu_stack_t **new_sp, cpu_stack_t **save_sp);
/**
* System scheduler: pass CPU control to the next process in
* the ready queue.
*/
-void proc_schedule(void)
+static void proc_schedule(void)
{
- struct Process *old_process;
- cpuflags_t flags;
+ cpu_flags_t flags;
ATOMIC(LIST_ASSERT_VALID(&ProcReadyList));
ASSERT_USER_CONTEXT();
- ASSERT_IRQ_ENABLED();
-
- /* Remember old process to save its context later */
- old_process = CurrentProcess;
+ IRQ_ASSERT_ENABLED();
/* Poll on the ready queue for the first ready process */
IRQ_SAVE_DISABLE(flags);
IRQ_DISABLE;
}
IRQ_RESTORE(flags);
+}
+
+void proc_switch(void)
+{
+ /* Remember old process to save its context later */
+ Process * const old_process = CurrentProcess;
+
+ proc_schedule();
/*
* Optimization: don't switch contexts when the active
*/
if (CurrentProcess != old_process)
{
- cpustack_t *dummy;
+ cpu_stack_t *dummy;
#if CONFIG_KERN_MONITOR
LOG_INFO("Switch from %p(%s) to %p(%s)\n",
- old_process, old_process ? old_process->monitor.name : "NONE",
- CurrentProcess, CurrentProcess->monitor.name);
+ old_process, proc_name(old_process),
+ CurrentProcess, proc_currentName());
#endif
/* Save context of old process and switch to new process. If there is no
/**
* Co-operative context switch
*/
-void proc_switch(void)
+void proc_yield(void)
{
ATOMIC(SCHED_ENQUEUE(CurrentProcess));
-
- proc_schedule();
+ proc_switch();
}