diff --git a/src/sys/include/ubixos/schedule.h b/src/sys/include/ubixos/schedule.h index a247813..bad2660 100755 --- a/src/sys/include/ubixos/schedule.h +++ b/src/sys/include/ubixos/schedule.h @@ -8,8 +8,7 @@ #ifndef _SCHEDULE_H #define _SCHEDULE_H -#define TIMER_CONST (3579545L/3) -#define TIMER_FREQ(x) (TIMER_CONST/(x)) +#define LATCH (1193180/500) #define numTasks 1024 #define RUNABLE 3 diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 9e06a68..ff984ce 100755 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -17,6 +17,8 @@ int main(); +int testVal=0; + descriptorTable(GDT,5) { {dummy:0}, standardDescriptor(0, 0xFFFFF, (dCode + dRead + dBig + dBiglim)), @@ -51,13 +53,14 @@ void test() { while(1) { - kprint("The"); + //kprint("The"); + testVal++; } } void test2() { while(1) { - kprint("Ubu"); + //kprint("Ubu"); } } diff --git a/src/sys/kernel/idt.c b/src/sys/kernel/idt.c index c595435..8041912 100755 --- a/src/sys/kernel/idt.c +++ b/src/sys/kernel/idt.c @@ -47,13 +47,6 @@ } /* Null Intterupt Descriptor */ -/* -asm( - ".globl intNull \n" - "intNull: \n" - " iret \n" - ); -*/ void intNull() { kprintf("Woot Invalid Interrupt\n"); while(1); diff --git a/src/sys/kernel/schedule.c b/src/sys/kernel/schedule.c index de0c30c..2c03f1b 100755 --- a/src/sys/kernel/schedule.c +++ b/src/sys/kernel/schedule.c @@ -17,10 +17,11 @@ struct taskStruct *_current,*_usedMath = 0x0; extern union descriptorTableunion GDT[7]; +extern int testVal; /* Initialize Scheduler */ void initScheduler(void) { - int i,freq; + int i; for (i=0;i> 8 , 0x40); /* MSB */ } /* Finds A Free Task */ @@ -64,7 +68,7 @@ GDT[4].descriptor.baseLow = (memAddr & 0xFFFF); GDT[4].descriptor.baseMed = ((memAddr >> 16) & 0xff); GDT[4].descriptor.baseHigh = (memAddr >> 24); - kprintf("Switch To Task; [%i]\n",proc); + kprintf("Switch To Task; [%i][%i]\n",proc,testVal); asm("ljmp $0x20,$0\n"); } }