diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index b221f1d..9b201cb 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -38,11 +38,11 @@ #include #include #include +#include typedef int (*intFunctionPTR)(); /* - time_init, net_init, ne2k_init, devfs_init, @@ -59,6 +59,7 @@ sched_init, pit_init, atkbd_init, + time_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/include/ubixos/time.h b/src/sys/include/ubixos/time.h index 7705536..90a6e02 100644 --- a/src/sys/include/ubixos/time.h +++ b/src/sys/include/ubixos/time.h @@ -78,16 +78,18 @@ -int timeInit(); +int time_init(); uInt32 timeMake(struct timeStruct *time); #endif /*** $Log$ + Revision 1.3 2004/06/29 11:41:44 reddawg + Fixed some global variables + Revision 1.2 2004/05/21 15:20:00 reddawg Cleaned up - END ***/ diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 064880c..a893271 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -88,21 +87,9 @@ } } - //smpInit(); /* Initialize SMP */ + //smpInit(); //mouseInit(); - - /* Initialize PCI Sub System */ - /* - if (pciInit() != 0x0) { - kpanic("Error: Initializing PCI\n"); - } - */ - - /* Sart Time */ - if (timeInit() != 0x0) { - kpanic("Error: Initializing TIME\n"); - } - + //pciInit(); /* Initialize Networking Subsystem */ if (netInit() != 0x0) { kpanic("Error: Initializing Networking Subsystem\n"); diff --git a/src/sys/kernel/time.c b/src/sys/kernel/time.c index 669b8cf..d98db19 100644 --- a/src/sys/kernel/time.c +++ b/src/sys/kernel/time.c @@ -52,7 +52,7 @@ return(inportByte(0x71)); } -int timeInit() { +int time_init() { struct timeStruct time; int i; @@ -114,6 +114,9 @@ /*** $Log$ + Revision 1.4 2004/06/29 11:41:44 reddawg + Fixed some global variables + Revision 1.3 2004/05/21 12:46:02 reddawg Cleaned up