From d8476b0b3a98c07cfecddde730526a6b4ec85f06 Mon Sep 17 00:00:00 2001 From: sos Date: Wed, 3 Oct 2001 08:25:11 +0000 Subject: [PATCH] Hopefully fix the identify failed on ATAPI slaves on some notebooks. --- sys/dev/ata/ata-all.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 1aac35506a59..da275d4860f7 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -460,11 +460,13 @@ ata_getparam(struct ata_softc *scp, int device, u_int8_t command) /* apparently some devices needs this repeated */ do { if (ata_command(scp, device, command, 0, 0, 0, 0, 0, ATA_WAIT_INTR)) { - ata_printf(scp, device, "identify failed\n"); + ata_printf(scp, device, "%s identify failed\n", + command == ATA_C_ATAPI_IDENTIFY ? "ATAPI" : "ATA"); return -1; } if (retry++ > 4) { - ata_printf(scp, device, "identify retries exceeded\n"); + ata_printf(scp, device, "%s identify retries exceeded\n", + command == ATA_C_ATAPI_IDENTIFY ? "ATAPI" : "ATA"); return -1; } } while (ata_wait(scp, device, @@ -711,6 +713,8 @@ ata_reset(struct ata_softc *scp) mask, ostat0, ostat1); /* reset channel */ + ATA_OUTB(scp->r_io, ATA_DRIVE, ATA_D_IBM | ATA_MASTER); + DELAY(10); ATA_OUTB(scp->r_altio, ATA_ALTSTAT, ATA_A_IDS | ATA_A_RESET); DELAY(10000); ATA_OUTB(scp->r_altio, ATA_ALTSTAT, ATA_A_IDS); @@ -1066,6 +1070,7 @@ ata_free_name(struct ata_softc *scp, int device) { if (scp->dev_name[ATA_DEV(device)]) free(scp->dev_name[ATA_DEV(device)], M_ATA); + scp->dev_name[ATA_DEV(device)] = NULL; } int