X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fproc.c;h=7ce077b0c14f7974a2e9a76c95770489fd66ac5b;hb=a5733d7ada3d21f598bbd74d48305abae9de7224;hp=c971c09fe08fd3a10183ca9203f0776493fc3c10;hpb=ab481ba05aa4a74682445c0c89ab7e101e92455b;p=bertos.git

diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c
index c971c09f..7ce077b0 100644
--- a/bertos/kern/proc.c
+++ b/bertos/kern/proc.c
@@ -41,7 +41,8 @@
 #include "proc.h"
 
 #include "cfg/cfg_arch.h"  // ARCH_EMUL
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_monitor.h"
 #include <cfg/macros.h>    // ROUND_UP2
 #include <cfg/module.h>
 #include <cfg/depend.h>    // CONFIG_DEPEND()
@@ -57,12 +58,6 @@
 
 #include <string.h>           /* memset() */
 
-// Check config dependencies
-CONFIG_DEPEND(CONFIG_KERN_SIGNALS,    CONFIG_KERN_SCHED);
-CONFIG_DEPEND(CONFIG_KERN_SEMAPHORES, CONFIG_KERN_SIGNALS);
-CONFIG_DEPEND(CONFIG_KERN_MONITOR,    CONFIG_KERN_SCHED);
-
-
 /*
  * The scheduer tracks ready processes by enqueuing them in the
  * ready list.
@@ -88,7 +83,7 @@ REGISTER Process *CurrentProcess;
  */
 List StackFreeList;
 
-#define NPROC 8
+#define NPROC 10
 cpu_stack_t proc_stacks[NPROC][(64 * 1024) / sizeof(cpu_stack_t)];
 #endif
 
@@ -166,6 +161,7 @@ struct Process *proc_new_with_name(UNUSED_ARG(const char *, name), void (*entry)
 #if (ARCH & ARCH_EMUL)
 	/* Ignore stack provided by caller and use the large enough default instead. */
 	PROC_ATOMIC(stack_base = (cpu_stack_t *)list_remHead(&StackFreeList));
+	ASSERT(stack_base);
 
 	stack_size = CONFIG_KERN_MINSTACKSIZE;
 #elif CONFIG_KERN_HEAP
@@ -322,9 +318,9 @@ void proc_setPri(struct Process *proc, int pri)
 
 		if (proc != CurrentProcess)
 		{
-				//proc_forbid();
-				//TODO: re-enqueue process
-				//pric_permit();
+				proc_forbid();
+				ATOMIC(SCHED_CHANGE_PRI(proc));
+				proc_permit();
 		}
 }
 #endif // CONFIG_KERN_PRI