diff --git a/src/sys/fs/ufs/ufs.c b/src/sys/fs/ufs/ufs.c index 7903538..4b53781 100644 --- a/src/sys/fs/ufs/ufs.c +++ b/src/sys/fs/ufs/ufs.c @@ -117,7 +117,7 @@ fs->fs_bsize <= MAXBSIZE && fs->fs_bsize >= sizeof(struct fs)) break; -kprintf("Finding SuperBlock: [%i - %i]\n",sblock_try[n], sblock_try[n] / DEV_BSIZE); +kprintf("Finding SBlock: [%i - %i]\n",sblock_try[n], sblock_try[n] / DEV_BSIZE); } if (sblock_try[n] == -1) { kprintf("Not ufs\n"); diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 2fc2a2f..06e57e4 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -114,9 +114,9 @@ /* New Root Mount Point */ //Old 2 new 10 - kprintf( "[0xX][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 ) ); + 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, 0x1, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { + if ( vfs_mount( 0x1, 0x2, 0x0, 0xAA, "sys", "rw" ) != 0x0 ) { kprintf( "Problem Mounting sys Mount Point\n" ); } else @@ -147,7 +147,7 @@ execThread( systemTask, (uInt32) sysTask + 0x2000, 0x0 ); kprintf( "Thread Start!\n" ); - //MrOlsen execFile( "sys:/bin/init", 0x0, 0x0, 0x0 ); /* OS Initializer */ + execFile( "sys:/bin/init", 0x0, 0x0, 0x0 ); /* OS Initializer */ //execFile( "sys:/bin/login", 0x0, 0x0, 0x0 ); /* OS Initializer */ irqEnable( 0x0 ); diff --git a/src/sys/pci/hd.c b/src/sys/pci/hd.c index 74331a5..dd9e047 100644 --- a/src/sys/pci/hd.c +++ b/src/sys/pci/hd.c @@ -204,9 +204,9 @@ } int hdInit( struct device_node *dev ) { - char retVal = 0x0; + uInt8 retVal = 0x0; long counter = 0x0; - short *tmp = 0x0; + uInt16 *tmp = 0x0; struct driveInfo *hdd = dev->devInfo->info; for ( counter = 1000000; counter >= 0; counter-- ) { @@ -241,11 +241,10 @@ go: - tmp = (short *) hdd->ata_identify; + tmp = (uInt16 *) hdd->ata_identify; for ( counter = 0; counter < 256; counter++ ) { tmp[counter] = inportWord( hdd->hdPort + ATA_DATA ); -kprintf("[%i]", tmp[counter]); } retVal = tmp[0x2F] & 0xFF; @@ -279,8 +278,12 @@ hdd->hdShift = 6; hdd->hdMulti = retVal; break; + case 128: + hdd->hdShift = 7; + hdd->hdMulti = retVal; + break; default: - kprintf( "Error BLOCK Mode Unavailable: [%i]\n", retVal ); + kprintf( "Error BLOCK Mode Unavailable: [%x]\n", retVal ); return (1); }