diff --git a/src/sys/fs/ufs/ufs.c b/src/sys/fs/ufs/ufs.c index 7b2c29b..774eb77 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 SuperBlock: [0x%X][%i - %i]\n", fs->fs_magic, sblock_try[n], sblock_try[n] / DEV_BSIZE); + kprintf("Finding SBlock: [0x%X][%i - %i]\n", 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/include/pci/hd.h b/src/sys/include/pci/hd.h index b0970c3..7c3dca5 100644 --- a/src/sys/include/pci/hd.h +++ b/src/sys/include/pci/hd.h @@ -173,7 +173,7 @@ char hdFlags; char hdShift; long hdMask; - long hdMulti; + u_int32_t hdMulti; long hdPort; long hdSize; long hdCalc; diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 06e57e4..bbff067 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, 0x2, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { + if ( vfs_mount( 0x1, 0x3, 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 dd9e047..2d9a982 100644 --- a/src/sys/pci/hd.c +++ b/src/sys/pci/hd.c @@ -408,6 +408,8 @@ //startSector += hdd->parOffset; startSector += hdd->lba_start; +kprintf("SS: [0x%X]", startSector); + if ( hdd->hdEnable == 0x0 ) { kprintf( "Invalid Drive\n" ); return(1); @@ -457,6 +459,7 @@ return(1); go: for ( counter = 0; counter < (hdd->hdCalc << 8); counter++ ) { tmp[counter] = inportWord( hdd->hdPort + hdData ); +//kprintf("[0x%X]", tmp[counter]); } tmp += (counter + 0); startSector += hdd->hdCalc;