diff --git a/src/sys/Makefile b/src/sys/Makefile index e1ffe19..bca6a4b 100644 --- a/src/sys/Makefile +++ b/src/sys/Makefile @@ -68,8 +68,9 @@ (cd compile;make) install: - (cd boot;make install) - (cd ../tools/;make format-dsk) + (cd compile;cp ./ubix.elf /mnts/ubix/ubixos) +# (cd boot;make install) +# (cd ../tools/;make format-dsk) clean: (cd init;make clean) diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 0d7849d..934df5f 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -48,6 +48,7 @@ #include #include #include +#include typedef int (*intFunctionPTR)(void); @@ -70,6 +71,7 @@ fdc_init, tty_init, ufs_init, + initHardDisk, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); diff --git a/src/sys/lib/kmalloc.c b/src/sys/lib/kmalloc.c index b6a1d12..c5db93a 100644 --- a/src/sys/lib/kmalloc.c +++ b/src/sys/lib/kmalloc.c @@ -84,10 +84,8 @@ return(tmpDesc); } - kprintf("boo"); if ((emptyKernDesc = (struct memDescriptor *)vmm_getFreeMallocPage(4)) == 0x0) kpanic("Error: vmmGetFreeKernelPage returned NULL\n"); - kprintf("yet?"); /* zero out the memory so we know there is no garbage */ memset(emptyKernDesc,0x0,0x4000); @@ -393,6 +391,9 @@ /*** $Log$ + Revision 1.1.1.1 2006/06/01 12:46:16 reddawg + ubix2 + Revision 1.4 2006/06/01 12:42:09 reddawg Getting back to the basics diff --git a/src/sys/pci/hd.c b/src/sys/pci/hd.c index 523b66d..f2d069f 100644 --- a/src/sys/pci/hd.c +++ b/src/sys/pci/hd.c @@ -68,6 +68,8 @@ data = (char *)kmalloc(512); d = (struct dos_partition *)(data + 0x1BE); + + kprintf("WOO"); if (device_add(0,'c',devInfo) == 0x0) { kprintf("Adding Drive (ad0), Start: [0x0], Size: [0x%x/0x%X]\n",hdd->hdSize,hdd->hdSize*512); @@ -316,6 +318,9 @@ /*** $Log$ + Revision 1.1.1.1 2006/06/01 12:46:16 reddawg + ubix2 + Revision 1.2 2005/10/12 00:13:37 reddawg Removed