diff --git a/src/sys/boot/boot2/test.c b/src/sys/boot/boot2/test.c index 430775d..10a68d6 100644 --- a/src/sys/boot/boot2/test.c +++ b/src/sys/boot/boot2/test.c @@ -11,7 +11,7 @@ d->magicNum2 = UBIXDISKMAGIC; d->numPartitions = 2; d->partitions[0].p_size = 2000; - d->partitions[0].p_offset = 200; + d->partitions[0].p_offset = 50; d->partitions[0].p_fstype = 0xAD; d->partitions[0].p_bsize = 0x8; d->partitions[1].p_size = 2000; diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 4389416..465eb1c 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.10 2004/04/29 15:32:58 reddawg + I forgot i changed mount format + Revision 1.9 2004/04/29 15:29:20 reddawg Fixed All Running Issues @@ -180,10 +183,10 @@ kprintf("Free Pages: [%i]\n",freePages); kprintf("MemoryMap: [0x%X]\n",vmmMemoryMap); kprintf("Starting Os\n"); - netInit(); + //netInit(); execThread(idleTask,(uInt32)(kmalloc(0x2000,sysID)+0x2000),0x0,"Idle Thread"); - //execFile("init@sys",0x0,0x0,0x0); - execFile("shell@sys",0x0,0x0,0x0); + execFile("init@sys",0x0,0x0,0x0); + //execFile("shell@sys",0x0,0x0,0x0); irqEnable(0x0); sched(); return(0x0); diff --git a/src/sys/ubixfs/ubixfs.c b/src/sys/ubixfs/ubixfs.c index d216388..fee90c1 100644 --- a/src/sys/ubixfs/ubixfs.c +++ b/src/sys/ubixfs/ubixfs.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.4 2004/04/28 21:10:40 reddawg + Lots Of changes to make it work with existing os + Revision 1.3 2004/04/28 13:33:09 reddawg Overhaul to ubixfs and boot loader and MBR to work well with our schema now BAT and dir and file entries are all offset 64Sectors from the start of the partition @@ -73,7 +76,7 @@ struct ubixFsInfo *fsInfo = 0x0; mp->fsInfo = (struct ubixFsInfo *)kmalloc(sizeof(struct ubixFsInfo),sysID); fsInfo = mp->fsInfo; - mp->diskLabel->partitions[mp->partition].pOffset -= 63; + //mp->diskLabel->partitions[mp->partition].pOffset -= 63; if ((mp->diskLabel->magicNum == UBIXDISKMAGIC) && (mp->diskLabel->magicNum2 == UBIXDISKMAGIC)) { fsInfo->blockAllocationTable = (struct blockAllocationTableEntry *)kmalloc(mp->diskLabel->partitions[mp->partition].pBatSize*512,-2); /* fsInfo->blockAllocationTable[0].nextBlock = 100; */ diff --git a/src/sys/vfs/mount.c b/src/sys/vfs/mount.c index 64c2502..f252d04 100644 --- a/src/sys/vfs/mount.c +++ b/src/sys/vfs/mount.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.3 2004/04/28 21:10:40 reddawg + Lots Of changes to make it work with existing os + Revision 1.2 2004/04/28 02:22:55 reddawg This is a fiarly large commit but we are starting to use new driver model all around @@ -77,6 +80,7 @@ if (device != 0x0) { mp->diskLabel = (struct ubixDiskLabel *)kmalloc(512,sysID); mp->device->read(mp->device->info,mp->diskLabel,1,1); + kprintf("READING SECTOR"); } if (mp->fs == 0x0) {