Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/sys/dev/pcmcia Pull up revision 1.21 (requested by mart...
details: https://anonhg.NetBSD.org/src/rev/0317dfe0a3d4
branches: netbsd-1-5
changeset: 490874:0317dfe0a3d4
user: he <he%NetBSD.org@localhost>
date: Tue Mar 13 21:36:48 2001 +0000
description:
Pull up revision 1.21 (requested by martin):
Add some small delays at appropriate places in CIS reading code.
This is a stopgap fix for PR#9984, avoiding a panic when an
``AVM Fritz!'' ISDN card is installed in a cardbus slot.
diffstat:
sys/dev/pcmcia/pcmcia_cis.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diffs (35 lines):
diff -r 15aedce3e5f8 -r 0317dfe0a3d4 sys/dev/pcmcia/pcmcia_cis.c
--- a/sys/dev/pcmcia/pcmcia_cis.c Tue Mar 13 21:31:03 2001 +0000
+++ b/sys/dev/pcmcia/pcmcia_cis.c Tue Mar 13 21:36:48 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcmcia_cis.c,v 1.18.4.1 2000/08/22 07:27:22 jun Exp $ */
+/* $NetBSD: pcmcia_cis.c,v 1.18.4.2 2001/03/13 21:36:48 he Exp $ */
#define PCMCIACISDEBUG
@@ -156,6 +156,7 @@
while (1) {
/* get the tuple code */
+ DELAY(1000);
tuple.code = pcmcia_cis_read_1(&tuple, tuple.ptr);
/* two special-case tuples */
@@ -179,6 +180,7 @@
}
/* now all the normal tuples */
+ DELAY(1250);
tuple.length = pcmcia_cis_read_1(&tuple, tuple.ptr + 1);
switch (tuple.code) {
case PCMCIA_CISTPL_LONGLINK_A:
@@ -215,7 +217,9 @@
*((u_int16_t *) & offset) =
pcmcia_tuple_read_2(&tuple, 0);
+ DELAY(500);
length = pcmcia_tuple_read_2(&tuple, 2);
+ DELAY(500);
cksum = pcmcia_tuple_read_1(&tuple, 4);
addr = tuple.ptr + offset;
Home |
Main Index |
Thread Index |
Old Index