Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem where tsleep() is used not on the cardbus thread.

Browse Source 
This change makes PCMCIA cards work again on my machine.

Unfortunately, some of the DELAY_MS() are called when the current
process is not the cardbus thread, that is, on interrupt contexts.
I confirmed these are actually used in interrupt context and replaced
them with delay()s.  However, I haven't confirmed other DELAY_MS()s
are always on the cardbus thread.

This shall be a temporary fix.  The driver needs being rewritten
not to use such delay()s, of course.
This commit is contained in:
itohy 2001-01-30 07:23:14 +00:00
parent 99af4c1003
commit 5ce651390d
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sys/dev/pci/pccbb.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pccbb.c,v 1.55 2001/01/24 10:10:04 haya Exp $ */
/* $NetBSD: pccbb.c,v 1.56 2001/01/30 07:23:14 itohy Exp $ */
/*
* Copyright (c) 1998, 1999 and 2000
@ -1303,7 +1303,11 @@ pccbb_power(ct, command)
* XXX delay 300 ms: though the standard defines that the Vcc set-up
* time is 20 ms, some PC-Card bridge requires longer duration.
*/
#if 0 /* XXX called on interrupt context */
DELAY_MS(300, sc);
#else
delay(300 * 1000);
#endif
return 1; /* power changed correctly */
}
@ -2289,7 +2293,11 @@ pccbb_pcmcia_socket_enable(pch)
* hold RESET at least 20 ms: the spec says only 10 us is
* enough, but TI1130 requires at least 20 ms.
*/
#if 0 /* XXX called on interrupt context */
DELAY_MS(20, sc);
#else
delay(20 * 1000);
#endif
/* clear the reset flag */
@ -2298,7 +2306,11 @@ pccbb_pcmcia_socket_enable(pch)
/* wait 20ms as per pc card standard (r2.01) section 4.3.6 */
#if 0 /* XXX called on interrupt context */
DELAY_MS(20, sc);
#else
delay(20 * 1000);
#endif
/* wait for the chip to finish initializing */
@ -2366,7 +2378,11 @@ pccbb_pcmcia_socket_disable(pch)
/*
* wait 300ms until power fails (Tpf).
*/
#if 0 /* XXX called on interrupt context */
DELAY_MS(300, sc);
#else
delay(300 * 1000);
#endif
}
/*