Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/ic Disable all windows at boot time, to avoid confli...



details:   https://anonhg.NetBSD.org/src/rev/99c803266924
branches:  trunk
changeset: 482913:99c803266924
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Fri Feb 25 05:26:17 2000 +0000

description:
Disable all windows at boot time, to avoid conflicts when reading the CIS.
Also, GC a small bit of code that's inaccesible after the previous change.

diffstat:

 sys/dev/ic/i82365.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r cda81e6d21ad -r 99c803266924 sys/dev/ic/i82365.c
--- a/sys/dev/ic/i82365.c       Fri Feb 25 05:13:05 2000 +0000
+++ b/sys/dev/ic/i82365.c       Fri Feb 25 05:26:17 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365.c,v 1.50 2000/02/25 04:24:37 mycroft Exp $      */
+/*     $NetBSD: i82365.c,v 1.51 2000/02/25 05:26:17 mycroft Exp $      */
 
 #define        PCICDEBUG
 
@@ -347,8 +347,7 @@
        int i;
 
        for (i = 0; i < PCIC_NSLOTS; i++)
-               if ((sc->handle[i].flags & PCIC_FLAG_SOCKETP) &&
-                   sc->handle[i].pcmcia != NULL)
+               if (sc->handle[i].flags & PCIC_FLAG_SOCKETP)
                        pcic_attach_socket_finish(&sc->handle[i]);
 }
 
@@ -365,6 +364,10 @@
 
        DPRINTF(("%s: attach finish socket %ld\n", h->ph_parent->dv_xname,
            (long) (h - &sc->handle[0])));
+
+       /* zero out the address windows */
+       pcic_write(h, PCIC_ADDRWIN_ENABLE, 0);
+
        /*
         * Set up a powerhook to ensure it continues to interrupt on
         * card detect even after suspend.



Home | Main Index | Thread Index | Old Index