diff --git a/Makefile b/Makefile index dac72ca..6e8704c 100644 --- a/Makefile +++ b/Makefile @@ -87,4 +87,3 @@ (cd mpi;make clean) (cd kmods;make clean) (cd ufs;make clean) - (cd ../tools/;make clean) diff --git a/Makefile.inc b/Makefile.inc index 882e13f..1d4091a 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1,6 +1,11 @@ # $Id$ # global 'sys' options +CC = gcc +C++ = g++ +LD = ld +AR = ar +REMOVE = rm -fr INCLUDES = -I../include CFLAGS = -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -O -DNOTIMP #-DVFSDEBUG -DDEBUG #-DVMMDEBUG #-DVFSDEBUG KERNEL = ubix.elf diff --git a/compile/Makefile b/compile/Makefile index 1277ec6..5bccb90 100644 --- a/compile/Makefile +++ b/compile/Makefile @@ -1,8 +1,7 @@ # $Id$ -# Kernel Makefile (C) 2002 The UbixOS Project +# Kernel Makefile (C) 2002,2009 The UbixOS Project # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc #Objects diff --git a/devfs/Makefile b/devfs/Makefile index 2e6a497..6749290 100644 --- a/devfs/Makefile +++ b/devfs/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Linker diff --git a/include/vmm/paging.h b/include/vmm/paging.h index 3eb6643..3d7ff8b 100644 --- a/include/vmm/paging.h +++ b/include/vmm/paging.h @@ -69,8 +69,7 @@ void vmmUnmapPages(void *,uInt32); void *vmmMapFromTask(pidType,void *,uInt32); void *vmmCopyVirtualSpace(pidType); -void *vmmGetFreeKernelPage(pidType); -void *vmmGetFreeKernelPage(pidType pid,uInt16 count); +void *vmm_getFreeKernelPage(pidType pid,uInt16 count); void *vmmCreateVirtualSpace(pidType); void *vmmGetFreeVirtualPage(pidType,int,int); diff --git a/init/Makefile b/init/Makefile index c3c2d99..6f041ac 100644 --- a/init/Makefile +++ b/init/Makefile @@ -1,8 +1,7 @@ -# (C) 2002-2004 The UbixOS Project +# (C) 2002-2004,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/isa/Makefile b/isa/Makefile index b289aec..af85de9 100644 --- a/isa/Makefile +++ b/isa/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/kernel/Makefile b/kernel/Makefile index 4a2fcb1..7bf7bf6 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/kmods/Makefile b/kmods/Makefile index ba50da0..4031215 100644 --- a/kmods/Makefile +++ b/kmods/Makefile @@ -1,8 +1,7 @@ -# (C) 2002-2004 The UbixOS Project +# (C) 2002-2004,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/lib/Makefile b/lib/Makefile index a5e443b..3031c18 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc INCLUDES += -I../../lib/objgfx40/ diff --git a/mpi/Makefile b/mpi/Makefile index c06a5a4..3bc55d1 100644 --- a/mpi/Makefile +++ b/mpi/Makefile @@ -1,8 +1,7 @@ -# (C) 2002-2004 The UbixOS Project +# (C) 2002-2004,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/pci/Makefile b/pci/Makefile index a96850d..afa99fb 100644 --- a/pci/Makefile +++ b/pci/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/sde/Makefile b/sde/Makefile index 504eb8c..ddd9a4f 100644 --- a/sde/Makefile +++ b/sde/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Linker diff --git a/sys/Makefile b/sys/Makefile index 802f90d..78126be 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/ubixfs/Makefile b/ubixfs/Makefile index cc4ef5e..5104a75 100644 --- a/ubixfs/Makefile +++ b/ubixfs/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/ufs/Makefile b/ufs/Makefile index caf1e5e..b90f274 100644 --- a/ufs/Makefile +++ b/ufs/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/vfs/Makefile b/vfs/Makefile index 5fbbef6..e41447e 100644 --- a/vfs/Makefile +++ b/vfs/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/vmm/Makefile b/vmm/Makefile index 3044ff4..fd0f9a2 100644 --- a/vmm/Makefile +++ b/vmm/Makefile @@ -1,8 +1,7 @@ -# (C) 2002 The UbixOS Project +# (C) 2002,2009 The UbixOS Project # $Id$ # Include Global 'Source' Options -include ../../Makefile.inc include ../Makefile.inc # Objects diff --git a/vmm/paging.c b/vmm/paging.c index 47b0f04..7a8a474 100644 --- a/vmm/paging.c +++ b/vmm/paging.c @@ -265,7 +265,7 @@ 07/30/02 - This Returns A Free Page In The Top 1GB For The Kernel ************************************************************************/ -void *vmm_getFreeKernelPage(pidType pid, uInt16 count) { +void *vmm_getFreeKernelPage(pidType pid, u_int16_t count) { int x = 0, y = 0, c = 0; uInt32 *pageTableSrc = 0x0; diff --git a/vmm/vmm_virtual.c b/vmm/vmm_virtual.c index fbea4a9..76fd489 100644 --- a/vmm/vmm_virtual.c +++ b/vmm/vmm_virtual.c @@ -548,7 +548,7 @@ /* Set Address Of Parent Page Directory */ parentPageDirectory = (uInt32 *) parentPageDirAddr; /* Allocate A New Page For The New Page Directory */ - newPageDirectory = (uInt32 *) vmm_getFreeKernelPage(pid); + newPageDirectory = (uInt32 *) vmm_getFreeKernelPage(pid,0x1); /* Set newPageDirectoryAddress To The Newly Created Page Directories Page */ newPageDirectoryAddress = (void *)vmm_getPhysicalAddr((uInt32) newPageDirectory); /* First Set Up A Flushed Page Directory */ @@ -563,7 +563,7 @@ * Allocate A New Page For The The First Page Table Where We Will Map The * Lower Region */ - newPageTable = (uInt32 *) vmm_getFreeKernelPage(pid); + newPageTable = (uInt32 *) vmm_getFreeKernelPage(pid,0x1); /* Flush The Page From Garbage In Memory */ for (x = 0; x < pageEntries; x++) { newPageTable[x] = 0x0; @@ -587,7 +587,7 @@ /* First Lets Unmap The Previously Allocated Page Table */ vmmUnmapPage((uInt32) newPageTable, 1); /* Allocate A New Page Table */ - newPageTable = (uInt32 *) vmm_getFreeKernelPage(pid); + newPageTable = (uInt32 *) vmm_getFreeKernelPage(pid,0x1); /* First Set Our Page Directory To Contain This */ newPageDirectory[767] = vmm_getPhysicalAddr((uInt32) newPageTable) | PAGE_DEFAULT; /* Now Lets Build The Page Table */