diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index fba5b5b..1766049 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -32,11 +32,11 @@ #include #include +#include typedef int (*intFunctionPTR)(); /* - vfs_init, 8259_init, idt_init, sched_init, @@ -53,6 +53,7 @@ intFunctionPTR init_tasks[] = { vmm_init, vitals_init, + vfs_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/include/vfs/vfs.h b/src/sys/include/vfs/vfs.h index f2b04fc..9d72a98 100644 --- a/src/sys/include/vfs/vfs.h +++ b/src/sys/include/vfs/vfs.h @@ -70,7 +70,7 @@ /* VFS Functions */ -int vfsInit(); +int vfs_init(); int vfsRegisterFS(int,void *,void *,void *,void *,void *,void *,void *,void *); struct fileSystem *vfsFindFS(int); diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 350cf4a..56ae96f 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -96,11 +95,6 @@ //smpInit(); /* Initialize SMP */ - /* Initialize VFS(Virtual File System) Layer */ - if (vfsInit() != 0x0) { - kpanic("Error: Initializing VFS\n"); - } - /* Initialize The Systems 8259 Controller/IRQ Handling */ if (init8259() != 0x0) { kpanic("Error: Initializing 8259\n"); diff --git a/src/sys/vfs/vfs.c b/src/sys/vfs/vfs.c index 2a9d0bd..bb3eacb 100644 --- a/src/sys/vfs/vfs.c +++ b/src/sys/vfs/vfs.c @@ -34,7 +34,7 @@ /************************************************************************ -Function: void initVFS(); +Function: void vfs_init(); Description: This Function Initializes The VFS Layer @@ -43,7 +43,7 @@ 02/20/2004 - Approved for quality ************************************************************************/ -int vfsInit() { +int vfs_init() { /* Set up default fileSystems list */ systemVitals->fileSystems = 0x0; @@ -108,6 +108,9 @@ /*** $Log$ + Revision 1.3 2004/05/21 14:52:39 reddawg + Cleaned up + Revision 1.2 2004/05/19 04:07:43 reddawg kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been