diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 8d6eaa3..08e93c3 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -35,7 +35,6 @@ typedef int (*intFunctionPTR)(); /* - vmm_init, vitals_init, vfs_init, 8259_init, @@ -52,7 +51,7 @@ */ intFunctionPTR init_tasks[] = { - vmmInit, + vmm_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/include/vmm/vmm.h b/src/sys/include/vmm/vmm.h index f760eba..6cafe56 100644 --- a/src/sys/include/vmm/vmm.h +++ b/src/sys/include/vmm/vmm.h @@ -49,7 +49,7 @@ extern int numPages; extern uInt32 freePages; -int vmmInit(); +int vmm_init(); int vmmMemMapInit(); int countMemory(); uInt32 vmmFindFreePage(pidType pid); @@ -61,6 +61,9 @@ /*** $Log$ + Revision 1.3 2004/05/21 15:21:04 reddawg + Cleaned up + END ***/ diff --git a/src/sys/init/main.c b/src/sys/init/main.c index dbaef37..3976a17 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include diff --git a/src/sys/vmm/vmminit.c b/src/sys/vmm/vmminit.c index 7a8d674..e227123 100644 --- a/src/sys/vmm/vmminit.c +++ b/src/sys/vmm/vmminit.c @@ -31,14 +31,14 @@ /***************************************************************************************** - Function: int vmmInit() + Function: int vmm_init() Description: Initializes the vmm subsystem Notes: *****************************************************************************************/ -int vmmInit() { +int vmm_init() { if (vmmMemMapInit() != 0x0) { return (0x1); } @@ -50,6 +50,9 @@ /*** $Log$ + Revision 1.2 2004/05/21 14:36:55 reddawg + Cleaned up + Revision 1.1.1.1 2004/04/15 12:06:53 reddawg UbixOS v1.0