diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index bfe60d1..66d0ef0 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -35,11 +35,11 @@ #include #include #include +#include typedef int (*intFunctionPTR)(); /* - sched_init, pit_init, keyboard_init, time_init, @@ -56,6 +56,7 @@ vfs_init, i8259_init, idt_init, + sched_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h index 4b2154e..b79c2bd 100644 --- a/src/sys/include/ubixos/sched.h +++ b/src/sys/include/ubixos/sched.h @@ -83,7 +83,7 @@ #define MAXPRIOLEVELS 11 -int schedInit(); +int sched_init(); void sched(); void schedYield(); void schedEndTask(pidType pid); @@ -104,6 +104,9 @@ /*** $Log$ + Revision 1.8 2004/06/22 14:02:14 solar + Added the PLACEHOLDER state for a task + Revision 1.7 2004/06/18 13:01:47 solar Added nice and timeSlice members to the kTask_t type diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 29c80e8..734db2d 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -92,10 +91,6 @@ } //smpInit(); /* Initialize SMP */ - /* Initialize The Kernel Scheduler */ - if (schedInit() != 0x0) { - kpanic("Error: Initializing: Scheduler\n"); - } /* Initialize The Systems Timer */ if (pitInit(1000) != 0x0) { diff --git a/src/sys/kernel/sched.c b/src/sys/kernel/sched.c index cadc822..185f97c 100644 --- a/src/sys/kernel/sched.c +++ b/src/sys/kernel/sched.c @@ -59,7 +59,7 @@ /************************************************************************ -Function: int schedInit() +Function: int sched_init() Description: This function is used to enable the kernel scheduler @@ -71,7 +71,7 @@ int -schedInit() +sched_init() { int i; @@ -307,6 +307,9 @@ /*** $Log$ + Revision 1.11 2004/06/22 14:03:10 solar + Making the task queue with priorities functional + Revision 1.10 2004/06/18 13:05:47 solar Changed the scheduler by adding the first rudiments of priority; vitals.c initializes the system's default quantum to 40