diff options
| author | sos <sos@FreeBSD.org> | 2004-06-11 07:39:15 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2004-06-11 07:39:15 +0000 |
| commit | f7faebf7e4acd8a6fdd62855dcdfd8148558ba69 (patch) | |
| tree | 8ac10161aabbcd96b46fcb90e06e2e8e00df93ad | |
| parent | e503e659296711ddcc9e1fa853b6febb1fdf583f (diff) | |
| download | FreeBSD-src-f7faebf7e4acd8a6fdd62855dcdfd8148558ba69.zip FreeBSD-src-f7faebf7e4acd8a6fdd62855dcdfd8148558ba69.tar.gz | |
Back out the last change as that broke some SATA devices.
Now we are cleaing up remove a few lines of unused code.
| -rw-r--r-- | sys/dev/ata/ata-lowlevel.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/ata/ata-lowlevel.c b/sys/dev/ata/ata-lowlevel.c index 07c92c6..d3dbb7c 100644 --- a/sys/dev/ata/ata-lowlevel.c +++ b/sys/dev/ata/ata-lowlevel.c @@ -532,7 +532,7 @@ ata_generic_reset(struct ata_channel *ch) ATA_IDX_OUTB(ch, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); DELAY(10); ostat0 = ATA_IDX_INB(ch, ATA_STATUS); - if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5 && ostat0 != 0x7f) { + if ((ostat0 & 0xf8) != 0xf8 && ostat0 != 0xa5) { stat0 = ATA_S_BUSY; mask |= 0x01; } @@ -543,7 +543,7 @@ ata_generic_reset(struct ata_channel *ch) /* in some setups we dont want to test for a slave */ if (!(ch->flags & ATA_NO_SLAVE)) { - if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5 && ostat1 != 0x7f) { + if ((ostat1 & 0xf8) != 0xf8 && ostat1 != 0xa5) { stat1 = ATA_S_BUSY; mask |= 0x02; } @@ -637,15 +637,10 @@ ata_generic_reset(struct ata_channel *ch) DELAY(100000); } - if (stat0 & ATA_S_BUSY) - mask &= ~0x01; - if (stat1 & ATA_S_BUSY) - mask &= ~0x02; - if (bootverbose) ata_printf(ch, -1, - "reset tp2 mask=%02x stat0=%02x stat1=%02x devices=0x%b\n", - mask, stat0, stat1, ch->devices, + "reset tp2 stat0=%02x stat1=%02x devices=0x%b\n", + stat0, stat1, ch->devices, "\20\4ATAPI_SLAVE\3ATAPI_MASTER\2ATA_SLAVE\1ATA_MASTER"); } |
