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

diff --git a/kern/proc.c b/kern/proc.c
old mode 100755
new mode 100644
index 24f93d48..23a2c3ef
--- a/kern/proc.c
+++ b/kern/proc.c
@@ -1,9 +1,34 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * 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 README.devlib for information.
+ *
  * -->
  *
  * \brief Simple realtime multitasking scheduler.
@@ -17,6 +42,18 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.32  2006/09/20 14:19:23  marco
+ *#* Restored test.
+ *#*
+ *#* 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.
  *#*
@@ -105,14 +142,14 @@
 #include "proc.h"
 //#include "hw.h"
 #include <mware/event.h>
-#include <cfg/cpu.h>
+#include <cpu/cpu.h>
 #include <cfg/debug.h>
 #include <cfg/arch_config.h>  /* ARCH_EMUL */
 #include <cfg/macros.h>  /* ABS() */
 
 #include <string.h> /* memset() */
 
-/*!
+/**
  * CPU dependent context switching routines.
  *
  * \note This function *MUST* preserve also the status of the interrupts.
@@ -145,7 +182,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 +225,7 @@ void proc_init(void)
 }
 
 
-/*!
+/**
  * Create a new process, starting at the provided entry point.
  *
  * \return Process structure of new created process
@@ -277,7 +314,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 +325,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 +345,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 +365,7 @@ void proc_schedule(void)
 		 * reason to do this.
 		 */
 		IRQ_ENABLE;
-		SCHEDULER_IDLE;
+		CPU_IDLE;
 		IRQ_DISABLE;
 	}
 	IRQ_RESTORE(flags);
@@ -358,7 +397,7 @@ void proc_schedule(void)
 }
 
 
-/*!
+/**
  * Terminate the current process
  */
 void proc_exit(void)
@@ -399,7 +438,7 @@ void proc_exit(void)
 }
 
 
-/*!
+/**
  * Co-operative context switch
  */
 void proc_switch(void)
@@ -415,7 +454,7 @@ void proc_switch(void)
 }
 
 
-/*!
+/**
  * Get the pointer to the current process
  */
 struct Process *proc_current(void)
@@ -423,7 +462,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 +473,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 +493,7 @@ void proc_forbid(void)
 	++CurrentProcess->forbid_cnt;
 }
 
-/*!
+/**
  * Re-enable preemptive task switching.
  *
  * \sa proc_forbid()
@@ -466,62 +505,3 @@ void proc_permit(void)
 }
 
 #endif /* CONFIG_KERN_PREEMPTIVE */
-
-
-#if 0 /* Simple testcase for the scheduler */
-
-#include <drv/timer.h>
-
-/*!
- * Proc scheduling test subthread 1
- */
-static void NORETURN proc_test_thread1(void)
-{
-	for (;;)
-	{
-		kputs(">task 1\n");
-		timer_delay(50);
-		proc_switch();
-	}
-}
-
-/*!
- * Proc scheduling test subthread 2
- */
-static void NORETURN proc_test_thread2(void)
-{
-	for (;;)
-	{
-		kputs(">task 2\n");
-		timer_delay(75);
-		proc_switch();
-	}
-}
-
-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)
-{
-	proc_new(proc_test_thread1, NULL, sizeof(proc_test_stack1), proc_test_stack1);
-	proc_new(proc_test_thread2, NULL, sizeof(proc_test_stack2), proc_test_stack2);
-	kputs("Created tasks\n");
-
-	kputs("stack1:\n");
-	kdump(proc_test_stack1+sizeof(proc_test_stack1)-64, 64);
-	kputs("stack2:\n");
-	kdump(proc_test_stack2+sizeof(proc_test_stack1)-64, 64);
-
-	for (;;)
-	{
-		kputs(">main task\n");
-		timer_delay(93);
-		proc_switch();
-	}
-
-	ASSERT(false);
-}
-#endif