diff --git a/src/sys/include/isa/pit.h b/src/sys/include/isa/pit.h index fea43ca..844b878 100644 --- a/src/sys/include/isa/pit.h +++ b/src/sys/include/isa/pit.h @@ -32,12 +32,14 @@ #include -int pitInit(int); +int pit_init(int); #endif /*** $Log$ + Revision 1.2 2004/05/21 14:57:16 reddawg + Cleaned up END ***/ diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 66d0ef0..4570a75 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -36,11 +36,11 @@ #include #include #include +#include typedef int (*intFunctionPTR)(); /* - pit_init, keyboard_init, time_init, net_init, @@ -57,6 +57,7 @@ i8259_init, idt_init, sched_init, + pit_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 734db2d..50e84c8 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -91,12 +91,6 @@ } //smpInit(); /* Initialize SMP */ - - /* Initialize The Systems Timer */ - if (pitInit(1000) != 0x0) { - kpanic("Error: Initializing PIT\n"); - } - /* Initialize The Systems Keyboard */ if (keyboardInit() != 0x0) { kpanic("Error: Initializing Keyboard\n"); diff --git a/src/sys/isa/pit.c b/src/sys/isa/pit.c index 83f8e8e..9ccd3c3 100644 --- a/src/sys/isa/pit.c +++ b/src/sys/isa/pit.c @@ -61,7 +61,7 @@ = 1 BCD counter *****************************************************************************************/ -int pitInit(int timerHz) { +int pit_init(int timerHz) { outportByteP(0x43,0x36); outportByteP(0x40,((1193180/timerHz) & 0xFF)); outportByte(0x40,(((1193180/timerHz) >> 8) & 0xFF)); @@ -74,15 +74,16 @@ } /*** - $Log$ + Revision 1.4 2004/05/21 12:48:22 reddawg + Cleaned up + Revision 1.3 2004/05/20 22:51:09 reddawg Cleaned Up Warnings Revision 1.2 2004/05/10 02:23:24 reddawg Minor Changes To Source Code To Prepare It For Open Source Release - END ***/