X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=kern%2Fproc.c;h=7fe9c70abc555029f5e7ce17044ab8b7713153fe;hb=3209699c4b8c578b0173bdd1b6b57aee36113836;hp=164df21e91806b7f1cd366451af14ac2e92e0b56;hpb=0053b1f8a55f9d7a7738278ceacc5ed78a8b68a9;p=bertos.git

diff --git a/kern/proc.c b/kern/proc.c
index 164df21e..7fe9c70a 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.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.
  *#*
@@ -91,12 +100,12 @@
 
 #include "proc_p.h"
 #include "proc.h"
-#include "cpu.h"
+#include <cfg/cpu.h>
 #include "event.h"
 #include "hw.h"
-#include <debug.h>
-#include <arch_config.h>  /* ARCH_EMUL */
-#include <macros.h>  /* ABS() */
+#include <cfg/debug.h>
+#include <cfg/arch_config.h>  /* ARCH_EMUL */
+#include <cfg/macros.h>  /* ABS() */
 
 #include <string.h> /* memset() */
 
@@ -296,6 +305,9 @@ void proc_schedule(void)
 	/* Remember old process to save its context later */
 	old_process = CurrentProcess;
 
+	/* Scheduling in interrupts is a nono. */
+	ASSERT(!IRQ_RUNNING());
+
 	/* Poll on the ready queue for the first ready process */
 	IRQ_SAVE_DISABLE(flags);
 	while (!(CurrentProcess = (struct Process *)REMHEAD(&ProcReadyList)))