X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=f86e1ad9113c16805b66e6c90170b6d388315392;hb=70fbca7abd15ab931dc82119f5b0b8f7b3fe1596;hp=15817ef79803ea26a9ded4679b14a9bdf6e711fa;hpb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;p=bertos.git

diff --git a/kern/proc.c b/kern/proc.c
index 15817ef7..f86e1ad9 100644
--- 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.
@@ -15,109 +40,14 @@
  * \author Stefano Fedrigo <aleph@develer.com>
  */
 
-/*#*
- *#* $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.
- *#*
- *#* 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.
- *#*
- *#* Revision 1.22  2004/12/13 11:51:08  bernie
- *#* DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.
- *#*
- *#* Revision 1.21  2004/11/28 23:20:25  bernie
- *#* Remove obsolete INITLIST macro.
- *#*
- *#* Revision 1.20  2004/11/16 22:37:14  bernie
- *#* Replace IPTR with iptr_t.
- *#*
- *#* Revision 1.19  2004/10/19 11:47:39  bernie
- *#* Kill warnings when !CONFIG_PROC_MONITOR.
- *#*
- *#* Revision 1.18  2004/10/19 08:54:43  bernie
- *#* Initialize forbid_cnt; Formatting/comments fixes.
- *#*
- *#* Revision 1.17  2004/10/19 08:47:13  bernie
- *#* proc_rename(), proc_forbid(), proc_permit(): New functions.
- *#*
- *#* Revision 1.16  2004/10/03 20:39:28  bernie
- *#* Import changes from sc/firmware.
- *#*
- *#* Revision 1.15  2004/09/20 03:29:39  bernie
- *#* C++ fixes.
- *#*
- *#* Revision 1.14  2004/09/14 21:06:44  bernie
- *#* Use debug.h instead of kdebug.h.
- *#*
- *#* Revision 1.13  2004/08/29 21:58:53  bernie
- *#* Include macros.h explicityl.
- *#*
- *#* Revision 1.11  2004/08/24 16:09:08  bernie
- *#* Add missing header.
- *#*
- *#* Revision 1.10  2004/08/24 16:07:01  bernie
- *#* Use kputs()/kputchar() when possible.
- *#*
- *#* Revision 1.9  2004/08/24 14:26:57  bernie
- *#* monitor_debug_stacks(): Conditionally compile on CONFIG_KERN_MONITOR.
- *#*
- *#* Revision 1.8  2004/08/14 19:37:57  rasky
- *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
- *#*
- *#* Revision 1.7  2004/08/02 20:20:29  aleph
- *#* Merge from project_ks
- *#*
- *#* Revision 1.6  2004/07/30 14:24:16  rasky
- *#* Task switching con salvataggio perfetto stato di interrupt (SR)
- *#* Kernel monitor per dump informazioni su stack dei processi
- *#*
- *#* Revision 1.5  2004/07/14 14:18:09  rasky
- *#* Merge da SC: Rimosso timer dentro il task, che è uno spreco di memoria per troppi task
- *#*
- *#* Revision 1.4  2004/07/13 19:21:28  aleph
- *#* Avoid warning for unused arg when compiled without some CONFIG_KERN_xx options
- *#*
- *#* Revision 1.3  2004/06/06 18:37:57  bernie
- *#* Rename event macros to look like regular functions.
- *#*
- *#* Revision 1.2  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.1  2004/05/23 17:27:00  bernie
- *#* Import kern/ subdirectory.
- *#*
- *#*/
 
 #include "proc_p.h"
 #include "proc.h"
 //#include "hw.h"
 #include <mware/event.h>
-#include <cfg/cpu.h>
+#include <cpu/irq.h>
+#include <cpu/types.h>
+#include <cpu/attr.h>
 #include <cfg/debug.h>
 #include <cfg/arch_config.h>  /* ARCH_EMUL */
 #include <cfg/macros.h>  /* ABS() */
@@ -219,14 +149,14 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi
 	/* Ignore stack provided by caller and use the large enough default instead. */
 	stack_base = (cpustack_t *)LIST_HEAD(&StackFreeList);
 	REMOVE(LIST_HEAD(&StackFreeList));
-	stacksize = CONFIG_KERN_DEFSTACKSIZE;
+	stacksize = CONFIG_PROC_DEFSTACKSIZE;
 #elif CONFIG_KERN_HEAP
 	/* Did the caller provide a stack for us? */
 	if (!stack_base)
 	{
 		/* Did the caller specify the desired stack size? */
 		if (!stacksize)
-			stacksize = CONFIG_KERN_DEFSTACKSIZE + sizeof(Process);
+			stacksize = CONFIG_PROC_DEFSTACKSIZE + sizeof(Process);
 
 		/* Allocate stack dinamically */
 		if (!(stack_base = heap_alloc(stacksize)))
@@ -398,7 +328,7 @@ void proc_exit(void)
 #warning This is wrong
 	/* Reinsert process stack in free list */
 	ADDHEAD(&StackFreeList, (Node *)(CurrentProcess->stack
-		- (CONFIG_KERN_DEFSTACKSIZE / sizeof(cpustack_t))));
+		- (CONFIG_PROC_DEFSTACKSIZE / sizeof(cpustack_t))));
 
 	/*
 	 * NOTE: At this point the first two words of what used