diff --git a/src/sys/Makefile b/src/sys/Makefile index 3a03b8c..f7b4f02 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -1,7 +1,7 @@ # $Id$ # Kernel Makefile (C) 2002 The UbixOS Project -all: net-code sde-code pci-code ubixfs-code vfs-code isa-code kernel-code lib-code vmm-code sys-code boot-code init-code devfs-code mpi-code kmods-code kernel-img +all: net-code sde-code pci-code ufs-code ubixfs-code vfs-code isa-code kernel-code lib-code vmm-code sys-code boot-code init-code devfs-code mpi-code kmods-code kernel-img boot-code: boot (cd boot;make) @@ -51,6 +51,9 @@ mpi-code: mpi (cd mpi;make) +ufs-code: ufs + (cd ufs;make) + kmods-code: kmods (cd kmods;make) @@ -81,4 +84,5 @@ (cd net;make clean) (cd mpi;make clean) (cd kmods;make clean) + (cd ufs;make clean) (cd ../tools/;make clean) diff --git a/src/sys/compile/Makefile b/src/sys/compile/Makefile index 74bd7d3..8761f3b 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 +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 #../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 5d4415a..6bdf1bf 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -61,8 +61,8 @@ pit_init, atkbd_init, time_init, - net_init, - ne2k_init, + //net_init, + //ne2k_init, devfs_init, pci_init, ubixfs_init, @@ -76,6 +76,9 @@ /*** $Log$ + Revision 1.39 2004/09/19 13:02:50 reddawg + Bug Fixes + Revision 1.38 2004/09/16 22:35:27 reddawg Demo Release diff --git a/src/sys/init/main.c b/src/sys/init/main.c index fe106fc..9599a40 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -109,19 +109,14 @@ initHardDisk(); /* Initialize the system */ - //kprintf("0"); execThread(systemTask,(kmalloc(0x2000)+0x2000),0x0); - //kprintf("1"); - execFile("sys:/init",0x0,0x0,0x1); + //execFile("sys:/init",0x0,0x0,0x1); /* execFile("sys:/login",0x0,0x0,0x1); */ - //kprintf("2"); execFile("sys:/login",0x0,0x0,0x2); - //kprintf("3"); execFile("sys:/login",0x0,0x0,0x3); - //kprintf("4"); execFile("sys:/login",0x0,0x0,0x4); kprintf("Free Pages: [%i]\n",systemVitals->freePages); @@ -137,6 +132,9 @@ /*** $Log$ + Revision 1.86 2004/09/16 22:35:28 reddawg + Demo Release + Revision 1.85 2004/09/14 21:51:24 reddawg Debug info