summaryrefslogtreecommitdiffstats
path: root/sys/dev/ic/oosiop.c
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2010-04-20 20:21:54 +0000
committermiod <miod@openbsd.org>2010-04-20 20:21:54 +0000
commitc0c65d081259f138caaf3025c247ba75a0f9bb3a (patch)
tree59c59947a3f36d8b2e23e32dca79da37985d55f3 /sys/dev/ic/oosiop.c
parentDocument the ``alias <map>'' parameter. (diff)
downloadwireguard-openbsd-c0c65d081259f138caaf3025c247ba75a0f9bb3a.tar.xz
wireguard-openbsd-c0c65d081259f138caaf3025c247ba75a0f9bb3a.zip
Allow MD oosiop(4) attachment to override default values for a few of the
chip initialization values (SCNTL0, DMODE, DWT, CTEST7). No functional change on hppa; required by another upcoming attachment.
Diffstat (limited to 'sys/dev/ic/oosiop.c')
-rw-r--r--sys/dev/ic/oosiop.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index e417c83541c..db263a09af4 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: oosiop.c,v 1.14 2010/03/23 01:57:19 krw Exp $ */
+/* $OpenBSD: oosiop.c,v 1.15 2010/04/20 20:21:56 miod Exp $ */
/* $NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $ */
/*
@@ -1044,13 +1044,13 @@ oosiop_reset(struct oosiop_softc *sc)
delay(10000);
/* Set up various chip parameters */
- oosiop_write_1(sc, OOSIOP_SCNTL0, OOSIOP_ARB_FULL | OOSIOP_SCNTL0_EPG);
+ oosiop_write_1(sc, OOSIOP_SCNTL0, OOSIOP_ARB_FULL | sc->sc_scntl0);
oosiop_write_1(sc, OOSIOP_SCNTL1, OOSIOP_SCNTL1_ESR);
oosiop_write_1(sc, OOSIOP_DCNTL, sc->sc_dcntl);
- oosiop_write_1(sc, OOSIOP_DMODE, OOSIOP_DMODE_BL_8);
+ oosiop_write_1(sc, OOSIOP_DMODE, sc->sc_dmode);
oosiop_write_1(sc, OOSIOP_SCID, OOSIOP_SCID_VALUE(sc->sc_id));
- oosiop_write_1(sc, OOSIOP_DWT, 0xff); /* Enable DMA timeout */
- oosiop_write_1(sc, OOSIOP_CTEST7, 0);
+ oosiop_write_1(sc, OOSIOP_DWT, sc->sc_dwt);
+ oosiop_write_1(sc, OOSIOP_CTEST7, sc->sc_ctest7);
oosiop_write_1(sc, OOSIOP_SXFER, 0);
/* Clear all interrupts */