[src/netbsd-1-5]: src/sys/dev/pci Pull up revision 1.110 (requested by bouyer):

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

details:   https://anonhg.NetBSD.org/src/rev/be0795e61b6c
branches:  netbsd-1-5
changeset: 491360:be0795e61b6c
user:      he <he%NetBSD.org@localhost>
date:      Tue Apr 24 23:05:30 2001 +0000

description:
Pull up revision 1.110 (requested by bouyer):
  Revert setting of PDC2xx_SCR for Promise Ultra/100, it seems to
  break with some adapters.

diffstat:

 sys/dev/pci/pciide.c |  8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diffs (22 lines):

diff -r 501cf86f4c0c -r be0795e61b6c sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Tue Apr 24 23:02:58 2001 +0000
+++ b/sys/dev/pci/pciide.c      Tue Apr 24 23:05:30 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.68.2.22 2001/03/13 21:23:35 he Exp $      */
+/*     $NetBSD: pciide.c,v 1.68.2.23 2001/04/24 23:05:30 he Exp $      */
 
 
 /*
@@ -3243,11 +3243,7 @@
        }
 
        mode = PDC2xx_SCR_DMA;
-       if (PDC_IS_265(sc)) {
-               /* the BIOS set it up this way */
-               mode = PDC2xx_SCR_SET_GEN(mode, 0x3);
-               mode |= 0x80000000;
-       } else if (PDC_IS_262(sc)) {
+       if (PDC_IS_262(sc)) {
                mode = PDC2xx_SCR_SET_GEN(mode, PDC262_SCR_GEN_LAT);
        } else {
                /* the BIOS set it up this way */