[src/netbsd-1-4]: src/sys/dev/pci pullup 1.36->1.37 (bouyer)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/994b2a838e27
branches:  netbsd-1-4
changeset: 468657:994b2a838e27
user:      perry <perry%NetBSD.org@localhost>
date:      Wed May 05 17:13:24 1999 +0000

description:
pullup 1.36->1.37 (bouyer)

diffstat:

 sys/dev/pci/pciide.c |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 17d1c71dff6c -r 994b2a838e27 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Wed May 05 17:08:32 1999 +0000
+++ b/sys/dev/pci/pciide.c      Wed May 05 17:13:24 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.33.2.2 1999/04/28 14:18:10 perry Exp $    */
+/*     $NetBSD: pciide.c,v 1.33.2.3 1999/05/05 17:13:24 perry Exp $    */
 
 /*
  * Copyright (c) 1996, 1998 Christopher G. Demetriou.  All rights reserved.
@@ -1680,18 +1680,24 @@
                        if (drvp->PIO_mode <= (drvp->DMA_mode +2))
                                mode = drvp->PIO_mode;
                        else
-                               mode = drvp->DMA_mode;
+                               mode = drvp->DMA_mode + 2;
                }
                idedma_ctl |= IDEDMA_CTL_DRV_DMA(drive);
 
 pio:           /* setup PIO mode */
+               if (mode <= 2) {
+                       drvp->DMA_mode = 0;
+                       drvp->PIO_mode = 0;
+                       mode = 0;
+               } else {
+                       drvp->PIO_mode = mode;
+                       drvp->DMA_mode = mode - 2;
+               }
                datatim_reg |=
                    APO_DATATIM_PULSE(chp->channel, drive,
                        apollo_pio_set[mode]) |
                    APO_DATATIM_RECOV(chp->channel, drive,
                        apollo_pio_rec[mode]);
-               drvp->PIO_mode = mode;
-               drvp->DMA_mode = mode - 2;
        }
        if (idedma_ctl != 0) {
                /* Add software bits in status register */