[src/netbsd-1-5]: src/sys/dev/pci Pull up revisions 1.47, 1.49 (requested by h...

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

details:   https://anonhg.NetBSD.org/src/rev/648441c75918
branches:  netbsd-1-5
changeset: 490357:648441c75918
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 15 00:22:39 2000 +0000

description:
Pull up revisions 1.47,1.49 (requested by haya):
  Turn off power on shutdown, except on ToPIC (TI 113X) bridges on
  shutdown to avoid hangs on some systems.

diffstat:

 sys/dev/pci/pccbb.c |  14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r c99be8dac33b -r 648441c75918 sys/dev/pci/pccbb.c
--- a/sys/dev/pci/pccbb.c       Fri Dec 15 00:15:01 2000 +0000
+++ b/sys/dev/pci/pccbb.c       Fri Dec 15 00:22:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pccbb.c,v 1.42.2.2 2000/09/08 00:43:56 haya Exp $      */
+/*     $NetBSD: pccbb.c,v 1.42.2.3 2000/12/15 00:22:39 he Exp $        */
 
 /*
  * Copyright (c) 1998, 1999 and 2000
@@ -364,6 +364,18 @@
        pcireg_t command;
 
        DPRINTF(("%s: shutdown\n", sc->sc_dev.dv_xname));
+
+       /*
+        * turn off power
+        *
+        * XXX - do not turn off power if chipset is TI 113X because
+        * only TI 1130 with PowerMac 2400 hangs in pccbb_power().
+        */
+       if (sc->sc_chipset != CB_TI113X) {
+               pccbb_power((cardbus_chipset_tag_t)sc,
+                   CARDBUS_VCC_0V | CARDBUS_VPP_0V);
+       }
+
        bus_space_write_4(sc->sc_base_memt, sc->sc_base_memh, CB_SOCKET_MASK,
            0);