diff --git a/src/sys/fs/ufs/ufs.c b/src/sys/fs/ufs/ufs.c index 774eb77..4a272e6 100644 --- a/src/sys/fs/ufs/ufs.c +++ b/src/sys/fs/ufs/ufs.c @@ -110,7 +110,7 @@ #endif ) && fs->fs_bsize <= MAXBSIZE && fs->fs_bsize >= sizeof(struct fs)) break; - kprintf("Finding SBlock: [0x%X][%i - %i]\n", fs->fs_magic, sblock_try[n], sblock_try[n] / DEV_BSIZE); + //MrOlsen 2017-12-14 this was for debugging kprintf("Finding SBlock: [%s][0x%X][%i - %i]\n", fs->fs_fsmnt, fs->fs_magic, sblock_try[n], sblock_try[n] / DEV_BSIZE); } if (sblock_try[n] == -1) { kprintf("Not ufs\n"); diff --git a/src/sys/i386/trap.c b/src/sys/i386/trap.c index ed17290..bca90e1 100644 --- a/src/sys/i386/trap.c +++ b/src/sys/i386/trap.c @@ -47,7 +47,7 @@ kpanic( "INT OFF! KERN" ); } - kprintf("trap_code: %i, EIP: 0x%X\n", frame->tf_trapno, frame->tf_eip); + kprintf("trap_code: %i(0x%X), EIP: 0x%X\n", frame->tf_trapno, frame->tf_trapno, frame->tf_eip); switch (trap_code) { case 0xC: @@ -59,8 +59,7 @@ } kprintf("GOTTA RETURN!\n"); - while(1) -; + //while(1); } /*** diff --git a/src/sys/init/main.c b/src/sys/init/main.c index bbff067..06e57e4 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -116,7 +116,7 @@ //Old 2 new 10 kprintf( "[0x%X][0x%X:0x%X:0x%X:0x%X:0x%X:0x%X]\n", B_ADAPTOR( rootdev ), B_CONTROLLER( rootdev ), B_SLICE( rootdev ), B_UNIT( rootdev ), B_PARTITION( rootdev ), B_TYPE( rootdev ) ); //if ( vfs_mount( 0x1, B_PARTITION(rootdev) + 2, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { - if ( vfs_mount( 0x1, 0x3, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { + if ( vfs_mount( 0x1, 0x2, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { kprintf( "Problem Mounting sys Mount Point\n" ); } else diff --git a/src/sys/pci/hd.c b/src/sys/pci/hd.c index 8aa5b1f..b3ab86e 100644 --- a/src/sys/pci/hd.c +++ b/src/sys/pci/hd.c @@ -343,7 +343,9 @@ long retVal = 0x0; short transactionCount = 0x0; short *tmp = (short *) baseAddr; - //startSector += hdd->parOffset; + if (hdd->lba_start == 0) + startSector += hdd->parOffset; + else startSector += hdd->lba_start; if (hdd->hdEnable == 0x0) { @@ -405,10 +407,16 @@ long retVal = 0x0; short transactionCount = 0x0; short *tmp = (short *) baseAddr; - //startSector += hdd->parOffset; - startSector += hdd->lba_start; + if (hdd->lba_start == 0) { + startSector += 0x3F + hdd->parOffset; + //kprintf("SS1: [0x%i][%i]", startSector, hdd->parOffset); + //MrOlsen OK I NEED TO GET lba_start configured to the correct offsets + } + else { + startSector += hdd->lba_start; + kprintf("SS2: [0x%i][%i]", startSector, hdd->lba_start); + } - kprintf("SS: [0x%X]", startSector); if (hdd->hdEnable == 0x0) { kprintf("Invalid Drive\n");