summaryrefslogtreecommitdiff
path: root/sys/dev/ata
diff options
context:
space:
mode:
authorAlexander Yurchenko <grange@cvs.openbsd.org>2003-04-12 10:58:46 +0000
committerAlexander Yurchenko <grange@cvs.openbsd.org>2003-04-12 10:58:46 +0000
commit00f5443187c42597e37957ad5965fa1c3ed6776c (patch)
tree8c3551a17717250156abe195231f2c5d323a216e /sys/dev/ata
parent2980b4afd9fb8ba689340230daf4922c64181fdd (diff)
Don't wait for DRQ after issuing IDENTIFY command. Fix long detecting
of atapi devices. Problem reported by Nicolas Baldi <nib1@cs.pitt.edu>, diff from costa@.
Diffstat (limited to 'sys/dev/ata')
-rw-r--r--sys/dev/ata/ata.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/ata.c b/sys/dev/ata/ata.c
index ef1a23776f1..22d9a9b7d83 100644
--- a/sys/dev/ata/ata.c
+++ b/sys/dev/ata/ata.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ata.c,v 1.17 2003/04/09 00:38:07 ho Exp $ */
+/* $OpenBSD: ata.c,v 1.18 2003/04/12 10:58:45 grange Exp $ */
/* $NetBSD: ata.c,v 1.9 1999/04/15 09:41:09 bouyer Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -81,12 +81,12 @@ ata_get_params(drvp, flags, prms)
if (drvp->drive_flags & DRIVE_ATA) {
wdc_c.r_command = WDCC_IDENTIFY;
wdc_c.r_st_bmask = WDCS_DRDY;
- wdc_c.r_st_pmask = WDCS_DRQ;
+ wdc_c.r_st_pmask = 0;
wdc_c.timeout = 3000; /* 3s */
} else if (drvp->drive_flags & DRIVE_ATAPI) {
wdc_c.r_command = ATAPI_IDENTIFY_DEVICE;
wdc_c.r_st_bmask = 0;
- wdc_c.r_st_pmask = WDCS_DRQ;
+ wdc_c.r_st_pmask = 0;
wdc_c.timeout = 10000; /* 10s */
} else {
return CMD_ERR;