[src/netbsd-3]: src/sys/dev/pci Pull up revision 1.18 (requested by bouyer in...

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

details:   https://anonhg.NetBSD.org/src/rev/2f10319dff9c
branches:  netbsd-3
changeset: 577000:2f10319dff9c
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Aug 18 20:07:26 2005 +0000

description:
Pull up revision 1.18 (requested by bouyer in ticket #653):
To disable a channel we need to clear bit 2 or 3, not all other bits but
bit 2 or 3. Thanks to Takeshi Nakayama for catching it.
(With this mistake the code was still working for the first channel, because
the reset of the second channel would disable/enable the first one).

diffstat:

 sys/dev/pci/aceride.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 0bc08c5a2f99 -r 2f10319dff9c sys/dev/pci/aceride.c
--- a/sys/dev/pci/aceride.c     Thu Aug 18 20:05:41 2005 +0000
+++ b/sys/dev/pci/aceride.c     Thu Aug 18 20:07:26 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: aceride.c,v 1.14.2.2 2005/08/18 20:05:41 tron Exp $    */
+/*     $NetBSD: aceride.c,v 1.14.2.3 2005/08/18 20:07:26 tron Exp $    */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -217,7 +217,7 @@
        reg = pciide_pci_read(acer_sc->pcib_pa.pa_pc, acer_sc->pcib_pa.pa_tag,
            ACER_PCIB_CTRL);
        pciide_pci_write(acer_sc->pcib_pa.pa_pc, acer_sc->pcib_pa.pa_tag,
-           ACER_PCIB_CTRL, reg & ACER_PCIB_CTRL_ENCHAN(chp->ch_channel));
+           ACER_PCIB_CTRL, reg & ~ACER_PCIB_CTRL_ENCHAN(chp->ch_channel));
        delay(1000);
        pciide_pci_write(acer_sc->pcib_pa.pa_pc, acer_sc->pcib_pa.pa_tag,
            ACER_PCIB_CTRL, reg);