summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>2000-10-13 15:02:03 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>2000-10-13 15:02:03 +0000
commit0377d74a469833622d0df1e898a34c70891ee6a2 (patch)
treeb1deffae7f0c4b4a2e2d6a48af03888b32ef27d3 /sys
parentc01fc20ffc74c551f59c99d37ca17d60f6725cba (diff)
Do reset properly on MiniPCI adapters.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/xl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/ic/xl.c b/sys/dev/ic/xl.c
index 9a29c0d2504..cedcf2c867c 100644
--- a/sys/dev/ic/xl.c
+++ b/sys/dev/ic/xl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: xl.c,v 1.12 2000/10/07 16:15:11 aaron Exp $ */
+/* $OpenBSD: xl.c,v 1.13 2000/10/13 15:02:02 aaron Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -847,9 +847,10 @@ void xl_reset(sc, hard)
register int i;
XL_SEL_WIN(0);
- if (hard)
+ if (hard || (sc->xl_flags & XL_FLAG_WEIRDRESET)) {
CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RESET |
((sc->xl_flags & XL_FLAG_WEIRDRESET)?0xFF:0));
+ }
else
CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RESET | 0x0010);
xl_wait(sc);