diff --git a/src/sys/include/lib/kmalloc.h b/src/sys/include/lib/kmalloc.h index 741f6ee..dd34844 100644 --- a/src/sys/include/lib/kmalloc.h +++ b/src/sys/include/lib/kmalloc.h @@ -36,7 +36,6 @@ extern "C" { #endif -#define sysMalloc -2 #define sysID -2 struct memDescriptor { @@ -59,6 +58,9 @@ /*** $Log$ + Revision 1.4 2004/07/18 05:24:15 reddawg + Fixens + Revision 1.3 2004/05/21 15:00:27 reddawg Cleaned up diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 96781ac..95fe259 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -57,8 +57,10 @@ pit_init, atkbd_init, time_init, + /* net_init, ne2k_init, + */ devfs_init, ubixfs_init, fdc_init, @@ -70,6 +72,9 @@ /*** $Log$ + Revision 1.18 2004/07/17 03:10:18 reddawg + Added asserts no problems thusfar + Revision 1.17 2004/07/17 02:45:55 reddawg Modified assert it now invokes kPanic it is very nifty diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h index d5e08b8..5962d14 100644 --- a/src/sys/include/ubixos/sched.h +++ b/src/sys/include/ubixos/sched.h @@ -92,8 +92,6 @@ kTask_t *schedFindTask(uInt32 id); int deleteTask(uInt32); -extern kTask_t *taskList; -extern uInt32 nextID; extern kTask_t *_current; extern kTask_t *_usedMath; @@ -105,6 +103,9 @@ /*** $Log$ + Revision 1.10 2004/07/18 05:24:15 reddawg + Fixens + Revision 1.9 2004/07/09 13:23:20 reddawg sched: schedInit to sched_init Adjusted initialization routines diff --git a/src/sys/include/vmm/vmm.h b/src/sys/include/vmm/vmm.h index 6cafe56..91c9494 100644 --- a/src/sys/include/vmm/vmm.h +++ b/src/sys/include/vmm/vmm.h @@ -45,9 +45,12 @@ int cowCounter; } mMap; -extern mMap *vmmMemoryMap; extern int numPages; +extern mMap *vmmMemoryMap; + +/* extern uInt32 freePages; +*/ int vmm_init(); int vmmMemMapInit(); @@ -61,6 +64,9 @@ /*** $Log$ + Revision 1.4 2004/07/09 12:18:19 reddawg + Updating Initialization Procedures + Revision 1.3 2004/05/21 15:21:04 reddawg Cleaned up diff --git a/src/sys/init/main.c b/src/sys/init/main.c index e04c7f3..b562378 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -120,7 +120,7 @@ execThread(systemTask,(uInt32)(kmalloc(0x2000)+0x2000),0x0); execFile("sys:/init",0x0,0x0,0x0); //execFile("sys:/shell",0x0,0x0,0x0); - kprintf("Free Pages: [%i]\n",freePages); + kprintf("Free Pages: [%i]\n",systemVitals->freePages); kprintf("MemoryMap: [0x%X]\n",vmmMemoryMap); kprintf("Starting Os\n"); //lookup("/COPYRIGHT"); @@ -173,6 +173,11 @@ /*** $Log$ + Revision 1.56 2004/07/17 15:54:52 reddawg + kmalloc: added assert() + bioscall: fixed some potential problem by not making 16bit code + paging: added assert() + Revision 1.55 2004/07/17 03:38:38 reddawg Going to laptop to finish up diff --git a/src/sys/kernel/endtask.c b/src/sys/kernel/endtask.c index 6de259f..0a8a49f 100644 --- a/src/sys/kernel/endtask.c +++ b/src/sys/kernel/endtask.c @@ -40,7 +40,7 @@ fclose(_current->imageFd); //kfree(_current->oInfo.cwd); kprintf("Ending Task: [%i:%i:%i]\n",pid,_current->id,systemVitals->freePages); - //schedDeleteTask(_current->id); + schedDeleteTask(_current->id); _current->state = DEAD; schedYield(); /* I'm pretty sure we need this if the thread is ending itself */ return; @@ -48,6 +48,9 @@ /*** $Log$ + Revision 1.6 2004/07/18 05:24:15 reddawg + Fixens + Revision 1.5 2004/06/26 01:24:44 reddawg Fixens