d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a buglet that caused slaves to be nondetected.

Browse Source
This commit is contained in:
Søren Schmidt 2005-04-03 13:03:53 +00:00
parent bcc8f66c8b
commit fa13a39e3c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/ata/ata-lowlevel.c
View File

@ -690,7 +690,8 @@ ata_generic_reset(struct ata_channel *ch)
}
}
if ((mask & 0x02) && (stat1 & ATA_S_BUSY)) {
if ((mask & 0x02) && (stat1 & ATA_S_BUSY) &&
!((mask & 0x01) && (stat0 & ATA_S_BUSY))) {
ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_SLAVE);
DELAY(10);
err = ATA_IDX_INB(ch, ATA_ERROR);
@ -712,8 +713,8 @@ ata_generic_reset(struct ata_channel *ch)
ch->devices |= ATA_ATA_SLAVE;
}
}
else if ((stat0 & 0x0f) && err == lsb && err == msb) {
stat0 |= ATA_S_BUSY;
else if ((stat1 & 0x0f) && err == lsb && err == msb) {
stat1 |= ATA_S_BUSY;
}
}
}