[src/netbsd-1-5]: src/sys/dev/pci Sync with NetBSD-current (pull up approved ...

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

details:   https://anonhg.NetBSD.org/src/rev/7e10fedb8833
branches:  netbsd-1-5
changeset: 488534:7e10fedb8833
user:      tron <tron%NetBSD.org@localhost>
date:      Sat Jul 15 19:47:04 2000 +0000

description:
Sync with NetBSD-current (pull up approved by thorpej):

syssrc/sys/dev/pci/if_epic_pci.c, 1.9
syssrc/sys/dev/pci/if_tlp_pci.c, 1.41

Improve kernel message when card is in power state D3. Instead of...

epic0 at pci0 dev 11 function 0 epic0: unable to wake up from ...

... print this:

epic0 at pci0 dev 11 function 0: unable to wake up from power state D3

diffstat:

 sys/dev/pci/if_epic_pci.c |  9 ++++-----
 sys/dev/pci/if_tlp_pci.c  |  9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (52 lines):

diff -r dd9c0cbed56b -r 7e10fedb8833 sys/dev/pci/if_epic_pci.c
--- a/sys/dev/pci/if_epic_pci.c Sat Jul 15 17:05:25 2000 +0000
+++ b/sys/dev/pci/if_epic_pci.c Sat Jul 15 19:47:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_epic_pci.c,v 1.7.12.1 2000/07/14 22:05:34 tron Exp $        */
+/*     $NetBSD: if_epic_pci.c,v 1.7.12.2 2000/07/15 19:47:04 tron Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -173,13 +173,12 @@
                         * The card has lost all configuration data in
                         * this state, so punt.
                         */
-                       printf("%s: unable to wake up from power state D3\n",
-                           sc->sc_dev.dv_xname);
+                       printf(": unable to wake up from power state D3\n");
                        return;
                }
                if (reg != 0) {
-                       printf("%s: waking up from power state D%d\n",
-                           sc->sc_dev.dv_xname, reg);
+                       printf(": waking up from power state D%d\n%s: ",
+                           reg, sc->sc_dev.dv_xname);
                        pci_conf_write(pc, pa->pa_tag, pmreg + 4, 0);
                }
        }
diff -r dd9c0cbed56b -r 7e10fedb8833 sys/dev/pci/if_tlp_pci.c
--- a/sys/dev/pci/if_tlp_pci.c  Sat Jul 15 17:05:25 2000 +0000
+++ b/sys/dev/pci/if_tlp_pci.c  Sat Jul 15 19:47:04 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_tlp_pci.c,v 1.39.2.1 2000/06/25 20:23:36 sommerfeld Exp $   */
+/*     $NetBSD: if_tlp_pci.c,v 1.39.2.2 2000/07/15 19:47:05 tron Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -488,13 +488,12 @@
                         * The card has lost all configuration data in
                         * this state, so punt.
                         */
-                       printf("%s: unable to wake up from power state D3\n",
-                           sc->sc_dev.dv_xname);
+                       printf(": unable to wake up from power state D3\n");
                        return;
                }
                if (reg != 0) {
-                       printf("%s: waking up from power state D%d\n",
-                           sc->sc_dev.dv_xname, reg);
+                       printf(": waking up from power state D%d\n%s: ",
+                           reg, sc->sc_dev.dv_xname);
                        pci_conf_write(pc, pa->pa_tag, pmreg + 4, 0);
                }
        }