Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/ic In pcic_chip_socket_enable() we need to set "reg"...



details:   https://anonhg.NetBSD.org/src/rev/ed47eb3abc35
branches:  trunk
changeset: 538511:ed47eb3abc35
user:      simonb <simonb%NetBSD.org@localhost>
date:      Tue Oct 22 02:12:42 2002 +0000

description:
In pcic_chip_socket_enable() we need to set "reg" ifdef PCICDEBUG as
well so we can print it out a little further on.
While here, remove an unreachable "return" statement.

diffstat:

 sys/dev/ic/i82365.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r 99c0b8fef52a -r ed47eb3abc35 sys/dev/ic/i82365.c
--- a/sys/dev/ic/i82365.c       Tue Oct 22 01:25:28 2002 +0000
+++ b/sys/dev/ic/i82365.c       Tue Oct 22 02:12:42 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365.c,v 1.67 2002/09/27 03:18:11 thorpej Exp $      */
+/*     $NetBSD: i82365.c,v 1.68 2002/10/22 02:12:42 simonb Exp $       */
 
 /*
  * Copyright (c) 2000 Christian E. Hopps.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.67 2002/09/27 03:18:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82365.c,v 1.68 2002/10/22 02:12:42 simonb Exp $");
 
 #define        PCICDEBUG
 
@@ -145,8 +145,6 @@
                return (PCIC_VENDOR_I82365SLR0);
        else
                return (PCIC_VENDOR_I82365SLR1);
-
-       return (PCIC_VENDOR_UNKNOWN);
 }
 
 char *
@@ -1430,8 +1428,10 @@
        /* wait 20ms as per pc card standard (r2.01) section 4.3.6 */
        pcic_delay(h, 20, "pccen2");
 
+#if defined(DIAGNOSTIC) || defined(PCICDEBUG)
+       reg = pcic_read(h, PCIC_IF_STATUS);
+#endif
 #ifdef DIAGNOSTIC
-       reg = pcic_read(h, PCIC_IF_STATUS);
        if (!(reg & PCIC_IF_STATUS_POWERACTIVE)) {
                printf("pcic_chip_socket_enable: status %x\n", reg);
        }



Home | Main Index | Thread Index | Old Index