iresolve constatnt to name combination, itsn't it more clear?
authormickey <mickey@openbsd.org>
Mon, 9 Sep 1996 05:29:16 +0000 (05:29 +0000)
committermickey <mickey@openbsd.org>
Mon, 9 Sep 1996 05:29:16 +0000 (05:29 +0000)
sys/dev/isa/wdc.c

index 1e141db..0c4f1e2 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: wdc.c,v 1.6 1996/09/04 00:51:15 downsj Exp $  */
+/*     $OpenBSD: wdc.c,v 1.7 1996/09/09 05:29:16 mickey Exp $  */
 /*     $NetBSD: wd.c,v 1.150 1996/05/12 23:54:03 mycroft Exp $ */
 
 /*
@@ -590,7 +590,7 @@ wdc_atapi_start(wdc, xfer)
                wdc->sc_flags |= WDCF_IRQ_WAIT;
                return;
        }
-       if ((acp->flags & 0x0300) != ACAP_DRQ_INTR) {
+       if ((acp->flags & (ACAP_DRQ_INTR|ACAP_DRQ_ACCEL)) != ACAP_DRQ_INTR) {
                int i, phase;
                for (i=20000; i>0; --i) {
                        phase = (bus_io_read_1(bc, ioh, wd_ireason) &
@@ -603,6 +603,7 @@ wdc_atapi_start(wdc, xfer)
                }
                if (phase != PHASE_CMDOUT ) {
                        printf("wdc_atapi_start: timout waiting PHASE_CMDOUT");
+                       printf("(0x%x)\n", phase);
                        acp->status = ERROR;
                        wdc_atapi_done(wdc, xfer);
                        return;