diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-11-02 01:43:41 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1999-11-02 01:43:41 +0000 |
| commit | 4cdfef30e489d83364e0f770d27372c952aeeed1 (patch) | |
| tree | 64b5566f8fe35faef4a1bba76a4e17353185e3a7 | |
| parent | dc4c5a669456a3922a9b08f85e3b7a7ac8fa6123 (diff) | |
re-enable IDENTIFY, reset delay each time
| -rw-r--r-- | sys/dev/atapiscsi/atapiscsi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c index 73813d6595c..eee046e0de5 100644 --- a/sys/dev/atapiscsi/atapiscsi.c +++ b/sys/dev/atapiscsi/atapiscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: atapiscsi.c,v 1.17 1999/10/29 22:00:31 csapuntz Exp $ */ +/* $OpenBSD: atapiscsi.c,v 1.18 1999/11/02 01:43:40 deraadt Exp $ */ /* * This code is derived from code with the copyright below. @@ -980,10 +980,11 @@ wdc_atapi_ctrl(chp, xfer, irq) struct scsi_xfer *sc_xfer = xfer->cmd; struct ata_drive_datas *drvp = &chp->ch_drive[xfer->drive]; char *errstring = NULL; - int delay = (irq == 0) ? ATAPI_DELAY : 1; + int delay; /* Ack interrupt done in wait_for_unbusy */ again: + delay = (xfer->c_flags & C_POLL) ? 4000 : ((irq == 0) ? ATAPI_DELAY : 1); WDCDEBUG_PRINT(("wdc_atapi_ctrl %s:%d:%d state %d\n", chp->wdc->sc_dev.dv_xname, chp->channel, drvp->drive, drvp->state), DEBUG_INTR | DEBUG_FUNCS); @@ -1004,7 +1005,7 @@ again: is about the most innocuous thing you can do that's guaranteed to be there */ case IDENTIFY: -#if 0 +#if 1 wdccommandshort(chp, drvp->drive, ATAPI_IDENTIFY_DEVICE); drvp->state = IDENTIFY_WAIT; break; |