diff --git a/src/Makefile.inc b/src/Makefile.inc index c30c9f5..4fc3804 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -2,10 +2,10 @@ # Global 'Source' Options # allow you to change your default compiler without affecting your other work -CC = gcc -CXX = g++ +CC = gcc295 +CXX = g++295 LD = ld AR = ar REMOVE = rm -rf -FD_DEVICE = /dev/fd0 +FD_DEVICE = /dev/md0 diff --git a/src/sys/compile/Makefile b/src/sys/compile/Makefile index 8761f3b..4e6ee65 100644 --- a/src/sys/compile/Makefile +++ b/src/sys/compile/Makefile @@ -9,7 +9,7 @@ OBJS = null.o #Kernel Parts -KPARTS = ../init/*.o ../sys/*.o ../vmm/*.o ../lib/*.o ../kernel/*.o ../isa/*.o ../vfs/*.o ../ubixfs/*.o ../pci/*.o ../sde/*.o ../devfs/*.o ../net/core/*.o ../net/net/*.o ../net/api/*.o ../net/netif/*.o ../mpi/*.o ../ufs/*.o +KPARTS = ../init/*.o ../sys/*.o ../vmm/*.o ../lib/*.o ../kernel/*.o ../isa/*.o ../vfs/*.o ../ubixfs/*.o ../pci/*.o ../sde/*.o ../devfs/*.o ../mpi/*.o ../ufs/*.o #../graphics/*.o ../ld/*.o -Ttext 0x30000 -Tdata 0x34000 # Link the kernel statically with fixed text+data address @1M diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index c21770b..a63be87 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -77,105 +77,5 @@ #endif /*** - $Log$ - Revision 1.40 2004/10/02 21:33:16 reddawg - Need this files so the build doesn't break - - Revision 1.39 2004/09/19 13:02:50 reddawg - Bug Fixes - - Revision 1.38 2004/09/16 22:35:27 reddawg - Demo Release - - Revision 1.37 2004/09/14 21:51:24 reddawg - Debug info - - Revision 1.36 2004/09/11 22:17:52 reddawg - hmm.. - - Revision 1.35 2004/09/11 19:15:37 reddawg - here you go irq 10 io 240 for your ne2k nic - - Revision 1.34 2004/09/11 14:12:33 reddawg - ok enabled networking - - Revision 1.33 2004/09/08 22:04:10 apwillia - Added calling of static constructors, commented out tty_printf in kprintf (due to deadlock) - - Revision 1.32 2004/09/08 07:33:37 reddawg - Fixes - - Revision 1.31 2004/09/07 22:26:04 reddawg - synced in - - Revision 1.30 2004/09/07 21:54:38 reddawg - ok reverted back to old scheduling for now.... - - Revision 1.29 2004/09/07 20:58:35 reddawg - time to roll back i can't think straight by friday - - Revision 1.28 2004/08/20 16:49:11 reddawg - PCI Updates - More to follow as PCI system gets revamped - - Revision 1.27 2004/08/03 18:31:18 reddawg - virtual terms - - Revision 1.26 2004/08/01 20:40:45 reddawg - Net related fixes - - Revision 1.25 2004/07/28 22:29:29 reddawg - Turned off network support our scheduler... is really horible with cpu bound tasks the system does slow down to much - - Revision 1.24 2004/07/28 22:23:02 reddawg - make sure it still works before I goto bed - - Revision 1.23 2004/07/28 00:17:05 reddawg - Major: - Disconnected page 0x0 from the system... Unfortunately this broke many things - all of which have been fixed. This was good because nothing deferences NULL - any more. - - Things affected: - malloc,kmalloc,getfreepage,getfreevirtualpage,pagefault,fork,exec,ld,ld.so,exec,file - - Revision 1.22 2004/07/24 23:04:44 reddawg - Changes... mark let me know if you fault at pid 185 when you type stress - - Revision 1.21 2004/07/22 17:32:25 reddawg - I broke it hopefully - - Revision 1.20 2004/07/21 23:05:05 reddawg - last round of fixed - main.c: removed kernel stack - start.S: added kernel stack thanks to tip off from BJ about .comm - init.h: re-enabled ipStack - - Revision 1.19 2004/07/19 02:08:27 reddawg - Cleaned out the rest of debuging code also temporarily disabled the ip stack to improve boot time - - 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 - - Revision 1.16 2004/07/17 02:38:31 reddawg - Fixed a few problems - - Revision 1.15 2004/07/14 12:42:46 reddawg - fdc: fdcInit to fdc_init - Changed Startup Routines - - Revision 1.12 2004/07/14 02:25:40 reddawg - net: netInit to net_init - Changed startup routines - - Revision 1.11 2004/07/09 13:37:30 reddawg - time: timeInit to time_init - Adjusted initialization routines - - Revision 1.3 2004/07/09 12:18:19 reddawg - Updating Initialization Procedures - END ***/ diff --git a/src/sys/init/main.c b/src/sys/init/main.c index ce7f392..80b7334 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -98,19 +98,14 @@ if (vfs_mount(0x0,0x0,0x1,0x0,"tmp","rw") != 0x0) { kprintf("Problem Mounting tmp Mount Point\n"); } - /* - if (vfs_mount(0x1,0x1,0x0,0x0,"hd","rw") != 0x0) { - kprintf("Problem Mounting HD Mount Point\n"); - } - */ /* Initialize the system */ - execThread(systemTask,(uInt32)kmalloc(0x2000)+0x2000,0x0); - execFile("sys:/init",0x0,0x0,0x1); - kprintf("Free Pages: [%i]\n",systemVitals->freePages); kprintf("MemoryMap: [0x%X]\n",vmmMemoryMap); kprintf("Starting Os\n"); + + execThread(systemTask,(uInt32)kmalloc(0x2000)+0x2000,0x0); + execFile("sys:/init",0x0,0x0,0x0); irqEnable(0x0); while (0x1) diff --git a/src/sys/kernel/bioscall.c b/src/sys/kernel/bioscall.c index 1f540d7..7639761 100644 --- a/src/sys/kernel/bioscall.c +++ b/src/sys/kernel/bioscall.c @@ -58,7 +58,7 @@ newProcess = schedNewTask(); assert(newProcess); - /* + newProcess->tss.back_link = 0x0; newProcess->tss.esp0 = (uInt32)kmalloc(0x2000)+0x2000; newProcess->tss.ss0 = 0x10; @@ -88,7 +88,7 @@ newProcess->tss.io_map = 0x0 & 0xFFFF; newProcess->tss.io_map = sizeof(struct tssStruct)-8192; newProcess->oInfo.v86Task = 0x1; - */ + newProcess->state = READY; while (newProcess->state > 0); @@ -98,6 +98,9 @@ /*** $Log$ + Revision 1.6 2004/08/21 17:36:57 reddawg + updates: converted to software task switching however it is not working yet + Revision 1.5 2004/07/17 15:54:52 reddawg kmalloc: added assert() bioscall: fixed some potential problem by not making 16bit code diff --git a/src/sys/kernel/schedyield.S b/src/sys/kernel/schedyield.S index 3a85cf6..a985015 100644 --- a/src/sys/kernel/schedyield.S +++ b/src/sys/kernel/schedyield.S @@ -48,7 +48,5 @@ iret /*** - $Log$ END ***/ - diff --git a/src/sys/sde/main.cc b/src/sys/sde/main.cc index 8c40e47..2cfad78 100644 --- a/src/sys/sde/main.cc +++ b/src/sys/sde/main.cc @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.2 2004/05/19 17:09:50 flameshadow + chg: Undid previous renaming. This now restores me as the EOOUIAD. + Revision 1.1.1.1 2004/04/15 12:07:16 reddawg UbixOS v1.0 @@ -55,7 +58,6 @@ ogSurface *buf = 0x0; ogBitFont * font = new ogBitFont(); - font->Load("ROM8X14.DPF",0); font->SetFGColor(255, 255, 255, 255); font->SetBGColor(0, 0, 0, 255); diff --git a/src/sys/vfs/file.c b/src/sys/vfs/file.c index eed1981..9b88ce9 100644 --- a/src/sys/vfs/file.c +++ b/src/sys/vfs/file.c @@ -290,7 +290,7 @@ sprintf(fileName,file); - if (strstr(file,":")) { + if (strstr(fileName,":")) { mountPoint = (char *)strtok((char *)&fileName,":"); path = strtok(NULL,"\n"); } @@ -488,102 +488,5 @@ /*** - $Log$ - Revision 1.27 2004/09/19 16:17:25 reddawg - fixed memory leak we now lose no memory.... - - Revision 1.26 2004/09/16 22:35:28 reddawg - Demo Release - - Revision 1.25 2004/09/14 21:51:24 reddawg - Debug info - - Revision 1.24 2004/09/11 13:12:56 reddawg - Removed kernel/file.c all in the vfs now - - Revision 1.23 2004/09/11 12:59:21 apwillia - Fixed file syscalls so fdisk does not kernel panic - - Revision 1.22 2004/09/11 12:11:11 reddawg - Cleaning up the VFS more changes to follow... - - Revision 1.21 2004/08/21 17:36:57 reddawg - updates: converted to software task switching however it is not working yet - - Revision 1.20 2004/08/14 11:23:02 reddawg - Changes - - Revision 1.19 2004/08/09 12:58:05 reddawg - let me know when you got the surce - - Revision 1.18 2004/08/06 22:32:16 reddawg - Ubix Works Again - - Revision 1.16 2004/07/28 15:05:43 reddawg - Major: - Pages now have strict security enforcement. - Many null dereferences have been resolved. - When apps loaded permissions set for pages rw and ro - - Revision 1.15 2004/07/27 19:24:31 flameshadow - chg: reduced the number of debugging statements in the kernel. - - Revision 1.14 2004/07/27 04:05:20 flameshadow - chg: kinda fixed it. Added bunches of debug info - - Revision 1.13 2004/07/23 09:10:06 reddawg - ubixfs: cleaned up some functions played with the caching a bit - vfs: renamed a bunch of functions - cleaned up a few misc bugs - - Revision 1.12 2004/07/22 22:37:03 reddawg - Caching is working now the FS is extremely fast but needs to be optimized to do 32bit copies over 8bit - - Revision 1.11 2004/07/22 19:43:36 reddawg - ok we are absolute now...... ? - - Revision 1.10 2004/07/21 10:02:09 reddawg - devfs: renamed functions - device system: renamed functions - fdc: fixed a few potential bugs and cleaned up some unused variables - strol: fixed definition - endtask: made it print out freepage debug info - kmalloc: fixed a huge memory leak we had some unhandled descriptor insertion so some descriptors were lost - ld: fixed a pointer conversion - file: cleaned up a few unused variables - sched: broke task deletion - kprintf: fixed ogPrintf definition - - Revision 1.9 2004/07/18 05:24:15 reddawg - Fixens - - Revision 1.8 2004/06/29 03:59:48 reddawg - Fixed a few issues with subdirectories they are working much better now - - Revision 1.7 2004/06/29 00:18:49 reddawg - Sub Dirs - - Revision 1.6 2004/06/28 23:12:58 reddawg - file format now container:/path/to/file - - Revision 1.5 2004/06/16 19:56:35 reddawg - Moved fclose - - Revision 1.4 2004/06/14 12:20:54 reddawg - notes: many bugs repaired and ld works 100% now. - - Revision 1.3 2004/06/01 00:04:53 reddawg - Try now mark - - 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 - - Revision 1.1.1.1 2004/04/15 12:06:53 reddawg - UbixOS v1.0 - - Revision 1.12 2004/04/13 16:36:34 reddawg - Changed our copyright, it is all now under a BSD-Style license - END ***/ -