d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On second thought: do previous fux in pcic.c better.

Browse Source 
Now we just untimeout the call to inserted() if it exists.
This commit is contained in:
Guido van Rooij 1999-02-14 20:41:01 +00:00
parent 7d0d5e18d4
commit 05440e6882
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/pccard/pccard.c
View File

@ -28,7 +28,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: pccard.c,v 1.70 1999/01/27 23:45:40 dillon Exp $
* $Id: pccard.c,v 1.71 1999/02/13 11:31:59 kuriyama Exp $
*/
#include "opt_devfs.h"
@ -430,6 +430,7 @@ slot_resume(void *arg)
slt->laststate = suspend;
slt->state = empty;
slt->insert_seq = 1;
untimeout(inserted, (void *)slt, slt->insert_ch);
slt->insert_ch = timeout(inserted, (void *)slt, hz/4);
selwakeup(&slt->selp);
}

9
sys/pccard/pcic.c
View File

@ -1104,14 +1104,7 @@ pcicintr(void *unused)
#endif /* PC98 */
s = splhigh();
for (slot = 0; slot < PCIC_MAX_SLOTS; slot++, sp++)
/*
* don't process this interrupt if we are in suspend
* state; we have different means to (re)initialize the
* slot.
* XXX we shouldn't even get here!?
*/
if (sp->slt && (sp->slt->state != suspend) &&
(chg = sp->getb(sp, PCIC_STAT_CHG)) != 0)
if (sp->slt && (chg = sp->getb(sp, PCIC_STAT_CHG)) != 0)
if (chg & PCIC_CDTCH) {
if ((sp->getb(sp, PCIC_STATUS) & PCIC_CD) ==
PCIC_CD) {