i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added more debug output, read device error register after a reset

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23305 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2008-01-09 12:39:03 +00:00
parent d51474999c
commit f017b372bd
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/ata/basic_protocol.c
+13 -10
View File
@@ -87,17 +87,20 @@ reset_bus(ide_bus_info *bus, bool *devicePresent0, uint32 *sigDev0, bool *device
// wait up to 31 seconds for busy to clear, abort when error is set // wait up to 31 seconds for busy to clear, abort when error is set
status = ata_wait(bus, 0, ide_status_bsy, false, 31000000); status = ata_wait(bus, 0, ide_status_bsy, false, 31000000);
if (status != B_OK) { if (status != B_OK) {
if (status == B_TIMED_OUT) dprintf("ATA: reset_bus: timeout\n");
dprintf("ATA: reset_bus: timeout\n");
else
dprintf("ATA: reset_bus: error bit set\n");
goto error; goto error;
} }
if (controller->read_command_block_regs(channel, &tf, ide_mask_sector_count | if (controller->read_command_block_regs(channel, &tf, ide_mask_sector_count |
ide_mask_LBA_low | ide_mask_LBA_mid | ide_mask_LBA_high) != B_OK) ide_mask_LBA_low | ide_mask_LBA_mid | ide_mask_LBA_high | ide_mask_error) != B_OK)
goto error; goto error;
if (tf.read.error != 0x01 && tf.read.error != 0x81)
dprintf("ATA: device 0 failed, error code is 0x%02\n", tf.read.error);
if (tf.read.error >= 0x80)
dprintf("ATA: device 0 indicates that device 1 failed, error code is 0x%02\n", tf.read.error);
*sigDev0 = tf.lba.sector_count; *sigDev0 = tf.lba.sector_count;
*sigDev0 |= ((uint32)tf.lba.lba_0_7) << 8; *sigDev0 |= ((uint32)tf.lba.lba_0_7) << 8;
*sigDev0 |= ((uint32)tf.lba.lba_8_15) << 16; *sigDev0 |= ((uint32)tf.lba.lba_8_15) << 16;
@@ -114,17 +117,17 @@ reset_bus(ide_bus_info *bus, bool *devicePresent0, uint32 *sigDev0, bool *device
// wait up to 31 seconds for busy to clear, abort when error is set // wait up to 31 seconds for busy to clear, abort when error is set
status = ata_wait(bus, 0, ide_status_bsy, false, 31000000); status = ata_wait(bus, 0, ide_status_bsy, false, 31000000);
if (status != B_OK) { if (status != B_OK) {
if (status == B_TIMED_OUT) dprintf("ATA: reset_bus: timeout\n");
dprintf("ATA: reset_bus: timeout\n");
else
dprintf("ATA: reset_bus: error bit set\n");
goto error; goto error;
} }
if (controller->read_command_block_regs(channel, &tf, ide_mask_sector_count | if (controller->read_command_block_regs(channel, &tf, ide_mask_sector_count |
ide_mask_LBA_low | ide_mask_LBA_mid | ide_mask_LBA_high) != B_OK) ide_mask_LBA_low | ide_mask_LBA_mid | ide_mask_LBA_high | ide_mask_error) != B_OK)
goto error; goto error;
if (tf.read.error != 0x01)
dprintf("ATA: device 1 failed, error code is 0x%02\n", tf.read.error);
*sigDev1 = tf.lba.sector_count; *sigDev1 = tf.lba.sector_count;
*sigDev1 |= ((uint32)tf.lba.lba_0_7) << 8; *sigDev1 |= ((uint32)tf.lba.lba_0_7) << 8;
*sigDev1 |= ((uint32)tf.lba.lba_8_15) << 16; *sigDev1 |= ((uint32)tf.lba.lba_8_15) << 16;