diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-06-21 07:55:27 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-06-21 07:55:27 +0000 |
| commit | 69244a0560051eaff2455bd3b8c217966e1e9813 (patch) | |
| tree | 1597ea112695250383084b3e301b95771f801893 /sys | |
| parent | 737d495c5170ffe959f6040ae2056c580831bb2f (diff) | |
make this more quiet on card insertion.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/sbus/stp4020.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sys/dev/sbus/stp4020.c b/sys/dev/sbus/stp4020.c index 97d5d206e3c..b8899480393 100644 --- a/sys/dev/sbus/stp4020.c +++ b/sys/dev/sbus/stp4020.c @@ -1,4 +1,4 @@ -/* $OpenBSD: stp4020.c,v 1.3 2002/06/20 02:43:23 deraadt Exp $ */ +/* $OpenBSD: stp4020.c,v 1.4 2002/06/21 07:55:26 fgsch Exp $ */ /* $NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $ */ /*- @@ -528,7 +528,7 @@ stp4020_statintr(arg) */ for (i = 0 ; i < STP4020_NSOCK; i++) { struct stp4020_socket *h; - int v, cd_change = 0; + int v; h = &sc->sc_socks[i]; @@ -552,7 +552,6 @@ stp4020_statintr(arg) /* * Card status change detect */ - cd_change = 1; r = 1; if ((v & (STP4020_ISR0_CD1ST|STP4020_ISR0_CD2ST)) == (STP4020_ISR0_CD1ST|STP4020_ISR0_CD2ST)) { @@ -574,18 +573,14 @@ stp4020_statintr(arg) /* informational messages */ if ((v & STP4020_ISR0_BVD1CHG) != 0) { - /* ignore if this is caused by insert or removal */ - if (!cd_change) - printf("stp4020[%d]: Battery change 1\n", - h->sock); + DPRINTF(("stp4020[%d]: Battery change 1\n", + h->sock)); r = 1; } if ((v & STP4020_ISR0_BVD2CHG) != 0) { - /* ignore if this is caused by insert or removal */ - if (!cd_change) - printf("stp4020[%d]: Battery change 2\n", - h->sock); + DPRINTF(("stp4020[%d]: Battery change 2\n", + h->sock)); r = 1; } @@ -852,7 +847,7 @@ stp4020_chip_socket_enable(pch) */ stp4020_delay((100 + 20) * 1000); - v |= STP4020_ICR1_PCIFOE|STP4020_ICR1_VPP1_VCC; + v |= STP4020_ICR1_PCIFOE | STP4020_ICR1_VPP1_VCC; stp4020_wr_sockctl(h, STP4020_ICR1_IDX, v); /* |