[src/trunk]: src/sys/dev/ic The description about soft-reset of WI_PCI_COR wa...

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

details:   https://anonhg.NetBSD.org/src/rev/2ce1d1364b4f
branches:  trunk
changeset: 516043:2ce1d1364b4f
user:      ichiro <ichiro%NetBSD.org@localhost>
date:      Sun Oct 14 12:33:18 2001 +0000

description:
The description about soft-reset of WI_PCI_COR was added
and WI_PCI_SOFT_RESET was used.
Cosmetic change.

diffstat:

 sys/dev/ic/wi.c    |  6 +++---
 sys/dev/ic/wireg.h |  7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r f8846b4d05dd -r 2ce1d1364b4f sys/dev/ic/wi.c
--- a/sys/dev/ic/wi.c   Sun Oct 14 11:21:10 2001 +0000
+++ b/sys/dev/ic/wi.c   Sun Oct 14 12:33:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wi.c,v 1.26 2001/10/13 15:00:23 ichiro Exp $   */
+/*     $NetBSD: wi.c,v 1.27 2001/10/14 12:33:18 ichiro Exp $   */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -711,8 +711,8 @@
 wi_pci_reset(sc)
        struct wi_softc         *sc;
 {
-
-       bus_space_write_2(sc->sc_iot, sc->sc_ioh, WI_PCI_COR, 0x80);
+       bus_space_write_2(sc->sc_iot, sc->sc_ioh,
+                         WI_PCI_COR, WI_PCI_SOFT_RESET);
        DELAY(100*1000); /* 100 m sec */
 
        bus_space_write_2(sc->sc_iot, sc->sc_ioh, WI_PCI_COR, 0x0);
diff -r f8846b4d05dd -r 2ce1d1364b4f sys/dev/ic/wireg.h
--- a/sys/dev/ic/wireg.h        Sun Oct 14 11:21:10 2001 +0000
+++ b/sys/dev/ic/wireg.h        Sun Oct 14 12:33:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wireg.h,v 1.11 2001/10/13 15:00:23 ichiro Exp $        */
+/*     $NetBSD: wireg.h,v 1.12 2001/10/14 12:33:18 ichiro Exp $        */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -314,6 +314,7 @@
  * PCI Host Interface Registers (HFA3842 Specific)
  * The value of all Register's Offset, such as WI_INFO_FID and WI_PARAM0,
  * has doubled.
+ * About WI_PCI_COR: In this Register, only soft-reset bit implement; Bit(7).
  */
 #define WI_PCI_COR             0x4C
 #define WI_PCI_HCR             0x5C
@@ -327,7 +328,9 @@
 #define WI_PCI_MASTER1_ADDRH   0xA0
 #define WI_PCI_MASTER1_ADDRL   0xA4
 #define WI_PCI_MASTER1_LEN     0xA8
-#define WI_PCI_MASTER1_CON     0xAC    
+#define WI_PCI_MASTER1_CON     0xAC
+
+#define WI_PCI_SOFT_RESET      (1 << 7)
 
 /*
  * One form of communication with the Hermes is with what Lucent calls